[Pkg-e-commits] [SCM] Enlightenment 17 branch, new-svn-snapshot, updated. debian/0.16.999.050+svn20081207-1-8421-ge04a9b0

Albin Tonnerre albin.tonnerre at gmail.com
Sun Dec 20 13:01:16 UTC 2009


The following commit has been merged in the new-svn-snapshot branch:
commit c432166146bd07ad351856012f5a4fe0eaa5b11f
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Sat Dec 5 12:52:31 2009 +0100

    Import upstream release 0.16.999.063

diff --git a/Makefile.in b/Makefile.in
index 9529da3..06f1ac3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,7 +37,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(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 \
+	INSTALL NEWS TODO compile config.guess config.rpath config.sub \
 	depcomp install-sh ltmain.sh missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
@@ -347,6 +347,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -432,7 +433,7 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
+	-rm -f libtool config.lt
 install-filesDATA: $(files_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(filesdir)" || $(MKDIR_P) "$(DESTDIR)$(filesdir)"
@@ -543,7 +544,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..025cfab
--- /dev/null
+++ b/TODO
@@ -0,0 +1,9 @@
+1. acpi event listener - translate to e internal messages (e_msg)
+   (especially button/lid, ac_adaptor, battery, sony/hotkey s1, av mode,
+   brightness +, brightness -, sleep, wifi on/off)
+   
+acpi_listen is a good one (unix socket /var/run/acpid.socket - just cleartext
+newline by newline)
+
+2. /proc/acpi/**/**/.../*/brightness controls
+   (look at sony and asus - different)
diff --git a/aclocal.m4 b/aclocal.m4
index cb3af0d..77df381 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -177,7 +177,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -192,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -206,12 +206,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.10.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -461,57 +461,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-#serial 3
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -753,14 +764,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 5
+# serial 6
 
 # AM_PROG_CC_C_O
 # --------------
@@ -772,8 +783,9 @@ AC_REQUIRE_AUX_FILE([compile])dnl
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
    # But if we don't then we get into trouble of one sort or another.
@@ -851,13 +863,13 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 3
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -874,7 +886,7 @@ AC_DEFUN([_AM_SET_OPTION],
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
diff --git a/config.h.in b/config.h.in
index fb2dd34..99cb4c9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -50,6 +53,9 @@
 /* Package EXCHANGE (exchange) found. */
 #undef HAVE_EXCHANGE
 
+/* Define to 1 if you have the <execinfo.h> header file. */
+#undef HAVE_EXECINFO_H
+
 /* Define to 1 if you have the `fnmatch' function. */
 #undef HAVE_FNMATCH
 
@@ -335,20 +341,55 @@
 /* Use module wizard */
 #undef USE_MODULE_WIZARD
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
 
 /* Macro declaring a function argument to be unused */
 #undef __UNUSED__
diff --git a/config/Makefile.am b/config/Makefile.am
index d79806d..a919390 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = default standard minimalist scaleable netbook illume
+SUBDIRS = default standard minimalist scaleable netbook illume illume-home
 
 EET_EET = @eet_eet@
 
diff --git a/config/Makefile.in b/config/Makefile.in
index 1fbc0e8..defdc5f 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -329,12 +329,13 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
 x_libs = @x_libs@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = default standard minimalist scaleable netbook illume
+SUBDIRS = default standard minimalist scaleable netbook illume illume-home
 EET_EET = @eet_eet@
 EXTRA_DIST = profile.src
 filesdir = $(datadir)/enlightenment/data/config
@@ -346,8 +347,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -470,7 +471,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/config/default/Makefile.in b/config/default/Makefile.in
index 3629d45..0a1ee71 100644
--- a/config/default/Makefile.in
+++ b/config/default/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -341,8 +342,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/default/profile.desktop b/config/default/profile.desktop
index 02aa0bf..7f5f313 100644
--- a/config/default/profile.desktop
+++ b/config/default/profile.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Link
 Name=Default
+Name[cs]=Výchozí
 Name[it]=Predefinito
 Name[hu]=Alapértelmezett
 Name[fr]=Prédéfini
@@ -8,8 +9,9 @@ Name[el]=Προκαθορισμένο
 Name[eo]=Pravaloroj
 Icon=icon.png
 Comment=Select this to begin<br>the initial setup again.
+Comment[cs]=Vyberte pro znovuspuštění<br>tohoto průvodce.
 Comment[it]=Selezionare questo per<br>riprendere la<br>configurazione iniziale.
 Comment[hu]=Válaszd ezt az alap<br>beállítáok megismétléséhez.
 Comment[fr]=Sélectionnez ceci pour recommencer<br>la configuration initiale.
 Comment[el]=Επέλεξε αυτό για να <br>ξεκινήσεις την αρχική ρύθμιση ξανά.
-Comment[eo]=Elektu tion por restartigi<br>la pravalorizan agordon.
\ No newline at end of file
+Comment[eo]=Elektu tion por restartigi<br>la pravalorizan agordon.
diff --git a/config/illume-home/Makefile.am b/config/illume-home/Makefile.am
new file mode 100644
index 0000000..66a4517
--- /dev/null
+++ b/config/illume-home/Makefile.am
@@ -0,0 +1,32 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        e.src \
+	module.battery.src \
+	module.pager.src \
+	module.illume-home.src \
+	module.illume-keyboard.src \
+	module.illume-softkey.src
+
+filesdir = $(datadir)/enlightenment/data/config/illume-home
+files_DATA = \
+        profile.desktop \
+        icon.png \
+	e.cfg \
+	module.battery.cfg \
+	module.pager.cfg \
+	module.illume-home.cfg \
+        module.illume-keyboard.cfg \
+        module.illume-softkey.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/illume-home/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
diff --git a/config/illume-home/Makefile.in b/config/illume-home/Makefile.in
new file mode 100644
index 0000000..afe99fc
--- /dev/null
+++ b/config/illume-home/Makefile.in
@@ -0,0 +1,546 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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 = config/illume-home
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+SOURCES =
+DIST_SOURCES =
+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)$(filesdir)"
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+EET_EET = @eet_eet@
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        e.src \
+	module.battery.src \
+	module.pager.src \
+	module.illume-home.src \
+	module.illume-keyboard.src \
+	module.illume-softkey.src
+
+filesdir = $(datadir)/enlightenment/data/config/illume-home
+files_DATA = \
+        profile.desktop \
+        icon.png \
+	e.cfg \
+	module.battery.cfg \
+	module.pager.cfg \
+	module.illume-home.cfg \
+        module.illume-keyboard.cfg \
+        module.illume-softkey.cfg
+
+all: all-am
+
+.SUFFIXES:
+$(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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/illume-home/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  config/illume-home/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
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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 $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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-local mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	clean-local distclean distclean-generic distclean-libtool \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am uninstall uninstall-am uninstall-filesDATA
+
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/illume-home/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+# 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/config/illume-home/e.src b/config/illume-home/e.src
new file mode 100644
index 0000000..198074f
--- /dev/null
+++ b/config/illume-home/e.src
@@ -0,0 +1,2044 @@
+group "E_Config" struct {
+  value "config_version" int: 65843;
+  value "show_splash" int: 1;
+  value "init_default_theme" string: "default.edj";
+  value "desktop_default_name" string: "Desktop %i, %i";
+  value "menus_scroll_speed" double: 1000.0000000000000000000000000;
+  value "menus_fast_mouse_move_threshhold" double: 300.0000000000000000000000000;
+  value "menus_click_drag_timeout" double: 0.2500000000000000000000000;
+  value "border_shade_animate" int: 1;
+  value "border_shade_transition" int: 1;
+  value "border_shade_speed" double: 1800.0000000000000000000000000;
+  value "framerate" double: 60.0000000000000000000000000;
+  value "priority" int: 1;
+  value "image_cache" int: 4096;
+  value "font_cache" int: 512;
+  value "edje_cache" int: 32;
+  value "edje_collection_cache" int: 64;
+  value "zone_desks_x_count" int: 4;
+  value "zone_desks_y_count" int: 1;
+  value "use_virtual_roots" int: 0;
+  value "show_desktop_icons" int: 1;
+  value "edge_flip_dragging" int: 1;
+  value "evas_engine_default" int: 1;
+  value "evas_engine_container" int: 0;
+  value "evas_engine_init" int: 0;
+  value "evas_engine_menus" int: 0;
+  value "evas_engine_borders" int: 0;
+  value "evas_engine_errors" int: 0;
+  value "evas_engine_popups" int: 0;
+  value "evas_engine_drag" int: 0;
+  value "evas_engine_win" int: 0;
+  value "evas_engine_zone" int: 0;
+  value "use_composite" int: 0;
+  value "language" string: "en_US.UTF-8";
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "syscon";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "battery";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "pager";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "exebuf";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "winlist";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_applications";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_borders";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_clientlist";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_colors";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_desk";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_desklock";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_desks";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_dialogs";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_display";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_dpms";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_exebuf";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_fonts";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_icon_theme";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_imc";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_intl";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_keybindings";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_menus";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_mime";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_mouse";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_mousebindings";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_mouse_cursor";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_paths";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_edgebindings";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_performance";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_profiles";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_screensaver";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_shelves";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_startup";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_theme";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_transitions";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_wallpaper";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_window_display";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_window_focus";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_window_manipulation";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_winlist";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_engine";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_interaction";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_scale";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "conf_window_remembers";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-home";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-indicator";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-softkey";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume-keyboard";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "illume2";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 0;
+      value "priority" int: 0;
+    }
+  }
+  group "themes" list {
+    group "E_Config_Theme" struct {
+      value "category" string: "theme";
+      value "file" string: "default.edj";
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 2;
+      value "modifiers" int: 4;
+      value "action" string: "window_move";
+      value "button" uchar: 1;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 2;
+      value "modifiers" int: 4;
+      value "action" string: "window_resize";
+      value "button" uchar: 2;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 2;
+      value "modifiers" int: 4;
+      value "action" string: "window_menu";
+      value "button" uchar: 3;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "menu_show";
+      value "params" string: "main";
+      value "button" uchar: 1;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "menu_show";
+      value "params" string: "clients";
+      value "button" uchar: 2;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "mouse_bindings" list {
+    group "E_Config_Binding_Mouse" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "menu_show";
+      value "params" string: "favorites";
+      value "button" uchar: 3;
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "Left";
+      value "action" string: "desk_flip_by";
+      value "params" string: "-1 0";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "Right";
+      value "action" string: "desk_flip_by";
+      value "params" string: "1 0";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "Up";
+      value "action" string: "desk_flip_by";
+      value "params" string: "0 -1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "Down";
+      value "action" string: "desk_flip_by";
+      value "params" string: "0 1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Up";
+      value "action" string: "window_raise";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Down";
+      value "action" string: "window_lower";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "x";
+      value "action" string: "window_close";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "k";
+      value "action" string: "window_kill";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "w";
+      value "action" string: "window_menu";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "s";
+      value "action" string: "window_sticky_toggle";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "i";
+      value "action" string: "window_iconic_toggle";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "f";
+      value "action" string: "window_maximized_toggle";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 1;
+      value "key" string: "F10";
+      value "action" string: "window_maximized_toggle";
+      value "params" string: "default vertical";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "F10";
+      value "action" string: "window_maximized_toggle";
+      value "params" string: "default horizontal";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "r";
+      value "action" string: "window_shaded_toggle";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Left";
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Right";
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F1";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "0";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F2";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F3";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "2";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F4";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "3";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F5";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "4";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F6";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "5";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F7";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "6";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F8";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "7";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F9";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "8";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F10";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "9";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F11";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "10";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "F12";
+      value "action" string: "desk_linear_flip_to";
+      value "params" string: "11";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "m";
+      value "action" string: "menu_show";
+      value "params" string: "main";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "a";
+      value "action" string: "menu_show";
+      value "params" string: "favorites";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 0;
+      value "key" string: "Menu";
+      value "action" string: "menu_show";
+      value "params" string: "main";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 2;
+      value "key" string: "Menu";
+      value "action" string: "menu_show";
+      value "params" string: "clients";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "Menu";
+      value "action" string: "menu_show";
+      value "params" string: "favorites";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Insert";
+      value "action" string: "exec";
+      value "params" string: "Eterm";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "Tab";
+      value "action" string: "winlist";
+      value "params" string: "next";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 5;
+      value "key" string: "Tab";
+      value "action" string: "winlist";
+      value "params" string: "prev";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "End";
+      value "action" string: "restart";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "Delete";
+      value "action" string: "syscon";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 4;
+      value "key" string: "Escape";
+      value "action" string: "exebuf";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "l";
+      value "action" string: "desk_lock";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 6;
+      value "key" string: "d";
+      value "action" string: "desk_deskshow_toggle";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "Left";
+      value "action" string: "screen_send_by";
+      value "params" string: "-1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "Right";
+      value "action" string: "screen_send_by";
+      value "params" string: "1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "F1";
+      value "action" string: "screen_send_to";
+      value "params" string: "0";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "F2";
+      value "action" string: "screen_send_to";
+      value "params" string: "1";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "F3";
+      value "action" string: "screen_send_to";
+      value "params" string: "2";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "key_bindings" list {
+    group "E_Config_Binding_Key" struct {
+      value "context" int: 9;
+      value "modifiers" int: 3;
+      value "key" string: "F4";
+      value "action" string: "screen_send_to";
+      value "params" string: "3";
+      value "any_mod" uchar: 0;
+    }
+  }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_flip_in_direction";
+      value "edge" uchar: 1;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_flip_in_direction";
+      value "edge" uchar: 2;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_flip_in_direction";
+      value "edge" uchar: 3;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_flip_in_direction";
+      value "edge" uchar: 4;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
+  group "edge_bindings" list {
+    group "E_Config_Binding_Edge" struct {
+      value "context" int: 3;
+      value "modifiers" int: 0;
+      value "action" string: "desk_deskshow_toggle";
+      value "edge" uchar: 6;
+      value "any_mod" uchar: 0;
+      value "delay" float: 0.3000000119209289550781250;
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1,double";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_shaded_toggle";
+      value "params" string: "up";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,2";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_shaded_toggle";
+      value "params" string: "up";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,wheel,?,1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_shaded";
+      value "params" string: "0 up";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,wheel,?,-1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_shaded";
+      value "params" string: "1 up";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,3";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_menu";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,?";
+      value "source" string: "e.event.icon";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_menu";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,[12]";
+      value "source" string: "e.event.close";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_close";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,3";
+      value "source" string: "e.event.close";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_kill";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,1";
+      value "source" string: "e.event.maximize";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_maximized_toggle";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,2";
+      value "source" string: "e.event.maximize";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_maximized_toggle";
+      value "params" string: "smart";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,3";
+      value "source" string: "e.event.maximize";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_maximized_toggle";
+      value "params" string: "expand";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,?";
+      value "source" string: "e.event.minimize";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_iconic_toggle";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,?";
+      value "source" string: "e.event.shade";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_shaded_toggle";
+      value "params" string: "up";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,clicked,?";
+      value "source" string: "e.event.lower";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_lower";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.icon";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_drag_icon";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,1";
+      value "source" string: "e.event.titlebar";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+      value "params" string: "end";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.tl";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "tl";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.t";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "t";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.tr";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "tr";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.r";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "r";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.br";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "br";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.b";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "b";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.bl";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "bl";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,1";
+      value "source" string: "e.event.resize.l";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "l";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,1";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_resize";
+      value "params" string: "end";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,down,3";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+    }
+  }
+  group "signal_bindings" list {
+    group "E_Config_Binding_Signal" struct {
+      value "context" int: 2;
+      value "signal" string: "mouse,up,3";
+      value "source" string: "e.event.resize.*";
+      value "modifiers" int: 0;
+      value "any_mod" uchar: 1;
+      value "action" string: "window_move";
+      value "params" string: "end";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 4;
+      value "direction" int: 0;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 4;
+      value "direction" int: 1;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 4;
+      value "direction" int: 0;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 4;
+      value "direction" int: 1;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 2;
+      value "direction" int: 0;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 2;
+      value "direction" int: 1;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 2;
+      value "direction" int: 0;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 2;
+      value "direction" int: 1;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 8;
+      value "direction" int: 0;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 8;
+      value "direction" int: 1;
+      value "z" int: -1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "-1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 8;
+      value "direction" int: 0;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  group "wheel_bindings" list {
+    group "E_Config_Binding_Wheel" struct {
+      value "context" int: 8;
+      value "direction" int: 1;
+      value "z" int: 1;
+      value "modifiers" int: 4;
+      value "any_mod" uchar: 0;
+      value "action" string: "desk_linear_flip_by";
+      value "params" string: "1";
+    }
+  }
+  value "window_placement_policy" int: 0;
+  value "focus_policy" int: 0;
+  value "focus_setting" int: 1;
+  value "pass_click_on" int: 1;
+  value "always_click_to_raise" int: 0;
+  value "always_click_to_focus" int: 0;
+  value "use_auto_raise" int: 0;
+  value "auto_raise_delay" double: 0.5000000000000000000000000;
+  value "use_resist" int: 1;
+  value "drag_resist" int: 16;
+  value "desk_resist" int: 32;
+  value "window_resist" int: 12;
+  value "gadget_resist" int: 32;
+  value "winlist_warp_while_selecting" int: 1;
+  value "winlist_warp_at_end" int: 1;
+  value "winlist_warp_speed" double: 0.1000000000000000055511151;
+  value "winlist_scroll_animate" int: 1;
+  value "winlist_scroll_speed" double: 0.1000000000000000055511151;
+  value "winlist_list_show_iconified" int: 1;
+  value "winlist_list_show_other_desk_iconified" int: 1;
+  value "winlist_list_show_other_screen_iconified" int: 0;
+  value "winlist_list_show_other_desk_windows" int: 0;
+  value "winlist_list_show_other_screen_windows" int: 0;
+  value "winlist_list_uncover_while_selecting" int: 0;
+  value "winlist_list_jump_desk_while_selecting" int: 0;
+  value "winlist_list_focus_while_selecting" int: 1;
+  value "winlist_list_raise_while_selecting" int: 1;
+  value "winlist_pos_align_x" double: 0.5000000000000000000000000;
+  value "winlist_pos_align_y" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_w" double: 0.5000000000000000000000000;
+  value "winlist_pos_size_h" double: 0.5000000000000000000000000;
+  value "winlist_pos_min_w" int: 0;
+  value "winlist_pos_min_h" int: 0;
+  value "winlist_pos_max_w" int: 320;
+  value "winlist_pos_max_h" int: 320;
+  value "maximize_policy" int: 50;
+  value "allow_manip" int: 0;
+  value "border_fix_on_shelf_toggle" int: 0;
+  value "allow_above_fullscreen" int: 0;
+  value "kill_if_close_not_possible" int: 1;
+  value "kill_process" int: 1;
+  value "kill_timer_wait" double: 10.0000000000000000000000000;
+  value "ping_clients" int: 1;
+  value "transition_desk" string: "vswipe";
+  value "transition_change" string: "crossfade";
+  value "remember_internal_windows" int: 0;
+  value "move_info_follows" int: 1;
+  value "resize_info_follows" int: 1;
+  value "move_info_visible" int: 0;
+  value "resize_info_visible" int: 0;
+  value "focus_last_focused_per_desktop" int: 1;
+  value "focus_revert_on_hide_or_close" int: 1;
+  value "pointer_slide" int: 0;
+  value "use_e_cursor" int: 1;
+  value "cursor_size" int: 32;
+  value "menu_autoscroll_margin" int: 0;
+  value "menu_autoscroll_cursor_margin" int: 1;
+  value "transient.move" int: 1;
+  value "transient.resize" int: 0;
+  value "transient.raise" int: 1;
+  value "transient.lower" int: 1;
+  value "transient.layer" int: 1;
+  value "transient.desktop" int: 1;
+  value "transient.iconify" int: 1;
+  value "modal_windows" int: 1;
+  value "menu_eap_name_show" int: 1;
+  value "menu_eap_generic_show" int: 0;
+  value "menu_eap_comment_show" int: 0;
+  value "fullscreen_policy" int: 0;
+  value "exebuf_max_exe_list" int: 20;
+  value "exebuf_max_eap_list" int: 20;
+  value "exebuf_max_hist_list" int: 20;
+  value "exebuf_scroll_animate" int: 1;
+  value "exebuf_scroll_speed" double: 0.1000000000000000055511151;
+  value "exebuf_pos_align_x" double: 0.5000000000000000000000000;
+  value "exebuf_pos_align_y" double: 0.5000000000000000000000000;
+  value "exebuf_pos_size_w" double: 0.7500000000000000000000000;
+  value "exebuf_pos_size_h" double: 0.2500000000000000000000000;
+  value "exebuf_pos_min_w" int: 200;
+  value "exebuf_pos_min_h" int: 160;
+  value "exebuf_pos_max_w" int: 400;
+  value "exebuf_pos_max_h" int: 320;
+  value "exebuf_term_cmd" string: "xterm -hold -e";
+  value "use_app_icon" int: 0;
+  value "cnfmdlg_disabled" int: 0;
+  value "cfgdlg_auto_apply" int: 0;
+  value "cfgdlg_default_mode" int: 0;
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "shelf";
+      value "id" int: 1;
+      value "zone" int: 0;
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "shelf";
+      value "id" int: 2;
+      value "zone" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "pager";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 120;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "ibox";
+          value "geom.pos" int: 768;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "shelf";
+      value "id" int: 3;
+      value "zone" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "pager";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 120;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "ibox";
+          value "geom.pos" int: 768;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "shelf";
+      value "id" int: 4;
+      value "zone" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "pager";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 120;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "ibox";
+          value "geom.pos" int: 768;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 0;
+          value "state_info.flags" int: 0;
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "gadman";
+      value "id" int: 114;
+      value "zone" int: 0;
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "gadman_top";
+      value "id" int: 115;
+      value "zone" int: 0;
+    }
+  }
+  group "gadcons" list {
+    group "E_Config_Gadcon" struct {
+      value "name" string: "illume-indicator";
+      value "id" int: 1;
+      value "zone" int: 0;
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume-home";
+          value "id" string: "illume-home.0";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 1;
+          value "state_info.flags" int: 0;
+          value "style" string: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "battery";
+          value "id" string: "battery";
+          value "geom.pos" int: 800;
+          value "geom.size" int: 80;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 2;
+          value "state_info.flags" int: 0;
+          value "style" string: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "configuration";
+          value "id" string: "configuration";
+          value "geom.pos" int: 800;
+          value "geom.size" int: 80;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 3;
+          value "state_info.flags" int: 0;
+          value "style" string: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+      group "clients" list {
+        group "E_Config_Gadcon_Client" struct {
+          value "name" string: "illume2";
+          value "id" string: "illume2.0";
+          value "geom.pos" int: 0;
+          value "geom.size" int: 32;
+          value "geom.res" int: 800;
+          value "geom.pos_x" double: 0.0000000000000000000000000;
+          value "geom.pos_y" double: 0.0000000000000000000000000;
+          value "geom.size_w" double: 0.0000000000000000000000000;
+          value "geom.size_h" double: 0.0000000000000000000000000;
+          value "state_info.seq" int: 4;
+          value "state_info.flags" int: 0;
+          value "style" string: "plain";
+          value "orient" int: 0;
+          value "autoscroll" uchar: 0;
+          value "resizable" uchar: 0;
+        }
+      }
+    }
+  }
+  group "shelves" list {
+    group "E_Config_Shelf" struct {
+      value "name" string: "shelf";
+      value "id" int: 2;
+      value "container" int: 1;
+      value "zone" int: 0;
+      value "layer" int: 200;
+      value "popup" uchar: 1;
+      value "orient" int: 6;
+      value "fit_along" uchar: 1;
+      value "fit_size" uchar: 0;
+      value "style" string: "default";
+      value "size" int: 40;
+      value "overlap" int: 0;
+      value "autohide" int: 0;
+      value "autohide_show_action" int: 0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
+      value "desk_show_mode" int: 0;
+      group "desk_list" list {
+        group "E_Config_Shelf_Desk" struct {
+          value "x" int: 135642264;
+          value "y" int: 2;
+        }
+      }
+    }
+  }
+  group "shelves" list {
+    group "E_Config_Shelf" struct {
+      value "name" string: "shelf";
+      value "id" int: 3;
+      value "container" int: 2;
+      value "zone" int: 0;
+      value "layer" int: 200;
+      value "popup" uchar: 1;
+      value "orient" int: 6;
+      value "fit_along" uchar: 1;
+      value "fit_size" uchar: 0;
+      value "style" string: "default";
+      value "size" int: 40;
+      value "overlap" int: 0;
+      value "autohide" int: 0;
+      value "autohide_show_action" int: 0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
+      value "desk_show_mode" int: 0;
+      group "desk_list" list {
+        group "E_Config_Shelf_Desk" struct {
+          value "x" int: 135642264;
+          value "y" int: 3;
+        }
+      }
+    }
+  }
+  group "shelves" list {
+    group "E_Config_Shelf" struct {
+      value "name" string: "shelf";
+      value "id" int: 4;
+      value "container" int: 3;
+      value "zone" int: 0;
+      value "layer" int: 200;
+      value "popup" uchar: 1;
+      value "orient" int: 6;
+      value "fit_along" uchar: 1;
+      value "fit_size" uchar: 0;
+      value "style" string: "default";
+      value "size" int: 40;
+      value "overlap" int: 0;
+      value "autohide" int: 0;
+      value "autohide_show_action" int: 0;
+      value "hide_timeout" float: 1.0000000000000000000000000;
+      value "hide_duration" float: 1.0000000000000000000000000;
+      value "desk_show_mode" int: 0;
+      group "desk_list" list {
+        group "E_Config_Shelf_Desk" struct {
+          value "x" int: 135642264;
+          value "y" int: 4;
+        }
+      }
+    }
+  }
+  value "font_hinting" int: 0;
+  value "desklock_auth_method" int: 0;
+  value "desklock_login_box_zone" int: -1;
+  value "desklock_start_locked" int: 0;
+  value "desklock_autolock_screensaver" int: 0;
+  value "desklock_post_screensaver_time" double: 0.0000000000000000000000000;
+  value "desklock_autolock_idle" int: 0;
+  value "desklock_autolock_idle_timeout" double: 300.0000000000000000000000000;
+  value "desklock_use_custom_desklock" int: 0;
+  value "desklock_ask_presentation" uchar: 1;
+  value "desklock_ask_presentation_timeout" double: 30.0000000000000000000000000;
+  value "display_res_restore" int: 0;
+  value "display_res_width" int: 1;
+  value "display_res_height" int: 1;
+  value "display_res_hz" int: 0;
+  value "display_res_rotation" int: 0;
+  value "screensaver_enable" int: 0;
+  value "screensaver_timeout" int: 0;
+  value "screensaver_interval" int: 5;
+  value "screensaver_blanking" int: 2;
+  value "screensaver_expose" int: 2;
+  value "screensaver_ask_presentation" uchar: 1;
+  value "screensaver_ask_presentation_timeout" double: 30.0000000000000000000000000;
+  value "dpms_enable" int: 0;
+  value "dpms_standby_enable" int: 0;
+  value "dpms_suspend_enable" int: 0;
+  value "dpms_off_enable" int: 0;
+  value "dpms_standby_timeout" int: 1;
+  value "dpms_suspend_timeout" int: 1;
+  value "dpms_off_timeout" int: 1;
+  value "clientlist_group_by" int: 0;
+  value "clientlist_include_all_zones" int: 0;
+  value "clientlist_separate_with" int: 0;
+  value "clientlist_sort_by" int: 0;
+  value "clientlist_separate_iconified_apps" int: 0;
+  value "clientlist_warp_to_iconified_desktop" int: 0;
+  value "clientlist_limit_caption_len" int: 0;
+  value "clientlist_max_caption_len" int: 2;
+  value "mouse_hand" int: 1;
+  value "mouse_accel_numerator" int: 2;
+  value "mouse_accel_denominator" int: 1;
+  value "mouse_accel_threshold" int: 4;
+  value "border_raise_on_mouse_action" int: 1;
+  value "border_raise_on_focus" int: 1;
+  value "desk_flip_wrap" int: 0;
+  value "fullscreen_flip" int: 1;
+  value "icon_theme" string: "Tango";
+  value "icon_theme_overrides" uchar: 0;
+  value "desk_flip_animate_mode" int: 1;
+  value "desk_flip_animate_interpolation" int: 0;
+  value "desk_flip_animate_time" double: 0.2000000000000000111022302;
+  value "desk_flip_pan_bg" uchar: 0;
+  value "desk_flip_pan_x_axis_factor" double: 0.0000000000000000000000000;
+  value "desk_flip_pan_y_axis_factor" double: 0.0000000000000000000000000;
+  value "wallpaper_import_last_dev" string: "~/";
+  value "wallpaper_import_last_path" string: "/";
+  value "wallpaper_grad_c1_r" int: 0;
+  value "wallpaper_grad_c1_g" int: 0;
+  value "wallpaper_grad_c1_b" int: 0;
+  value "wallpaper_grad_c2_r" int: 255;
+  value "wallpaper_grad_c2_g" int: 255;
+  value "wallpaper_grad_c2_b" int: 255;
+  value "theme_default_border_style" string: "default";
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/jpeg";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/png";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/x-pixmap";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/x-xpixmap";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/svg+xml";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/gif";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "image/tiff";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "application/x-edje";
+      value "icon" string: "THUMB";
+    }
+  }
+  group "mime_icons" list {
+    group "E_Config_Mime_Icon" struct {
+      value "mime" string: "application/x-desktop";
+      value "icon" string: "DESKTOP";
+    }
+  }
+  value "desk_auto_switch" int: 0;
+  value "thumb_nice" int: 0;
+  value "menu_favorites_show" int: 0;
+  value "menu_apps_show" int: 1;
+  value "ping_clients_interval" int: 128;
+  value "cache_flush_poll_interval" int: 512;
+  value "thumbscroll_enable" int: 0;
+  value "thumbscroll_threshhold" int: 8;
+  value "thumbscroll_momentum_threshhold" double: 100.0000000000000000000000000;
+  value "thumbscroll_friction" double: 1.0000000000000000000000000;
+  value "hal_desktop" int: 1;
+  value "hal_auto_mount" int: 0;
+  value "hal_auto_open" int: 0;
+  value "border_keyboard.timeout" double: 5.0000000000000000000000000;
+  value "border_keyboard.move.dx" uchar: 5;
+  value "border_keyboard.move.dy" uchar: 5;
+  value "border_keyboard.resize.dx" uchar: 5;
+  value "border_keyboard.resize.dy" uchar: 5;
+  value "scale.min" double: 1.0000000000000000000000000;
+  value "scale.max" double: 3.0000000000000000000000000;
+  value "scale.factor" double: 1.0000000000000000000000000;
+  value "scale.base_dpi" int: 142;
+  value "scale.use_dpi" uchar: 0;
+  value "scale.use_custom" uchar: 0;
+  value "show_cursor" uchar: 1;
+  value "idle_cursor" uchar: 1;
+  value "default_system_menu" string: "/etc/xdg/menus/gnome-applications.menu";
+  value "cfgdlg_normal_wins" uchar: 0;
+  value "syscon.main.icon_size" int: 64;
+  value "syscon.secondary.icon_size" int: 48;
+  value "syscon.extra.icon_size" int: 48;
+  value "syscon.timeout" double: 5.0000000000000000000000000;
+  value "syscon.do_input" uchar: 1;
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "halt";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "system-shutdown";
+      value "is_main" int: 1;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "suspend";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "system-suspend";
+      value "is_main" int: 1;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "desk_lock";
+      value "button" string: "button";
+      value "icon" string: "system-lock-screen";
+      value "is_main" int: 1;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "reboot";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "system-restart";
+      value "is_main" int: 0;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "hibernate";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "system-suspend-hibernate";
+      value "is_main" int: 0;
+    }
+  }
+  group "syscon.actions" list {
+    group "E_Config_Syscon_Action" struct {
+      value "action" string: "logout";
+      value "params" string: "now";
+      value "button" string: "button";
+      value "icon" string: "system-log-out";
+      value "is_main" int: 0;
+    }
+  }
+  value "mode.presentation" uchar: 0;
+  value "mode.offline" uchar: 0;
+}
diff --git a/config/illume/icon.png b/config/illume-home/icon.png
similarity index 100%
copy from config/illume/icon.png
copy to config/illume-home/icon.png
diff --git a/config/illume-home/module.battery.src b/config/illume-home/module.battery.src
new file mode 100644
index 0000000..bce57c7
--- /dev/null
+++ b/config/illume-home/module.battery.src
@@ -0,0 +1,7 @@
+group "Battery_Config" struct {
+  value "poll_interval" int: 512;
+  value "alert" int: 30;
+  value "alert_p" int: 10;
+  value "alert_timeout" int: 0;
+  value "force_mode" int: 0;
+}
diff --git a/config/illume-home/module.illume-home.src b/config/illume-home/module.illume-home.src
new file mode 100644
index 0000000..7b0a9ad
--- /dev/null
+++ b/config/illume-home/module.illume-home.src
@@ -0,0 +1,6 @@
+group "Illume-Home_Cfg" struct {
+  value "version" int: 0;
+  value "icon_size" int: 120;
+  value "single_click" int: 1;
+  value "single_click_delay" int: 150;
+}
diff --git a/config/illume-home/module.illume-keyboard.src b/config/illume-home/module.illume-keyboard.src
new file mode 100644
index 0000000..46cda9c
--- /dev/null
+++ b/config/illume-home/module.illume-keyboard.src
@@ -0,0 +1,5 @@
+group "Illume_Kbd_Cfg" struct {
+  value "version" int: 0;
+  value "use_internal" int: 1;
+  value "dict" string: "English_(US)_Small.dic";
+}
diff --git a/config/illume-home/module.illume-softkey.src b/config/illume-home/module.illume-softkey.src
new file mode 100644
index 0000000..56b88fc
--- /dev/null
+++ b/config/illume-home/module.illume-softkey.src
@@ -0,0 +1,3 @@
+group "Illume-Softkey_Cfg" struct {
+  value "version" int: 0;
+}
diff --git a/config/illume/module.pager.src b/config/illume-home/module.pager.src
similarity index 100%
copy from config/illume/module.pager.src
copy to config/illume-home/module.pager.src
diff --git a/config/illume-home/profile.desktop b/config/illume-home/profile.desktop
new file mode 100644
index 0000000..cf03d79
--- /dev/null
+++ b/config/illume-home/profile.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Home
+Icon=icon.png
+Comment=Illume-Home profile for<br>embedded systems like<br>phones and web<br>tablets with tiny<br>touchscreen displays.<br>Only use this if<br>you really have<br>such a device.
diff --git a/config/illume/Makefile.in b/config/illume/Makefile.in
index e07ba8d..5d71401 100644
--- a/config/illume/Makefile.in
+++ b/config/illume/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -351,8 +352,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/illume/profile.desktop b/config/illume/profile.desktop
index ecd177c..a4e27bc 100644
--- a/config/illume/profile.desktop
+++ b/config/illume/profile.desktop
@@ -6,6 +6,7 @@ Name[el]=Illume
 Name[eo]=Illume
 Icon=icon.png
 Comment=Illume profile for<br>embedded systems like<br>phones and web<br>tablets with tiny<br>touchscreen displays.<br>Only use this if<br>you really have<br>such a device.
+Comment[cs]=Illume profil pro<br>přenosná zařízení<br>jako telefony<br>a webové tablety<br>s malými dotykovými displeji.<br>Použijte jen pokud<br>opravdu máte<br>takové zařízení.
 Comment[it]=Profilo Illume per<br>sistemi embedded come<br>cellulari e webpad<br>con piccoli display<br>touchscreen.<br>Usatelo solo se<br>avete realmente un<br>dispositivo simile.
 Comment[hu]=Illume profil <br>telefonokhoz, érintőképernyőkhöz.<br>Csak akkor használd ezt,<br>ha valóban ilyen eszközöd van.
 Comment[fr]=Profil Illume pour les systèmes<br>embarqués comme les téléphones<br>et tablettes internet pourvus<br>d'un petit écran tactile.<br>À n'utiliser que si<br>vous disposez réellement<br>d'un tel matériel.
diff --git a/config/minimalist/Makefile.in b/config/minimalist/Makefile.in
index 7a6a51a..ba0407c 100644
--- a/config/minimalist/Makefile.in
+++ b/config/minimalist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -357,8 +358,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/minimalist/profile.desktop b/config/minimalist/profile.desktop
index 364bfdd..bf2861d 100644
--- a/config/minimalist/profile.desktop
+++ b/config/minimalist/profile.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Link
 Name=Minimalist
+Name[cs]=Minimalistický
 Name[it]=Minimalista
 Name[hu]=Minimalista
 Name[fr]=Minimaliste
@@ -8,6 +9,7 @@ Name[el]=Μινιμαλιστικό
 Name[eo]=Minimuma
 Icon=icon.png
 Comment=A mininimalist setup<br>with very few things on<br>the screen. Should<br>appeal to Those<br>that like as little<br>clutter as possible.
+Comment[cs]=Minimální nastavení<br>s velmi málo věcmi<br>na obrazovce. Použitelný<br>pro ty, kteří<br>chtějí co nejčistší<br>plochu.
 Comment[it]=Configurazione minima<br>con pochissime cose<br>sullo schermo.<br>Dovrebbe piacere a chi<br>desidera avere meno<br>roba possibile.
 Comment[hu]=Minimalist beállítások<br>néhány dologgal<br>a képernyőn. Ez egy <br>teljesen alap beállítás.
 Comment[fr]=Une configuration minimale avec<br>très peu de choses à l'écran.<br>Pour ceux qui apprécient<br>un bureau dégagé.
diff --git a/config/netbook/Makefile.in b/config/netbook/Makefile.in
index f2bcc31..a87491a 100644
--- a/config/netbook/Makefile.in
+++ b/config/netbook/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -357,8 +358,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/netbook/profile.desktop b/config/netbook/profile.desktop
index 7cbf7bd..b395c40 100644
--- a/config/netbook/profile.desktop
+++ b/config/netbook/profile.desktop
@@ -6,8 +6,9 @@ Name[el]=Netbook
 Name[eo]=Komputileto
 Icon=icon.png
 Comment=If you have a very<br>small, low-powered laptop<br>(also known as Netbooks),<br>then this profile is for<br>you. It has heavier<br>features turned off<br>to save resources.
+Comment[cs]=Pokud máte malý<br>laptop s nízkou spotřebou<br>(známé jako Netbooky),<br>pak je tento profil<br>pro vás. Má náročnější<br>funkce vypnuty,<br>aby se ušetřily systémové prostředky.
 Comment[it]=Se avete un portatile<br>molto piccolo e con<br>poca potenza (noti<br>anche come Netbook),<br>allora questo profilo<br>fa per voi.<br>In questo sono state<br>disattivate le<br>funzionalità più<br>pesanti per<br>risparmiare risorse.
 Comment[hu]=Ha egy kicsi erőforrással<br> bíró eszközöd van, laptop,<br>akkor ez a számodra<brylegmegfelelőbb beállítás.<br>Kevés erőforrást igényel.
 Comment[fr]=Si vous avez un ordinateur<br>portable de faible dimension<br>et de faible puissance<br>(appelé aussi netbook),<br>c'est le profil adéquat.<br>Les fonctionnalités les<br>plus gourmandes en<br>ressources sont<br>désactivées.
 Comment[el]=Αν έχετε ένα πολύ<br>μικρό, χαμηλής κατανάλωσης laptop<br>(γνωστά και ως Netbooks),<br>τότε αυτό το προφίλ είναι για εσάς.<br>Έχει απενεργοποιημένα τα "βαριά"<br>χαρακτηριστικά για να λειτουργεί<br> πιο γρήγορα.
-Comment[eo]=Se vi havas malgrandegan,<br>malaltpotencan tekokomputilo<br>(ankaŭ nomata komputileto),<br>do tiu profilo estas taŭga por<br>vi. Ĝia plej pezaj eblecoj<br>estas malŝaltitaj.
\ No newline at end of file
+Comment[eo]=Se vi havas malgrandegan,<br>malaltpotencan tekokomputilo<br>(ankaŭ nomata komputileto),<br>do tiu profilo estas taŭga por<br>vi. Ĝia plej pezaj eblecoj<br>estas malŝaltitaj.
diff --git a/config/scaleable/Makefile.in b/config/scaleable/Makefile.in
index 632d132..bce726a 100644
--- a/config/scaleable/Makefile.in
+++ b/config/scaleable/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -357,8 +358,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/scaleable/profile.desktop b/config/scaleable/profile.desktop
index 3fdf63d..90e0e1f 100644
--- a/config/scaleable/profile.desktop
+++ b/config/scaleable/profile.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Link
 Name=Scaleable
+Name[cs]=Škálovatelný
 Name[it]=Scalabile
 Name[hu]=Kalibrálható
 Name[fr]=Proportionnel
@@ -8,6 +9,7 @@ Name[el]=Κλιμακωτό
 Name[eo]=Skalebla
 Icon=icon.png
 Comment=The Standard setup, but<br>with automatic scaling<br>enabled to adapt to<br>the resolution of your<br>display, if it is set<br>correctly.
+Comment[cs]=Standartní nastavení, ale<br>s povoleným automatickým<br>škálováním, které se přizpůsobí<br>rozlišení vaší obrazovky,<br>pokud je nastaveno<br>správně.
 Comment[it]=La configurazione<br>standard ma con<br>scalatura automatica<br>abilitata per essere<br>adattata alla<br>risoluzione del vostro<br>schermo se impostata<br>correttamente.
 Comment[hu]=Az általános beállítás,<br>kiegészítve a kalibrációval,<br>amely automaikusan a képernyő<br>felbontásodhoz igazítja az<br>ablakok méretét.
 Comment[fr]=La configuration standard avec<br>mise à l'échelle automatique<br>proportionnée à la résolution<br>de l'écran, si les paramètres<br>sont corrects.
diff --git a/config/standard/Makefile.in b/config/standard/Makefile.in
index 5489158..2d3acb6 100644
--- a/config/standard/Makefile.in
+++ b/config/standard/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -357,8 +358,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/config/standard/e.src b/config/standard/e.src
index a2e6940..2c9b7f7 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -472,6 +472,14 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
+  group "modules" list {
+    group "E_Config_Module" struct {
+      value "name" string: "everything";
+      value "enabled" uchar: 1;
+      value "delayed" uchar: 1;
+      value "priority" int: 0;
+    }
+  }
   group "themes" list {
     group "E_Config_Theme" struct {
       value "category" string: "theme";
diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop
index 2cda6f1..e25060d 100644
--- a/config/standard/profile.desktop
+++ b/config/standard/profile.desktop
@@ -1,14 +1,16 @@
 [Desktop Entry]
 Type=Link
 Name=Standard
+Name[cs]=Standartní
 Name[hu]=Általános
 Name[fr]=Standard
 Name[el]=Κανονικό
 Name[eo]=Kutima
 Icon=icon.png
 Comment=This is the standard<br>profile that is<br>universal for most<br>desktop and laptop<br>systems. Choose this<br>if you are not<br>sure what to choose.
+Comment[cs]=Toto je standartní<br>univerzální<br>profil pro většinu<br>stolních a přenosných<br>počítačů. Vyberte pokud<br>si nejste jisti<br>co vybrat.
 Comment[it]=Questo è il profilo<br>standard, universale<br>per la maggior<br>parte dei sistemi<br>desktop e portatili.<br>Scegliete questo se<br>non siete sicuri di<br>cosa scegliere.
 Comment[hu]=Ez az általános,<br>alap beállítás,<br>amely megfelelő a<br>legtöbb laptop és<br>asztali gép számára.
 Comment[fr]=C'est le profil standard<br>adapté à la quasi totalité<br>des systèmes de bureau<br>et ordinateurs portables.<br>Choisissez ce profil si<br>vous n'êtes pas sûr.
 Comment[el]=Αυτό είναι το κανονικό <br>προφίλ που είναι κοινό<br>για τα περισσότερα συστήματα. Επιλέξτε αυτό<br>αν δεν είστε σίγουροι για <br>την επιλογή σας.
-Comment[eo]=Tio estas la kutima profilo<br>taŭga por preskaŭ ĉiuj<br>oficejaj sistemoj kaj<br>porteblaj sistemoj.<br>Elektu ĝin se vi ne certas.
\ No newline at end of file
+Comment[eo]=Tio estas la kutima profilo<br>taŭga por preskaŭ ĉiuj<br>oficejaj sistemoj kaj<br>porteblaj sistemoj.<br>Elektu ĝin se vi ne certas.
diff --git a/configure b/configure
index 4e759ad..32b95a9 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for enlightenment 0.16.999.062.
+# Generated by GNU Autoconf 2.63 for enlightenment 0.16.999.063.
 #
 # Report bugs to <enlightenment-devel at lists.sourceforge.net>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -65,8 +93,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf at gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf at gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -494,19 +513,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -531,10 +553,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -723,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='enlightenment'
 PACKAGE_TARNAME='enlightenment'
-PACKAGE_VERSION='0.16.999.062'
-PACKAGE_STRING='enlightenment 0.16.999.062'
+PACKAGE_VERSION='0.16.999.063'
+PACKAGE_STRING='enlightenment 0.16.999.063'
 PACKAGE_BUGREPORT='enlightenment-devel at lists.sourceforge.net'
 
 ac_unique_file="configure.ac"
@@ -764,401 +786,486 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CPP
-GREP
-EGREP
-ALLOCA
-LIBTOOL
-SED
-FGREP
-LD
-DUMPBIN
-ac_ct_DUMPBIN
-NM
-LN_S
-AR
-RANLIB
-lt_ECHO
-DSYMUTIL
-NMEDIT
-LIPO
-OTOOL
-OTOOL64
-release
-fnmatch_libs
-VALGRIND_CFLAGS
-VALGRIND_LIBS
-MODULE_ARCH
-PACKAGE_BIN_DIR
-PACKAGE_LIB_DIR
-PACKAGE_DATA_DIR
-LOCALE_DIR
-PACKAGE_SYSCONF_DIR
-XMKMF
-X_CFLAGS
-X_PRE_LIBS
-X_LIBS
-X_EXTRA_LIBS
-x_cflags
-x_libs
-cf_cflags
-cf_libs
-ALL_LINGUAS
-MKINSTALLDIRS
-USE_NLS
-MSGFMT
-GMSGFMT
-XGETTEXT
-MSGMERGE
-LIBICONV
-LTLIBICONV
-INTLLIBS
-LIBINTL
-LTLIBINTL
-POSUB
-dlopen_libs
-PKG_CONFIG
-E_REMOTE_CFLAGS
-E_REMOTE_LIBS
-E_IMC_CFLAGS
-E_IMC_LIBS
-E_THUMB_CFLAGS
-E_THUMB_LIBS
-E_FM_CFLAGS
-E_FM_LIBS
-E_FM_OP_CFLAGS
-E_FM_OP_LIBS
-E_FM_OPEN_CFLAGS
-E_FM_OPEN_LIBS
-E_SYS_CFLAGS
-E_SYS_LIBS
-E_INIT_CFLAGS
-E_INIT_LIBS
-E_CFLAGS
-E_LIBS
-ECORE_IMF_CFLAGS
-ECORE_IMF_LIBS
-ECORE_IMF_VERSION
-HAVE_ECORE_IMF_TRUE
-HAVE_ECORE_IMF_FALSE
-HAVE_ECORE_IMF
-e_libs
-e_cflags
-e_configflags
-requirements_e
-EDJE_DEF
-edje_cc
-EET_CFLAGS
-EET_LIBS
-eet_eet
-HAVE_BATTERY_TRUE
-HAVE_BATTERY_FALSE
-BATTERY_LDFLAGS
-HAVE_TEMPERATURE_TRUE
-HAVE_TEMPERATURE_FALSE
-HAVE_EXCHANGE_TRUE
-HAVE_EXCHANGE_FALSE
-HAVE_ALSA_TRUE
-HAVE_ALSA_FALSE
-SOUND_CFLAGS
-SOUND_LIBS
-USE_MODULE_IBAR_TRUE
-USE_MODULE_IBAR_FALSE
-USE_MODULE_IBAR
-USE_MODULE_DROPSHADOW_TRUE
-USE_MODULE_DROPSHADOW_FALSE
-USE_MODULE_DROPSHADOW
-USE_MODULE_CLOCK_TRUE
-USE_MODULE_CLOCK_FALSE
-USE_MODULE_CLOCK
-USE_MODULE_PAGER_TRUE
-USE_MODULE_PAGER_FALSE
-USE_MODULE_PAGER
-BATTERY_CFLAGS
-BATTERY_LIBS
-BATTERY_VERSION
-HAVE_BATTERY
-USE_MODULE_BATTERY_TRUE
-USE_MODULE_BATTERY_FALSE
-USE_MODULE_BATTERY
-ECORE_TXT_CFLAGS
-ECORE_TXT_LIBS
-ECORE_TXT_VERSION
-HAVE_ECORE_TXT_TRUE
-HAVE_ECORE_TXT_FALSE
-HAVE_ECORE_TXT
-TEMPERATURE_CFLAGS
-TEMPERATURE_LIBS
-TEMPERATURE_VERSION
-HAVE_TEMPERATURE
-USE_MODULE_TEMPERATURE_TRUE
-USE_MODULE_TEMPERATURE_FALSE
-USE_MODULE_TEMPERATURE
-USE_MODULE_CPUFREQ_TRUE
-USE_MODULE_CPUFREQ_FALSE
-USE_MODULE_CPUFREQ
-USE_MODULE_IBOX_TRUE
-USE_MODULE_IBOX_FALSE
-USE_MODULE_IBOX
-USE_MODULE_START_TRUE
-USE_MODULE_START_FALSE
-USE_MODULE_START
-USE_MODULE_EXEBUF_TRUE
-USE_MODULE_EXEBUF_FALSE
-USE_MODULE_EXEBUF
-USE_MODULE_WINLIST_TRUE
-USE_MODULE_WINLIST_FALSE
-USE_MODULE_WINLIST
-USE_MODULE_FILEMAN_TRUE
-USE_MODULE_FILEMAN_FALSE
-USE_MODULE_FILEMAN
-USE_MODULE_FILEMAN_OPINFO_TRUE
-USE_MODULE_FILEMAN_OPINFO_FALSE
-USE_MODULE_FILEMAN_OPINFO
-USE_MODULE_WIZARD_TRUE
-USE_MODULE_WIZARD_FALSE
-USE_MODULE_WIZARD
-USE_MODULE_CONF_TRUE
-USE_MODULE_CONF_FALSE
-USE_MODULE_CONF
-USE_MODULE_CONF_WALLPAPER_TRUE
-USE_MODULE_CONF_WALLPAPER_FALSE
-USE_MODULE_CONF_WALLPAPER
-USE_MODULE_CONF_WALLPAPER2_TRUE
-USE_MODULE_CONF_WALLPAPER2_FALSE
-USE_MODULE_CONF_WALLPAPER2
-EXCHANGE_CFLAGS
-EXCHANGE_LIBS
-EXCHANGE_VERSION
-HAVE_EXCHANGE
-USE_MODULE_CONF_THEME_TRUE
-USE_MODULE_CONF_THEME_FALSE
-USE_MODULE_CONF_THEME
-USE_MODULE_CONF_COLORS_TRUE
-USE_MODULE_CONF_COLORS_FALSE
-USE_MODULE_CONF_COLORS
-USE_MODULE_CONF_FONTS_TRUE
-USE_MODULE_CONF_FONTS_FALSE
-USE_MODULE_CONF_FONTS
-USE_MODULE_CONF_BORDERS_TRUE
-USE_MODULE_CONF_BORDERS_FALSE
-USE_MODULE_CONF_BORDERS
-USE_MODULE_CONF_ICON_THEME_TRUE
-USE_MODULE_CONF_ICON_THEME_FALSE
-USE_MODULE_CONF_ICON_THEME
-USE_MODULE_CONF_MOUSE_CURSOR_TRUE
-USE_MODULE_CONF_MOUSE_CURSOR_FALSE
-USE_MODULE_CONF_MOUSE_CURSOR
-USE_MODULE_CONF_TRANSITIONS_TRUE
-USE_MODULE_CONF_TRANSITIONS_FALSE
-USE_MODULE_CONF_TRANSITIONS
-USE_MODULE_CONF_STARTUP_TRUE
-USE_MODULE_CONF_STARTUP_FALSE
-USE_MODULE_CONF_STARTUP
-USE_MODULE_CONF_INTL_TRUE
-USE_MODULE_CONF_INTL_FALSE
-USE_MODULE_CONF_INTL
-USE_MODULE_CONF_IMC_TRUE
-USE_MODULE_CONF_IMC_FALSE
-USE_MODULE_CONF_IMC
-USE_MODULE_CONF_PROFILES_TRUE
-USE_MODULE_CONF_PROFILES_FALSE
-USE_MODULE_CONF_PROFILES
-USE_MODULE_MSGBUS_LANG_TRUE
-USE_MODULE_MSGBUS_LANG_FALSE
-USE_MODULE_MSGBUS_LANG
-USE_MODULE_CONF_ENGINE_TRUE
-USE_MODULE_CONF_ENGINE_FALSE
-USE_MODULE_CONF_ENGINE
-USE_MODULE_CONF_APPLICATIONS_TRUE
-USE_MODULE_CONF_APPLICATIONS_FALSE
-USE_MODULE_CONF_APPLICATIONS
-USE_MODULE_CONF_DESKS_TRUE
-USE_MODULE_CONF_DESKS_FALSE
-USE_MODULE_CONF_DESKS
-USE_MODULE_CONF_DESK_TRUE
-USE_MODULE_CONF_DESK_FALSE
-USE_MODULE_CONF_DESK
-USE_MODULE_CONF_DISPLAY_TRUE
-USE_MODULE_CONF_DISPLAY_FALSE
-USE_MODULE_CONF_DISPLAY
-USE_MODULE_CONF_DESKLOCK_TRUE
-USE_MODULE_CONF_DESKLOCK_FALSE
-USE_MODULE_CONF_DESKLOCK
-USE_MODULE_CONF_SCREENSAVER_TRUE
-USE_MODULE_CONF_SCREENSAVER_FALSE
-USE_MODULE_CONF_SCREENSAVER
-USE_MODULE_CONF_DPMS_TRUE
-USE_MODULE_CONF_DPMS_FALSE
-USE_MODULE_CONF_DPMS
-USE_MODULE_CONF_SHELVES_TRUE
-USE_MODULE_CONF_SHELVES_FALSE
-USE_MODULE_CONF_SHELVES
-USE_MODULE_CONF_KEYBINDINGS_TRUE
-USE_MODULE_CONF_KEYBINDINGS_FALSE
-USE_MODULE_CONF_KEYBINDINGS
-USE_MODULE_CONF_MOUSEBINDINGS_TRUE
-USE_MODULE_CONF_MOUSEBINDINGS_FALSE
-USE_MODULE_CONF_MOUSEBINDINGS
-USE_MODULE_CONF_EDGEBINDINGS_TRUE
-USE_MODULE_CONF_EDGEBINDINGS_FALSE
-USE_MODULE_CONF_EDGEBINDINGS
-USE_MODULE_CONF_MOUSE_TRUE
-USE_MODULE_CONF_MOUSE_FALSE
-USE_MODULE_CONF_MOUSE
-USE_MODULE_CONF_WINDOW_DISPLAY_TRUE
-USE_MODULE_CONF_WINDOW_DISPLAY_FALSE
-USE_MODULE_CONF_WINDOW_DISPLAY
-USE_MODULE_CONF_WINDOW_FOCUS_TRUE
-USE_MODULE_CONF_WINDOW_FOCUS_FALSE
-USE_MODULE_CONF_WINDOW_FOCUS
-USE_MODULE_CONF_WINDOW_REMEMBERS_TRUE
-USE_MODULE_CONF_WINDOW_REMEMBERS_FALSE
-USE_MODULE_CONF_WINDOW_REMEMBERS
-USE_MODULE_CONF_WINDOW_MANIPULATION_TRUE
-USE_MODULE_CONF_WINDOW_MANIPULATION_FALSE
-USE_MODULE_CONF_WINDOW_MANIPULATION
-USE_MODULE_CONF_MENUS_TRUE
-USE_MODULE_CONF_MENUS_FALSE
-USE_MODULE_CONF_MENUS
-USE_MODULE_CONF_CLIENTLIST_TRUE
-USE_MODULE_CONF_CLIENTLIST_FALSE
-USE_MODULE_CONF_CLIENTLIST
-USE_MODULE_CONF_DIALOGS_TRUE
-USE_MODULE_CONF_DIALOGS_FALSE
-USE_MODULE_CONF_DIALOGS
-USE_MODULE_CONF_PERFORMANCE_TRUE
-USE_MODULE_CONF_PERFORMANCE_FALSE
-USE_MODULE_CONF_PERFORMANCE
-USE_MODULE_CONF_WINLIST_TRUE
-USE_MODULE_CONF_WINLIST_FALSE
-USE_MODULE_CONF_WINLIST
-USE_MODULE_CONF_EXEBUF_TRUE
-USE_MODULE_CONF_EXEBUF_FALSE
-USE_MODULE_CONF_EXEBUF
-USE_MODULE_CONF_PATHS_TRUE
-USE_MODULE_CONF_PATHS_FALSE
-USE_MODULE_CONF_PATHS
-USE_MODULE_CONF_MIME_TRUE
-USE_MODULE_CONF_MIME_FALSE
-USE_MODULE_CONF_MIME
-USE_MODULE_CONF_INTERACTION_TRUE
-USE_MODULE_CONF_INTERACTION_FALSE
-USE_MODULE_CONF_INTERACTION
-USE_MODULE_CONF_SCALE_TRUE
-USE_MODULE_CONF_SCALE_FALSE
-USE_MODULE_CONF_SCALE
-USE_MODULE_GADMAN_TRUE
-USE_MODULE_GADMAN_FALSE
-USE_MODULE_GADMAN
-ALSA_CFLAGS
-ALSA_LIBS
-ALSA_VERSION
-HAVE_ALSA
-USE_MODULE_MIXER_TRUE
-USE_MODULE_MIXER_FALSE
-USE_MODULE_MIXER
-USE_MODULE_CONNMAN_TRUE
-USE_MODULE_CONNMAN_FALSE
-USE_MODULE_CONNMAN
-USE_MODULE_ILLUME_TRUE
-USE_MODULE_ILLUME_FALSE
-USE_MODULE_ILLUME
-USE_MODULE_SYSCON_TRUE
-USE_MODULE_SYSCON_FALSE
-USE_MODULE_SYSCON
-USE_MODULE_EVERYTHING_TRUE
-USE_MODULE_EVERYTHING_FALSE
-USE_MODULE_EVERYTHING
-USE_MODULE_SYSTRAY_TRUE
-USE_MODULE_SYSTRAY_FALSE
-USE_MODULE_SYSTRAY
+ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LTLIBOBJS'
+USE_MODULE_SYSTRAY
+USE_MODULE_SYSTRAY_FALSE
+USE_MODULE_SYSTRAY_TRUE
+USE_MODULE_EVERYTHING
+USE_MODULE_EVERYTHING_FALSE
+USE_MODULE_EVERYTHING_TRUE
+USE_MODULE_SYSCON
+USE_MODULE_SYSCON_FALSE
+USE_MODULE_SYSCON_TRUE
+USE_MODULE_ILLUME
+USE_MODULE_ILLUME_FALSE
+USE_MODULE_ILLUME_TRUE
+USE_MODULE_CONNMAN
+USE_MODULE_CONNMAN_FALSE
+USE_MODULE_CONNMAN_TRUE
+USE_MODULE_MIXER
+USE_MODULE_MIXER_FALSE
+USE_MODULE_MIXER_TRUE
+HAVE_ALSA
+ALSA_VERSION
+ALSA_LIBS
+ALSA_CFLAGS
+USE_MODULE_GADMAN
+USE_MODULE_GADMAN_FALSE
+USE_MODULE_GADMAN_TRUE
+USE_MODULE_CONF_SCALE
+USE_MODULE_CONF_SCALE_FALSE
+USE_MODULE_CONF_SCALE_TRUE
+USE_MODULE_CONF_INTERACTION
+USE_MODULE_CONF_INTERACTION_FALSE
+USE_MODULE_CONF_INTERACTION_TRUE
+USE_MODULE_CONF_MIME
+USE_MODULE_CONF_MIME_FALSE
+USE_MODULE_CONF_MIME_TRUE
+USE_MODULE_CONF_PATHS
+USE_MODULE_CONF_PATHS_FALSE
+USE_MODULE_CONF_PATHS_TRUE
+USE_MODULE_CONF_EXEBUF
+USE_MODULE_CONF_EXEBUF_FALSE
+USE_MODULE_CONF_EXEBUF_TRUE
+USE_MODULE_CONF_WINLIST
+USE_MODULE_CONF_WINLIST_FALSE
+USE_MODULE_CONF_WINLIST_TRUE
+USE_MODULE_CONF_PERFORMANCE
+USE_MODULE_CONF_PERFORMANCE_FALSE
+USE_MODULE_CONF_PERFORMANCE_TRUE
+USE_MODULE_CONF_DIALOGS
+USE_MODULE_CONF_DIALOGS_FALSE
+USE_MODULE_CONF_DIALOGS_TRUE
+USE_MODULE_CONF_CLIENTLIST
+USE_MODULE_CONF_CLIENTLIST_FALSE
+USE_MODULE_CONF_CLIENTLIST_TRUE
+USE_MODULE_CONF_MENUS
+USE_MODULE_CONF_MENUS_FALSE
+USE_MODULE_CONF_MENUS_TRUE
+USE_MODULE_CONF_WINDOW_MANIPULATION
+USE_MODULE_CONF_WINDOW_MANIPULATION_FALSE
+USE_MODULE_CONF_WINDOW_MANIPULATION_TRUE
+USE_MODULE_CONF_WINDOW_REMEMBERS
+USE_MODULE_CONF_WINDOW_REMEMBERS_FALSE
+USE_MODULE_CONF_WINDOW_REMEMBERS_TRUE
+USE_MODULE_CONF_WINDOW_FOCUS
+USE_MODULE_CONF_WINDOW_FOCUS_FALSE
+USE_MODULE_CONF_WINDOW_FOCUS_TRUE
+USE_MODULE_CONF_WINDOW_DISPLAY
+USE_MODULE_CONF_WINDOW_DISPLAY_FALSE
+USE_MODULE_CONF_WINDOW_DISPLAY_TRUE
+USE_MODULE_CONF_MOUSE
+USE_MODULE_CONF_MOUSE_FALSE
+USE_MODULE_CONF_MOUSE_TRUE
+USE_MODULE_CONF_EDGEBINDINGS
+USE_MODULE_CONF_EDGEBINDINGS_FALSE
+USE_MODULE_CONF_EDGEBINDINGS_TRUE
+USE_MODULE_CONF_MOUSEBINDINGS
+USE_MODULE_CONF_MOUSEBINDINGS_FALSE
+USE_MODULE_CONF_MOUSEBINDINGS_TRUE
+USE_MODULE_CONF_KEYBINDINGS
+USE_MODULE_CONF_KEYBINDINGS_FALSE
+USE_MODULE_CONF_KEYBINDINGS_TRUE
+USE_MODULE_CONF_SHELVES
+USE_MODULE_CONF_SHELVES_FALSE
+USE_MODULE_CONF_SHELVES_TRUE
+USE_MODULE_CONF_DPMS
+USE_MODULE_CONF_DPMS_FALSE
+USE_MODULE_CONF_DPMS_TRUE
+USE_MODULE_CONF_SCREENSAVER
+USE_MODULE_CONF_SCREENSAVER_FALSE
+USE_MODULE_CONF_SCREENSAVER_TRUE
+USE_MODULE_CONF_DESKLOCK
+USE_MODULE_CONF_DESKLOCK_FALSE
+USE_MODULE_CONF_DESKLOCK_TRUE
+USE_MODULE_CONF_DISPLAY
+USE_MODULE_CONF_DISPLAY_FALSE
+USE_MODULE_CONF_DISPLAY_TRUE
+USE_MODULE_CONF_DESK
+USE_MODULE_CONF_DESK_FALSE
+USE_MODULE_CONF_DESK_TRUE
+USE_MODULE_CONF_DESKS
+USE_MODULE_CONF_DESKS_FALSE
+USE_MODULE_CONF_DESKS_TRUE
+USE_MODULE_CONF_APPLICATIONS
+USE_MODULE_CONF_APPLICATIONS_FALSE
+USE_MODULE_CONF_APPLICATIONS_TRUE
+USE_MODULE_CONF_ENGINE
+USE_MODULE_CONF_ENGINE_FALSE
+USE_MODULE_CONF_ENGINE_TRUE
+USE_MODULE_MSGBUS_LANG
+USE_MODULE_MSGBUS_LANG_FALSE
+USE_MODULE_MSGBUS_LANG_TRUE
+USE_MODULE_CONF_PROFILES
+USE_MODULE_CONF_PROFILES_FALSE
+USE_MODULE_CONF_PROFILES_TRUE
+USE_MODULE_CONF_IMC
+USE_MODULE_CONF_IMC_FALSE
+USE_MODULE_CONF_IMC_TRUE
+USE_MODULE_CONF_INTL
+USE_MODULE_CONF_INTL_FALSE
+USE_MODULE_CONF_INTL_TRUE
+USE_MODULE_CONF_STARTUP
+USE_MODULE_CONF_STARTUP_FALSE
+USE_MODULE_CONF_STARTUP_TRUE
+USE_MODULE_CONF_TRANSITIONS
+USE_MODULE_CONF_TRANSITIONS_FALSE
+USE_MODULE_CONF_TRANSITIONS_TRUE
+USE_MODULE_CONF_MOUSE_CURSOR
+USE_MODULE_CONF_MOUSE_CURSOR_FALSE
+USE_MODULE_CONF_MOUSE_CURSOR_TRUE
+USE_MODULE_CONF_ICON_THEME
+USE_MODULE_CONF_ICON_THEME_FALSE
+USE_MODULE_CONF_ICON_THEME_TRUE
+USE_MODULE_CONF_BORDERS
+USE_MODULE_CONF_BORDERS_FALSE
+USE_MODULE_CONF_BORDERS_TRUE
+USE_MODULE_CONF_FONTS
+USE_MODULE_CONF_FONTS_FALSE
+USE_MODULE_CONF_FONTS_TRUE
+USE_MODULE_CONF_COLORS
+USE_MODULE_CONF_COLORS_FALSE
+USE_MODULE_CONF_COLORS_TRUE
+USE_MODULE_CONF_THEME
+USE_MODULE_CONF_THEME_FALSE
+USE_MODULE_CONF_THEME_TRUE
+HAVE_EXCHANGE
+EXCHANGE_VERSION
+EXCHANGE_LIBS
+EXCHANGE_CFLAGS
+USE_MODULE_CONF_WALLPAPER2
+USE_MODULE_CONF_WALLPAPER2_FALSE
+USE_MODULE_CONF_WALLPAPER2_TRUE
+USE_MODULE_CONF_WALLPAPER
+USE_MODULE_CONF_WALLPAPER_FALSE
+USE_MODULE_CONF_WALLPAPER_TRUE
+USE_MODULE_CONF
+USE_MODULE_CONF_FALSE
+USE_MODULE_CONF_TRUE
+USE_MODULE_WIZARD
+USE_MODULE_WIZARD_FALSE
+USE_MODULE_WIZARD_TRUE
+USE_MODULE_FILEMAN_OPINFO
+USE_MODULE_FILEMAN_OPINFO_FALSE
+USE_MODULE_FILEMAN_OPINFO_TRUE
+USE_MODULE_FILEMAN
+USE_MODULE_FILEMAN_FALSE
+USE_MODULE_FILEMAN_TRUE
+USE_MODULE_WINLIST
+USE_MODULE_WINLIST_FALSE
+USE_MODULE_WINLIST_TRUE
+USE_MODULE_EXEBUF
+USE_MODULE_EXEBUF_FALSE
+USE_MODULE_EXEBUF_TRUE
+USE_MODULE_START
+USE_MODULE_START_FALSE
+USE_MODULE_START_TRUE
+USE_MODULE_IBOX
+USE_MODULE_IBOX_FALSE
+USE_MODULE_IBOX_TRUE
+USE_MODULE_CPUFREQ
+USE_MODULE_CPUFREQ_FALSE
+USE_MODULE_CPUFREQ_TRUE
+USE_MODULE_TEMPERATURE
+USE_MODULE_TEMPERATURE_FALSE
+USE_MODULE_TEMPERATURE_TRUE
+HAVE_TEMPERATURE
+TEMPERATURE_VERSION
+TEMPERATURE_LIBS
+TEMPERATURE_CFLAGS
+HAVE_ECORE_TXT
+HAVE_ECORE_TXT_FALSE
+HAVE_ECORE_TXT_TRUE
+ECORE_TXT_VERSION
+ECORE_TXT_LIBS
+ECORE_TXT_CFLAGS
+USE_MODULE_BATTERY
+USE_MODULE_BATTERY_FALSE
+USE_MODULE_BATTERY_TRUE
+HAVE_BATTERY
+BATTERY_VERSION
+BATTERY_LIBS
+BATTERY_CFLAGS
+USE_MODULE_PAGER
+USE_MODULE_PAGER_FALSE
+USE_MODULE_PAGER_TRUE
+USE_MODULE_CLOCK
+USE_MODULE_CLOCK_FALSE
+USE_MODULE_CLOCK_TRUE
+USE_MODULE_DROPSHADOW
+USE_MODULE_DROPSHADOW_FALSE
+USE_MODULE_DROPSHADOW_TRUE
+USE_MODULE_IBAR
+USE_MODULE_IBAR_FALSE
+USE_MODULE_IBAR_TRUE
+SOUND_LIBS
+SOUND_CFLAGS
+HAVE_ALSA_FALSE
+HAVE_ALSA_TRUE
+HAVE_EXCHANGE_FALSE
+HAVE_EXCHANGE_TRUE
+HAVE_TEMPERATURE_FALSE
+HAVE_TEMPERATURE_TRUE
+BATTERY_LDFLAGS
+HAVE_BATTERY_FALSE
+HAVE_BATTERY_TRUE
+eet_eet
+EET_LIBS
+EET_CFLAGS
+edje_cc
+EDJE_DEF
+requirements_e
+e_configflags
+e_cflags
+e_libs
+HAVE_ECORE_IMF
+HAVE_ECORE_IMF_FALSE
+HAVE_ECORE_IMF_TRUE
+ECORE_IMF_VERSION
+ECORE_IMF_LIBS
+ECORE_IMF_CFLAGS
+E_LIBS
+E_CFLAGS
+E_INIT_LIBS
+E_INIT_CFLAGS
+E_SYS_LIBS
+E_SYS_CFLAGS
+E_FM_OPEN_LIBS
+E_FM_OPEN_CFLAGS
+E_FM_OP_LIBS
+E_FM_OP_CFLAGS
+E_FM_LIBS
+E_FM_CFLAGS
+E_THUMB_LIBS
+E_THUMB_CFLAGS
+E_IMC_LIBS
+E_IMC_CFLAGS
+E_REMOTE_LIBS
+E_REMOTE_CFLAGS
+PKG_CONFIG
+dlopen_libs
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+MSGMERGE
+XGETTEXT
+GMSGFMT
+MSGFMT
+USE_NLS
+MKINSTALLDIRS
+ALL_LINGUAS
+cf_libs
+cf_cflags
+x_libs
+x_cflags
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+PACKAGE_SYSCONF_DIR
+LOCALE_DIR
+PACKAGE_DATA_DIR
+PACKAGE_LIB_DIR
+PACKAGE_BIN_DIR
+MODULE_ARCH
+VALGRIND_LIBS
+VALGRIND_CFLAGS
+fnmatch_libs
+release
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+AR
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+SED
+LIBTOOL
+ALLOCA
+EGREP
+GREP
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+enable_pam
+enable_simple_x11
+with_x
+enable_nls
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+enable_files
+with_profile
+with_edje_cc
+with_eet_eet
+enable_ibar
+enable_dropshadow
+enable_clock
+enable_pager
+enable_battery
+enable_temperature
+enable_cpufreq
+enable_ibox
+enable_start
+enable_exebuf
+enable_winlist
+enable_fileman
+enable_fileman_opinfo
+enable_wizard
+enable_conf
+enable_conf_wallpaper
+enable_conf_wallpaper2
+enable_conf_theme
+enable_conf_colors
+enable_conf_fonts
+enable_conf_borders
+enable_conf_icon_theme
+enable_conf_mouse_cursor
+enable_conf_transitions
+enable_conf_startup
+enable_conf_intl
+enable_conf_imc
+enable_conf_profiles
+enable_msgbus_lang
+enable_conf_engine
+enable_conf_applications
+enable_conf_desks
+enable_conf_desk
+enable_conf_display
+enable_conf_desklock
+enable_conf_screensaver
+enable_conf_dpms
+enable_conf_shelves
+enable_conf_keybindings
+enable_conf_mousebindings
+enable_conf_edgebindings
+enable_conf_mouse
+enable_conf_window_display
+enable_conf_window_focus
+enable_conf_window_remembers
+enable_conf_window_manipulation
+enable_conf_menus
+enable_conf_clientlist
+enable_conf_dialogs
+enable_conf_performance
+enable_conf_winlist
+enable_conf_exebuf
+enable_conf_paths
+enable_conf_mime
+enable_conf_interaction
+enable_conf_scale
+enable_gadman
+enable_mixer
+enable_connman
+enable_illume
+enable_syscon
+enable_everything
+enable_systray
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -1207,6 +1314,8 @@ ALSA_LIBS'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1305,13 +1414,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1324,13 +1441,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1521,22 +1646,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1556,7 +1697,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1565,16 +1706,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1583,22 +1724,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1613,7 +1770,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1629,10 +1786,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1640,12 +1797,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1672,12 +1829,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1704,7 +1861,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.062 to adapt to many kinds of systems.
+\`configure' configures enlightenment 0.16.999.063 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1726,9 +1883,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1738,25 +1895,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/enlightenment]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/enlightenment]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1778,11 +1935,12 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of enlightenment 0.16.999.062:";;
+     short | recursive ) echo "Configuration of enlightenment 0.16.999.063:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
@@ -1796,7 +1954,7 @@ Optional Features:
   --enable-simple-x11     enable simple x11 linking
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --enable-files          enable Files menu item [yes]
+  --enable-files          enable Files menu item [default=yes]
   --disable-ibar          optional module ibar [default=enabled]
   --disable-dropshadow    optional module dropshadow [default=enabled]
   --disable-clock         optional module clock [default=enabled]
@@ -1820,35 +1978,29 @@ Optional Features:
   --disable-conf-theme    optional module conf-theme [default=enabled]
   --disable-conf-colors   optional module conf-colors [default=enabled]
   --disable-conf-fonts    optional module conf-fonts [default=enabled]
-  --disable-conf-borders
-                          optional module conf-borders [default=enabled]
+  --disable-conf-borders  optional module conf-borders [default=enabled]
   --disable-conf-icon-theme
                           optional module conf-icon-theme [default=enabled]
   --disable-conf-mouse-cursor
                           optional module conf-mouse-cursor [default=enabled]
   --disable-conf-transitions
                           optional module conf-transitions [default=enabled]
-  --disable-conf-startup
-                          optional module conf-startup [default=enabled]
+  --disable-conf-startup  optional module conf-startup [default=enabled]
   --disable-conf-intl     optional module conf-intl [default=enabled]
   --disable-conf-imc      optional module conf-imc [default=enabled]
-  --disable-conf-profiles
-                          optional module conf-profiles [default=enabled]
+  --disable-conf-profiles optional module conf-profiles [default=enabled]
   --disable-msgbus-lang   optional module msgbus-lang [default=enabled]
   --disable-conf-engine   optional module conf-engine [default=enabled]
   --disable-conf-applications
                           optional module conf-applications [default=enabled]
   --disable-conf-desks    optional module conf-desks [default=enabled]
   --disable-conf-desk     optional module conf-desk [default=enabled]
-  --disable-conf-display
-                          optional module conf-display [default=enabled]
-  --disable-conf-desklock
-                          optional module conf-desklock [default=enabled]
+  --disable-conf-display  optional module conf-display [default=enabled]
+  --disable-conf-desklock optional module conf-desklock [default=enabled]
   --disable-conf-screensaver
                           optional module conf-screensaver [default=enabled]
   --disable-conf-dpms     optional module conf-dpms [default=enabled]
-  --disable-conf-shelves
-                          optional module conf-shelves [default=enabled]
+  --disable-conf-shelves  optional module conf-shelves [default=enabled]
   --disable-conf-keybindings
                           optional module conf-keybindings [default=enabled]
   --disable-conf-mousebindings
@@ -1867,12 +2019,10 @@ Optional Features:
   --disable-conf-menus    optional module conf-menus [default=enabled]
   --disable-conf-clientlist
                           optional module conf-clientlist [default=enabled]
-  --disable-conf-dialogs
-                          optional module conf-dialogs [default=enabled]
+  --disable-conf-dialogs  optional module conf-dialogs [default=enabled]
   --disable-conf-performance
                           optional module conf-performance [default=enabled]
-  --disable-conf-winlist
-                          optional module conf-winlist [default=enabled]
+  --disable-conf-winlist  optional module conf-winlist [default=enabled]
   --disable-conf-exebuf   optional module conf-exebuf [default=enabled]
   --disable-conf-paths    optional module conf-paths [default=enabled]
   --disable-conf-mime     optional module conf-mime [default=enabled]
@@ -1982,15 +2132,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2026,7 +2178,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2035,11 +2187,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-enlightenment configure 0.16.999.062
-generated by GNU Autoconf 2.61
+enlightenment configure 0.16.999.063
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2049,8 +2201,8 @@ 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.062, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by enlightenment $as_me 0.16.999.063, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -2086,7 +2238,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -2121,7 +2273,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -2173,11 +2325,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -2207,9 +2360,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -2224,9 +2377,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -2242,8 +2395,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2285,21 +2438,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -2309,16 +2465,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -2332,29 +2488,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2364,10 +2529,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2402,6 +2569,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+release="ver-svn-05"
 
 
 
@@ -2422,8 +2590,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2438,34 +2606,34 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2482,27 +2650,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2527,10 +2695,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2543,7 +2711,7 @@ do
   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_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2554,11 +2722,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2567,10 +2735,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2583,7 +2751,7 @@ do
   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_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2594,11 +2762,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2606,12 +2774,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2624,10 +2788,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2640,7 +2804,7 @@ do
   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_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2651,11 +2815,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2664,10 +2828,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2685,7 +2849,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2708,11 +2872,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2723,10 +2887,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2739,7 +2903,7 @@ do
   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_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2750,11 +2914,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2767,10 +2931,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2783,7 +2947,7 @@ do
   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_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2794,11 +2958,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2810,12 +2974,8 @@ done
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2825,44 +2985,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -2881,27 +3047,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -2912,10 +3073,11 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2926,7 +3088,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2953,25 +3115,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2980,49 +3144,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3031,31 +3199,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3078,40 +3248,43 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3137,20 +3310,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3160,15 +3334,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3195,20 +3373,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3233,20 +3412,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3272,20 +3452,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3300,8 +3481,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3317,10 +3498,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3391,20 +3572,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3420,15 +3602,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3440,10 +3622,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
@@ -3475,33 +3657,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_cposix_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_cposix_strerror=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
-if test $ac_cv_lib_cposix_strerror = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = x""yes; then
   LIBS="$LIBS -lcposix"
 fi
 
@@ -3523,11 +3709,12 @@ am__api_version='1.10'
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3556,17 +3743,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -3579,8 +3778,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -3590,8 +3789,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -3614,9 +3813,9 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -3627,26 +3826,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -3657,15 +3853,15 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -3700,8 +3896,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -3713,10 +3909,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -3729,7 +3925,7 @@ do
   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_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3740,22 +3936,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -3772,12 +3969,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -3802,8 +3999,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3830,8 +4027,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3858,8 +4055,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -3876,7 +4073,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='enlightenment'
- VERSION='0.16.999.062'
+ VERSION='0.16.999.063'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3914,10 +4111,10 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -3930,7 +4127,7 @@ do
   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_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3941,11 +4138,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3954,10 +4151,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -3970,7 +4167,7 @@ do
   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_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3981,11 +4178,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -3993,12 +4190,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -4023,10 +4216,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -4114,8 +4307,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4134,25 +4327,20 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4184,20 +4372,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4221,13 +4410,14 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4235,7 +4425,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4260,8 +4450,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -4289,20 +4479,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4326,13 +4517,14 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4340,7 +4532,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -4356,11 +4548,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -4370,42 +4564,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4420,74 +4609,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4502,40 +4677,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4562,20 +4728,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -4667,37 +4834,40 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4719,11 +4889,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4741,20 +4911,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -4762,12 +4933,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4775,28 +4949,312 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+  if test "${ac_cv_header_minix_config_h+set}" = set; then
+  { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h usability" >&5
+$as_echo_n "checking minix/config.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <minix/config.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking minix/config.h presence" >&5
+$as_echo_n "checking minix/config.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <minix/config.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: minix/config.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to enlightenment-devel at lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
+$as_echo_n "checking for minix/config.h... " >&6; }
+if test "${ac_cv_header_minix_config_h+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_header_minix_config_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
+$as_echo "$ac_cv_header_minix_config_h" >&6; }
+
+fi
+if test "x$ac_cv_header_minix_config_h" = x""yes; then
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_SOURCE 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_1_SOURCE 2
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _MINIX 1
+_ACEOF
+
+  fi
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_safe_to_define___extensions__=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_safe_to_define___extensions__=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    cat >>confdefs.h <<\_ACEOF
+#define __EXTENSIONS__ 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _ALL_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
+
+  cat >>confdefs.h <<\_ACEOF
+#define _TANDEM_SOURCE 1
+_ACEOF
+
+
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -4808,33 +5266,34 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -4846,20 +5305,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -4867,29 +5327,69 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
@@ -4900,30 +5400,101 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4942,14 +5513,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -4961,60 +5532,67 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+;; #(
+   no)
+      ;; #(
+   universal)
 
 cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
+#define AC_APPLE_UNIVERSAL_BUILD 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
-   { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }
+   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
 if test "${ac_cv_prog_cc_c99+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
@@ -5161,7 +5739,7 @@ main ()
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
@@ -5170,20 +5748,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c99=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -5199,30 +5778,30 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c99" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c99"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
 
 
 
 if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-set dummy $CC; ac_cc=`echo $2 |
+set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
 if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5248,19 +5827,21 @@ if { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
    test -f conftest2.$ac_objext && { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
@@ -5271,10 +5852,11 @@ then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
       rm -f conftest2.*
@@ -5282,19 +5864,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
 	 test -f conftest2.$ac_objext && { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
       then
 	# cc works too.
@@ -5312,11 +5896,11 @@ rm -f core conftest*
 
 fi
 if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define NO_MINUS_C_MINUS_O 1
@@ -5327,8 +5911,9 @@ fi
 # FIXME: we rely on the cache variable name because
 # there is no other way.
 set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
+if test "$am_t" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
    # But if we don't then we get into trouble of one sort or another.
@@ -5338,10 +5923,10 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
 fi
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5413,20 +5998,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -5434,22 +6020,22 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
 if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5473,31 +6059,35 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_working_alloca_h=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5506,10 +6096,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
 if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5553,31 +6143,35 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_alloca_works=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
@@ -5598,10 +6192,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
 if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5625,15 +6219,15 @@ fi
 rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5686,33 +6280,40 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -5724,10 +6325,10 @@ fi
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
 if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_c_stack_direction=0
@@ -5765,36 +6366,39 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_stack_direction=-1
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
@@ -5805,11 +6409,11 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for __attribute__" >&5
-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for __attribute__" >&5
+$as_echo_n "checking for __attribute__... " >&6; }
 
 if test "${ac_cv___attribute__+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5840,20 +6444,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv___attribute__="yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv___attribute__="no"
@@ -5864,8 +6469,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 
-{ echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
-echo "${ECHO_T}$ac_cv___attribute__" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+$as_echo "$ac_cv___attribute__" >&6; }
 
 if test "x${ac_cv___attribute__}" = "xyes" ; then
 
@@ -5881,7 +6486,7 @@ _ACEOF
   else
 
 cat >>confdefs.h <<\_ACEOF
-#define __UNUSED__
+#define __UNUSED__ /**/
 _ACEOF
 
 fi
@@ -5924,14 +6529,14 @@ fi
 
 case `pwd` in
   *\ * | *\	*)
-    { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
-macro_version='2.2.4'
-macro_revision='1.2976'
+macro_version='2.2.6'
+macro_revision='1.3012'
 
 
 
@@ -5947,48 +6552,43 @@ macro_revision='1.2976'
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
-     echo "$ac_script" | sed 99q >conftest.sed
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      $as_unset ac_script || ac_script=
-     # Extract the first word of "sed gsed" to use in msg output
-if test -z "$SED"; then
-set dummy sed gsed; ac_prog_name=$2
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$SED"; then
   ac_path_SED_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  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_prog in sed gsed; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-    # Check for GNU ac_path_SED and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -6003,31 +6603,23 @@ case `"$ac_path_SED" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_SED_found && break 3
+      $ac_path_SED_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-SED="$ac_cv_path_SED"
-if test -z "$SED"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-echo "${ECHO_T}$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -6044,45 +6636,40 @@ Xsed="$SED -e 1s/^X//"
 
 
 
-{ echo "$as_me:$LINENO: checking for fgrep" >&5
-echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
 if test "${ac_cv_path_FGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
-     # Extract the first word of "fgrep" to use in msg output
-if test -z "$FGREP"; then
-set dummy fgrep; ac_prog_name=$2
-if test "${ac_cv_path_FGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$FGREP"; then
   ac_path_FGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in fgrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-    # Check for GNU ac_path_FGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'FGREP' >> "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -6097,33 +6684,24 @@ case `"$ac_path_FGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_FGREP_found && break 3
+      $ac_path_FGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-FGREP="$ac_cv_path_FGREP"
-if test -z "$FGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_FGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_FGREP=$FGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
@@ -6157,8 +6735,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -6187,14 +6765,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -6224,19 +6802,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -6248,8 +6826,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -6260,10 +6838,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
-{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -6309,8 +6887,8 @@ else
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
 else
@@ -6320,10 +6898,10 @@ else
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DUMPBIN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
@@ -6336,7 +6914,7 @@ do
   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_DUMPBIN="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6347,11 +6925,11 @@ fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-echo "${ECHO_T}$DUMPBIN" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6364,10 +6942,10 @@ if test -z "$DUMPBIN"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
@@ -6380,7 +6958,7 @@ do
   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_DUMPBIN="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6391,11 +6969,11 @@ fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6407,12 +6985,8 @@ done
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
@@ -6431,45 +7005,45 @@ test -z "$NM" && NM=nm
 
 
 
-{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
 if test "${lt_cv_nm_interface+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6441: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7015: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6444: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7018: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6447: output\"" >&5)
+  (eval echo "\"\$as_me:7021: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 # 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; }
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -6586,11 +7160,11 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
@@ -6603,8 +7177,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
@@ -6613,18 +7187,18 @@ xsi_shell=no
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
-echo "${ECHO_T}$xsi_shell" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-echo "${ECHO_T}$lt_shell_append" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
 
 
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -6658,15 +7232,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
 if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -6692,10 +7266,10 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -6882,8 +7456,8 @@ tpf*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -6902,10 +7476,10 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -6918,7 +7492,7 @@ do
   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_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6929,11 +7503,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6942,10 +7516,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -6958,7 +7532,7 @@ do
   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_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6969,11 +7543,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -6981,12 +7555,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -7011,10 +7581,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -7027,7 +7597,7 @@ do
   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_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7038,11 +7608,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7051,10 +7621,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -7067,7 +7637,7 @@ do
   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_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7078,11 +7648,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -7090,12 +7660,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -7114,10 +7680,10 @@ test -z "$STRIP" && STRIP=:
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -7130,7 +7696,7 @@ do
   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_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7141,11 +7707,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7154,10 +7720,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -7170,7 +7736,7 @@ do
   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_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7181,11 +7747,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -7193,12 +7759,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -7275,10 +7837,10 @@ compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -7396,14 +7958,14 @@ _LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -7460,7 +8022,7 @@ _LT_EOF
 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -7495,11 +8057,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
 
@@ -7539,7 +8101,7 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
@@ -7554,11 +8116,11 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7557 "configure"' > conftest.$ac_ext
+  echo '#line 8119 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -7596,7 +8158,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
@@ -7646,10 +8208,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7678,26 +8240,30 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -7707,8 +8273,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -7720,7 +8286,7 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -7747,10 +8313,10 @@ need_locks="$enable_libtool_lock"
     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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -7763,7 +8329,7 @@ do
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7774,11 +8340,11 @@ fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7787,10 +8353,10 @@ 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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -7803,7 +8369,7 @@ do
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7814,11 +8380,11 @@ 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; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -7826,12 +8392,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -7843,10 +8405,10 @@ 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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -7859,7 +8421,7 @@ do
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7870,11 +8432,11 @@ fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7883,10 +8445,10 @@ 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; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -7899,7 +8461,7 @@ do
   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
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7910,11 +8472,11 @@ 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; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -7922,12 +8484,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -7939,10 +8497,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LIPO+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
@@ -7955,7 +8513,7 @@ do
   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_LIPO="${ac_tool_prefix}lipo"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7966,11 +8524,11 @@ fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { echo "$as_me:$LINENO: result: $LIPO" >&5
-echo "${ECHO_T}$LIPO" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7979,10 +8537,10 @@ if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
@@ -7995,7 +8553,7 @@ do
   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_LIPO="lipo"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8006,11 +8564,11 @@ fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-echo "${ECHO_T}$ac_ct_LIPO" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
@@ -8018,12 +8576,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
@@ -8035,10 +8589,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
@@ -8051,7 +8605,7 @@ do
   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_OTOOL="${ac_tool_prefix}otool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8062,11 +8616,11 @@ fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { echo "$as_me:$LINENO: result: $OTOOL" >&5
-echo "${ECHO_T}$OTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8075,10 +8629,10 @@ if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
@@ -8091,7 +8645,7 @@ do
   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_OTOOL="otool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8102,11 +8656,11 @@ fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
@@ -8114,12 +8668,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
@@ -8131,10 +8681,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_OTOOL64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
@@ -8147,7 +8697,7 @@ do
   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_OTOOL64="${ac_tool_prefix}otool64"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8158,11 +8708,11 @@ fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { echo "$as_me:$LINENO: result: $OTOOL64" >&5
-echo "${ECHO_T}$OTOOL64" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8171,10 +8721,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
@@ -8187,7 +8737,7 @@ do
   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_OTOOL64="otool64"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8198,11 +8748,11 @@ fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
@@ -8210,12 +8760,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
@@ -8250,10 +8796,10 @@ fi
 
 
 
-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
 if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
@@ -8277,12 +8823,12 @@ else
 	rm -f conftest.*
       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; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
@@ -8309,33 +8855,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_ld_exported_symbols_list=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_ld_exported_symbols_list=no
 fi
 
+rm -rf conftest.dSYM
 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; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -8374,11 +8924,11 @@ echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8396,20 +8946,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -8417,12 +8968,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -8572,10 +9126,10 @@ if test -n "${ZSH_VERSION+set}" ; then
    setopt NO_GLOB_SUBST
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
 if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -8587,8 +9141,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -8680,10 +9234,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -8733,11 +9287,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8746,10 +9300,10 @@ fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -8799,11 +9353,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8883,10 +9437,10 @@ lt_prog_compiler_no_builtin_flag=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
@@ -8901,11 +9455,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:8904: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9458: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8908: \$? = $ac_status" >&5
+   echo "$as_me:9462: \$? = $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.
@@ -8918,8 +9472,8 @@ else
    $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -8938,8 +9492,8 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -9195,8 +9749,8 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 
 
@@ -9207,10 +9761,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
 # Check to make sure the PIC flag actually works.
 #
 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; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
@@ -9225,11 +9779,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:9228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9782: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9232: \$? = $ac_status" >&5
+   echo "$as_me:9786: \$? = $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.
@@ -9242,8 +9796,8 @@ else
    $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -9266,10 +9820,10 @@ fi
 # Check to make sure the static flag actually works.
 #
 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; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -9294,8 +9848,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -9309,10 +9863,10 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
@@ -9330,11 +9884,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:9333: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9887: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9337: \$? = $ac_status" >&5
+   echo "$as_me:9891: \$? = $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
@@ -9356,18 +9910,18 @@ else
    $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
-  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
@@ -9385,11 +9939,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:9388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9942: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9392: \$? = $ac_status" >&5
+   echo "$as_me:9946: \$? = $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
@@ -9411,8 +9965,8 @@ else
    $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
@@ -9420,19 +9974,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
@@ -9444,8 +9998,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -9904,18 +10458,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -9930,12 +10487,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9971,18 +10529,21 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -9997,12 +10558,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10221,27 +10783,31 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
@@ -10499,8 +11065,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     fi
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
@@ -10536,15 +11102,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -10562,7 +11128,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -10574,8 +11140,8 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
@@ -10738,8 +11304,8 @@ esac
 
 
 
-  { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
   case $host_os in
@@ -11181,29 +11747,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
   shlibpath_overrides_runpath=yes
 fi
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
@@ -11429,8 +11999,8 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11531,8 +12101,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
@@ -11556,8 +12126,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
    test "$inherit_rpath" = yes; then
@@ -11601,10 +12171,10 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -11636,33 +12206,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -11675,10 +12249,10 @@ fi
     ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11731,38 +12305,42 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -11794,39 +12372,43 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
   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; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -11879,38 +12461,42 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -11942,39 +12528,43 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -12006,39 +12596,43 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -12070,33 +12664,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -12135,10 +12733,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -12146,7 +12744,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12149 "configure"
+#line 12747 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12212,7 +12810,7 @@ _LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -12230,15 +12828,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -12246,7 +12844,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12249 "configure"
+#line 12847 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12312,7 +12910,7 @@ _LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -12330,8 +12928,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -12369,13 +12967,13 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -12383,16 +12981,16 @@ else
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     fi
     ;;
   *)
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -12409,13 +13007,13 @@ fi
 
 
   # Report which library types will actually be built
-  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-  { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
@@ -12435,15 +13033,15 @@ echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
     fi
     ;;
   esac
-  { echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-  { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 
 
@@ -12478,17 +13076,16 @@ CC="$lt_save_CC"
 
 
 
-release="ver-svn-03"
 
 
 
 for ac_func in setenv
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12541,35 +13138,42 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -12578,11 +13182,11 @@ done
 
 for ac_func in unsetenv
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12635,35 +13239,42 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -12673,20 +13284,21 @@ done
 
 for ac_header in fnmatch.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12702,32 +13314,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12741,51 +13354,52 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to enlightenment-devel at lists.sourceforge.net ##
@@ -12794,26 +13408,29 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  { { echo "$as_me:$LINENO: error: Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file" >&5
-echo "$as_me: error: Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file" >&5
+$as_echo "$as_me: error: Cannot find fnmatch.h. Make sure your CFLAGS environment variable contains include lines for the location of this file" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -12823,11 +13440,11 @@ done
 
 for ac_func in fnmatch
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -12880,35 +13497,42 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
  res=yes
 else
@@ -12917,10 +13541,10 @@ fi
 done
 
 if test "x$res" = "xno"; then
-        { echo "$as_me:$LINENO: checking for fnmatch in -lfnmatch" >&5
-echo $ECHO_N "checking for fnmatch in -lfnmatch... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for fnmatch in -lfnmatch" >&5
+$as_echo_n "checking for fnmatch in -lfnmatch... " >&6; }
 if test "${ac_cv_lib_fnmatch_fnmatch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfnmatch  $LIBS"
@@ -12952,41 +13576,45 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_fnmatch_fnmatch=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_fnmatch_fnmatch=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fnmatch_fnmatch" >&5
-echo "${ECHO_T}$ac_cv_lib_fnmatch_fnmatch" >&6; }
-if test $ac_cv_lib_fnmatch_fnmatch = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_fnmatch_fnmatch" >&5
+$as_echo "$ac_cv_lib_fnmatch_fnmatch" >&6; }
+if test "x$ac_cv_lib_fnmatch_fnmatch" = x""yes; then
   res=yes
 else
   res=no
 fi
 
 	if test "x$res" = "xno"; then
-		{ { echo "$as_me:$LINENO: error: Cannot find fnmatch() in neither libc nor libfnmatch" >&5
-echo "$as_me: error: Cannot find fnmatch() in neither libc nor libfnmatch" >&2;}
+		{ { $as_echo "$as_me:$LINENO: error: Cannot find fnmatch() in neither libc nor libfnmatch" >&5
+$as_echo "$as_me: error: Cannot find fnmatch() in neither libc nor libfnmatch" >&2;}
    { (exit 1); exit 1; }; }
         else
 	        fnmatch_libs="-lfnmatch"
@@ -13008,20 +13636,21 @@ if test "x$want_pam" != "xno" ; then
 
 for ac_header in security/pam_appl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13037,32 +13666,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13076,51 +13706,52 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to enlightenment-devel at lists.sourceforge.net ##
@@ -13129,21 +13760,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 		LIBS="$LIBS -lpam"
@@ -13158,8 +13792,8 @@ fi
 done
 
 	if test "x$want_pam$have_pam" = "xyesno" ; then
-		{ { echo "$as_me:$LINENO: error: PAM support was requested but not found" >&5
-echo "$as_me: error: PAM support was requested but not found" >&2;}
+		{ { $as_echo "$as_me:$LINENO: error: PAM support was requested but not found" >&5
+$as_echo "$as_me: error: PAM support was requested but not found" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 fi
@@ -13223,8 +13857,8 @@ fi
 x_dir=""
 x_cflags=""
 x_libs=""
-{ echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
@@ -13238,11 +13872,11 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
-echo "$as_me: error: Cannot use X directory names containing '" >&2;}
+    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
    { (exit 1); exit 1; }; };; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
@@ -13263,7 +13897,7 @@ _ACEOF
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib la dll; do
       if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
 	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
@@ -13277,7 +13911,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -13338,13 +13972,14 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -13352,7 +13987,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
@@ -13393,30 +14028,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
+  for ac_extension in a so sl dylib la dll; do
     if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
@@ -13425,6 +14063,7 @@ do
 done
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
@@ -13447,8 +14086,8 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
@@ -13458,8 +14097,8 @@ else
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 if test "$no_x" = yes; then
@@ -13480,8 +14119,8 @@ else
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
@@ -13506,23 +14145,26 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
@@ -13547,33 +14189,38 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+$as_echo "neither works" >&6; }
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
@@ -13619,27 +14266,30 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
@@ -13671,41 +14321,45 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
@@ -13737,39 +14391,44 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
@@ -13782,10 +14441,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+$as_echo_n "checking for gethostbyname... " >&6; }
 if test "${ac_cv_func_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -13838,37 +14497,41 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+$as_echo "$ac_cv_func_gethostbyname" >&6; }
 
     if test $ac_cv_func_gethostbyname = no; then
-      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
@@ -13900,41 +14563,45 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_nsl_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
@@ -13966,33 +14633,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_bsd_gethostbyname=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -14006,10 +14677,10 @@ fi
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    { echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for connect" >&5
+$as_echo_n "checking for connect... " >&6; }
 if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14062,37 +14733,41 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+$as_echo "$ac_cv_func_connect" >&6; }
 
     if test $ac_cv_func_connect = no; then
-      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
@@ -14124,43 +14799,47 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_connect=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_connect=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-if test $ac_cv_lib_socket_connect = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    { echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for remove" >&5
+$as_echo_n "checking for remove... " >&6; }
 if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14213,37 +14892,41 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+$as_echo "$ac_cv_func_remove" >&6; }
 
     if test $ac_cv_func_remove = no; then
-      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
 if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
@@ -14275,43 +14958,47 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_posix_remove=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_posix_remove=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-if test $ac_cv_lib_posix_remove = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+$as_echo_n "checking for shmat... " >&6; }
 if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -14364,37 +15051,41 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+$as_echo "$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
@@ -14426,33 +15117,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ipc_shmat=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ipc_shmat=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-if test $ac_cv_lib_ipc_shmat = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -14468,10 +15163,10 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
@@ -14503,33 +15198,37 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ICE_IceConnectionNumber=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -14538,17 +15237,17 @@ fi
 fi
 
 if test "${ac_cv_header_X11_X_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for X11/X.h" >&5
-echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for X11/X.h" >&5
+$as_echo_n "checking for X11/X.h... " >&6; }
 if test "${ac_cv_header_X11_X_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
+$as_echo "$ac_cv_header_X11_X_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking X11/X.h usability" >&5
-echo $ECHO_N "checking X11/X.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/X.h usability" >&5
+$as_echo_n "checking X11/X.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14564,32 +15263,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking X11/X.h presence" >&5
-echo $ECHO_N "checking X11/X.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking X11/X.h presence" >&5
+$as_echo_n "checking X11/X.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14603,51 +15303,52 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/X.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: X11/X.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to enlightenment-devel at lists.sourceforge.net ##
@@ -14656,18 +15357,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for X11/X.h" >&5
-echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for X11/X.h" >&5
+$as_echo_n "checking for X11/X.h... " >&6; }
 if test "${ac_cv_header_X11_X_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_X11_X_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
+$as_echo "$ac_cv_header_X11_X_h" >&6; }
 
 fi
-if test $ac_cv_header_X11_X_h = yes; then
+if test "x$ac_cv_header_X11_X_h" = x""yes; then
 
     if test "x$want_evas_simple_x11" = "xyes"; then
       x_libs="${x_libs} -lX11 -lXext"
@@ -14679,8 +15380,8 @@ if test $ac_cv_header_X11_X_h = yes; then
 
 else
 
-    { { echo "$as_me:$LINENO: error: Cannot find X headers and libraries." >&5
-echo "$as_me: error: Cannot find X headers and libraries." >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Cannot find X headers and libraries." >&5
+$as_echo "$as_me: error: Cannot find X headers and libraries." >&2;}
    { (exit 1); exit 1; }; }
 
 
@@ -14697,20 +15398,21 @@ CPPFLAGS="${CPPFLAGS} -I /System/Library/Frameworks/CoreFoundation.framework/Hea
 
 for ac_header in CFBase.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14726,32 +15428,33 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -14765,51 +15468,52 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 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
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
 ## Report this to enlightenment-devel at lists.sourceforge.net ##
@@ -14818,21 +15522,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
     cf_cflags="-I /System/Library/Frameworks/CoreFoundation.framework/Headers"
@@ -14848,6 +15555,296 @@ CPPFLAGS="${PCPPFLAGS}"
 
 
 
+
+execinfo_libs=""
+
+for ac_header in execinfo.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## -------------------------------------------------------- ##
+## Report this to enlightenment-devel at lists.sourceforge.net ##
+## -------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ have_execinfo="yes"
+else
+  have_execinfo="no"
+fi
+
+done
+
+if test "x${have_execinfo}" = "xyes" ; then
+   { $as_echo "$as_me:$LINENO: checking whether backtrace_symbols_fd() is in libc" >&5
+$as_echo_n "checking whether backtrace_symbols_fd() is in libc... " >&6; }
+
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <execinfo.h>
+
+int
+main ()
+{
+
+backtrace_symbols_fd(NULL, 0, 0);
+
+  ;
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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 && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  link_execinfo="yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	link_execinfo="no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+   { $as_echo "$as_me:$LINENO: result: ${link_execinfo}" >&5
+$as_echo "${link_execinfo}" >&6; }
+fi
+
+if test "x${link_execinfo}" = "xno" ; then
+   { $as_echo "$as_me:$LINENO: checking whether backtrace_symbols_fd() is in libexecinfo" >&5
+$as_echo_n "checking whether backtrace_symbols_fd() is in libexecinfo... " >&6; }
+
+   LDFLAGS_save="${LDFLAGS}"
+   LDFLAGS="${LDFLAGS} -lexecinfo"
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <execinfo.h>
+
+int
+main ()
+{
+
+backtrace_symbols_fd(NULL, 0, 0);
+
+  ;
+  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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 && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+       linkexec_info="yes"
+       execinfo_libs="-lexecinfo"
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	linkexec_info="no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="${LDFLAGS_save}"
+
+   { $as_echo "$as_me:$LINENO: result: ${link_execinfo}" >&5
+$as_echo "${link_execinfo}" >&6; }
+fi
+
+if test "x${link_execinfo}" = "xno" ; then
+   { { $as_echo "$as_me:$LINENO: error: Cannot use backtrace_symbols_fd()" >&5
+$as_echo "$as_me: error: Cannot use backtrace_symbols_fd()" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
 #ALL_LINGUAS="bg de eo es fi fr ja pl pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW ko"
 #ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
 # a lot of .po's are broken
@@ -14868,8 +15865,8 @@ ALL_LINGUAS="bg ca cs da de el eo es fi fr fr_CH he hu it ja ko nb nl pl pt_BR r
 
 
 
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval=$enable_nls; USE_NLS=$enableval
@@ -14877,8 +15874,8 @@ else
   USE_NLS=yes
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -14915,10 +15912,10 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
   [\\/]* | ?:[\\/]*)
@@ -14946,19 +15943,19 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -14973,7 +15970,7 @@ do
   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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -14986,11 +15983,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -15026,10 +16023,10 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
   [\\/]* | ?:[\\/]*)
@@ -15057,11 +16054,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
     rm -f messages.po
@@ -15097,10 +16094,10 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
   [\\/]* | ?:[\\/]*)
@@ -15127,11 +16124,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -15141,8 +16138,8 @@ fi
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
+      { $as_echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
       GMSGFMT=":"
     fi
   fi
@@ -15152,8 +16149,8 @@ echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
        (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
+      { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
       XGETTEXT=":"
     fi
         rm -f messages.po
@@ -15202,8 +16199,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -15232,14 +16229,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -15265,19 +16262,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -15286,16 +16283,16 @@ else
   acl_cv_prog_gnu_ld=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
+                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
 if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -15305,8 +16302,8 @@ else
     acl_cv_rpath=done
 
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -15721,8 +16718,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval=$enable_nls; USE_NLS=$enableval
@@ -15730,8 +16727,8 @@ else
   USE_NLS=yes
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -15748,10 +16745,10 @@ echo "${ECHO_T}$USE_NLS" >&6; }
 
 
 
-        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
 if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -15777,31 +16774,35 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_gnugettext1_libc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_gnugettext1_libc=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+$as_echo "$gt_cv_func_gnugettext1_libc" >&6; }
 
         if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
 
@@ -15834,10 +16835,10 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
   done
 
 
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
@@ -15866,26 +16867,30 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
@@ -15915,35 +16920,39 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -15952,10 +16961,10 @@ _ACEOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
+    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -16343,10 +17352,10 @@ fi
     done
   fi
 
-          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
 if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
@@ -16380,26 +17389,30 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_gnugettext1_libintl=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_gnugettext1_libintl=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
@@ -16432,37 +17445,41 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext1_libintl=yes
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; }
         fi
 
                                         if test "$gt_cv_func_gnugettext1_libc" = "yes" \
@@ -16490,13 +17507,13 @@ _ACEOF
     fi
   fi
 
-  { echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
         gt_source="external libintl"
@@ -16506,18 +17523,18 @@ echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
     else
       gt_source="included intl directory"
     fi
-    { echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
-        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
-        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6; }
+        { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -16572,10 +17589,10 @@ if test "x$LIBINTL" = "x"; then
   LIBINTL="$INTLLIBS"
 fi
 
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -16607,46 +17624,50 @@ 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_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$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
+  $as_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
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   dlopen_libs=-ldl
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether to enable Files menu item" >&5
-echo $ECHO_N "checking whether to enable Files menu item... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable Files menu item" >&5
+$as_echo_n "checking whether to enable Files menu item... " >&6; }
 # Check whether --enable-files was given.
 if test "${enable_files+set}" = set; then
   enableval=$enable_files; e_cv_enable_files=$enableval
 else
   if test "${e_cv_enable_files+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   e_cv_enable_files=yes
 fi
@@ -16660,8 +17681,8 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 fi
-{ echo "$as_me:$LINENO: result: $e_cv_enable_files" >&5
-echo "${ECHO_T}$e_cv_enable_files" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $e_cv_enable_files" >&5
+$as_echo "$e_cv_enable_files" >&6; }
 
 # explicit libs for each binary to reduce linkage requirements
 
@@ -16670,10 +17691,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16688,7 +17709,7 @@ do
   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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16700,11 +17721,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -16713,10 +17734,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -16731,7 +17752,7 @@ do
   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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -16743,11 +17764,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -16755,12 +17776,8 @@ fi
   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;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -16772,29 +17789,29 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 
 fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_REMOTE" >&5
-echo $ECHO_N "checking for E_REMOTE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_REMOTE" >&5
+$as_echo_n "checking for E_REMOTE... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_REMOTE_CFLAGS"; then
         pkg_cv_E_REMOTE_CFLAGS="$E_REMOTE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -16807,7 +17824,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_REMOTE_CFLAGS=`$PKG_CONFIG --cflags "
   ecore
@@ -16827,7 +17844,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_REMOTE_LIBS="$E_REMOTE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -16840,7 +17857,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_REMOTE_LIBS=`$PKG_CONFIG --libs "
   ecore
@@ -16883,7 +17900,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_REMOTE_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -16899,7 +17916,7 @@ Alternatively, you may set the environment variables E_REMOTE_CFLAGS
 and E_REMOTE_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 (
+$as_echo "$as_me: error: Package requirements (
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -16917,7 +17934,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -16927,7 +17946,7 @@ 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
+$as_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.
 
@@ -16937,26 +17956,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_REMOTE_CFLAGS=$pkg_cv_E_REMOTE_CFLAGS
 	E_REMOTE_LIBS=$pkg_cv_E_REMOTE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_IMC" >&5
-echo $ECHO_N "checking for E_IMC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_IMC" >&5
+$as_echo_n "checking for E_IMC... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_IMC_CFLAGS"; then
         pkg_cv_E_IMC_CFLAGS="$E_IMC_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore-file
   eet >= 1.0.1
   eina-0
@@ -16967,7 +17986,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_IMC_CFLAGS=`$PKG_CONFIG --cflags "
   ecore-file
@@ -16986,7 +18005,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_IMC_LIBS="$E_IMC_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore-file
   eet >= 1.0.1
   eina-0
@@ -16997,7 +18016,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_IMC_LIBS=`$PKG_CONFIG --libs "
   ecore-file
@@ -17037,7 +18056,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_IMC_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   ecore-file
   eet >= 1.0.1
   eina-0
@@ -17052,7 +18071,7 @@ Alternatively, you may set the environment variables E_IMC_CFLAGS
 and E_IMC_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 (
+$as_echo "$as_me: error: Package requirements (
   ecore-file
   eet >= 1.0.1
   eina-0
@@ -17069,7 +18088,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17079,7 +18100,7 @@ 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
+$as_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.
 
@@ -17089,26 +18110,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_IMC_CFLAGS=$pkg_cv_E_IMC_CFLAGS
 	E_IMC_LIBS=$pkg_cv_E_IMC_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_THUMB" >&5
-echo $ECHO_N "checking for E_THUMB... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_THUMB" >&5
+$as_echo_n "checking for E_THUMB... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_THUMB_CFLAGS"; then
         pkg_cv_E_THUMB_CFLAGS="$E_THUMB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-evas
@@ -17129,7 +18150,7 @@ if test -n "$PKG_CONFIG"; then
   efreet
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_THUMB_CFLAGS=`$PKG_CONFIG --cflags "
   evas
@@ -17153,7 +18174,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_THUMB_LIBS="$E_THUMB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-evas
@@ -17174,7 +18195,7 @@ if test -n "$PKG_CONFIG"; then
   efreet
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_THUMB_LIBS=`$PKG_CONFIG --libs "
   evas
@@ -17229,7 +18250,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_THUMB_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   evas
   ecore
   ecore-evas
@@ -17249,7 +18270,7 @@ Alternatively, you may set the environment variables E_THUMB_CFLAGS
 and E_THUMB_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 (
+$as_echo "$as_me: error: Package requirements (
   evas
   ecore
   ecore-evas
@@ -17271,7 +18292,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17281,7 +18304,7 @@ 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
+$as_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.
 
@@ -17291,26 +18314,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_THUMB_CFLAGS=$pkg_cv_E_THUMB_CFLAGS
 	E_THUMB_LIBS=$pkg_cv_E_THUMB_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_FM" >&5
-echo $ECHO_N "checking for E_FM... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_FM" >&5
+$as_echo_n "checking for E_FM... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_FM_CFLAGS"; then
         pkg_cv_E_FM_CFLAGS="$E_FM_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-file
   ecore-ipc
@@ -17331,7 +18354,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_CFLAGS=`$PKG_CONFIG --cflags "
   ecore
@@ -17355,7 +18378,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_FM_LIBS="$E_FM_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-file
   ecore-ipc
@@ -17376,7 +18399,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_LIBS=`$PKG_CONFIG --libs "
   ecore
@@ -17431,7 +18454,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_FM_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   ecore
   ecore-file
   ecore-ipc
@@ -17451,7 +18474,7 @@ Alternatively, you may set the environment variables E_FM_CFLAGS
 and E_FM_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 (
+$as_echo "$as_me: error: Package requirements (
   ecore
   ecore-file
   ecore-ipc
@@ -17473,7 +18496,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17483,7 +18508,7 @@ 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
+$as_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.
 
@@ -17493,26 +18518,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_FM_CFLAGS=$pkg_cv_E_FM_CFLAGS
 	E_FM_LIBS=$pkg_cv_E_FM_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_FM_OP" >&5
-echo $ECHO_N "checking for E_FM_OP... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_FM_OP" >&5
+$as_echo_n "checking for E_FM_OP... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_FM_OP_CFLAGS"; then
         pkg_cv_E_FM_OP_CFLAGS="$E_FM_OP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-file
   eina-0
@@ -17523,7 +18548,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_OP_CFLAGS=`$PKG_CONFIG --cflags "
   ecore
@@ -17542,7 +18567,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_FM_OP_LIBS="$E_FM_OP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-file
   eina-0
@@ -17553,7 +18578,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_OP_LIBS=`$PKG_CONFIG --libs "
   ecore
@@ -17593,7 +18618,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_FM_OP_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   ecore
   ecore-file
   eina-0
@@ -17608,7 +18633,7 @@ Alternatively, you may set the environment variables E_FM_OP_CFLAGS
 and E_FM_OP_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 (
+$as_echo "$as_me: error: Package requirements (
   ecore
   ecore-file
   eina-0
@@ -17625,7 +18650,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17635,7 +18662,7 @@ 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
+$as_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.
 
@@ -17645,26 +18672,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_FM_OP_CFLAGS=$pkg_cv_E_FM_OP_CFLAGS
 	E_FM_OP_LIBS=$pkg_cv_E_FM_OP_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_FM_OPEN" >&5
-echo $ECHO_N "checking for E_FM_OPEN... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_FM_OPEN" >&5
+$as_echo_n "checking for E_FM_OPEN... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_FM_OPEN_CFLAGS"; then
         pkg_cv_E_FM_OPEN_CFLAGS="$E_FM_OPEN_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -17677,7 +18704,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_OPEN_CFLAGS=`$PKG_CONFIG --cflags "
   ecore
@@ -17697,7 +18724,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_FM_OPEN_LIBS="$E_FM_OPEN_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -17710,7 +18737,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_FM_OPEN_LIBS=`$PKG_CONFIG --libs "
   ecore
@@ -17753,7 +18780,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_FM_OPEN_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -17769,7 +18796,7 @@ Alternatively, you may set the environment variables E_FM_OPEN_CFLAGS
 and E_FM_OPEN_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 (
+$as_echo "$as_me: error: Package requirements (
   ecore
   ecore-ipc
   eet >= 1.0.1
@@ -17787,7 +18814,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17797,7 +18826,7 @@ 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
+$as_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.
 
@@ -17807,33 +18836,33 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_FM_OPEN_CFLAGS=$pkg_cv_E_FM_OPEN_CFLAGS
 	E_FM_OPEN_LIBS=$pkg_cv_E_FM_OPEN_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_SYS" >&5
-echo $ECHO_N "checking for E_SYS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_SYS" >&5
+$as_echo_n "checking for E_SYS... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_SYS_CFLAGS"; then
         pkg_cv_E_SYS_CFLAGS="$E_SYS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   eina-0
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_SYS_CFLAGS=`$PKG_CONFIG --cflags "
   eina-0
@@ -17850,14 +18879,14 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_SYS_LIBS="$E_SYS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   eina-0
 \"") >&5
   ($PKG_CONFIG --exists --print-errors "
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_SYS_LIBS=`$PKG_CONFIG --libs "
   eina-0
@@ -17891,7 +18920,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_SYS_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   eina-0
 ) were not met:
 
@@ -17904,7 +18933,7 @@ Alternatively, you may set the environment variables E_SYS_CFLAGS
 and E_SYS_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 (
+$as_echo "$as_me: error: Package requirements (
   eina-0
 ) were not met:
 
@@ -17919,7 +18948,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -17929,7 +18960,7 @@ 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
+$as_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.
 
@@ -17939,26 +18970,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_SYS_CFLAGS=$pkg_cv_E_SYS_CFLAGS
 	E_SYS_LIBS=$pkg_cv_E_SYS_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E_INIT" >&5
-echo $ECHO_N "checking for E_INIT... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E_INIT" >&5
+$as_echo_n "checking for E_INIT... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_INIT_CFLAGS"; then
         pkg_cv_E_INIT_CFLAGS="$E_INIT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-file
@@ -17979,7 +19010,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_INIT_CFLAGS=`$PKG_CONFIG --cflags "
   evas
@@ -18003,7 +19034,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_INIT_LIBS="$E_INIT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-file
@@ -18024,7 +19055,7 @@ if test -n "$PKG_CONFIG"; then
   eina-0
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_INIT_LIBS=`$PKG_CONFIG --libs "
   evas
@@ -18079,7 +19110,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_INIT_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   evas
   ecore
   ecore-file
@@ -18099,7 +19130,7 @@ Alternatively, you may set the environment variables E_INIT_CFLAGS
 and E_INIT_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 (
+$as_echo "$as_me: error: Package requirements (
   evas
   ecore
   ecore-file
@@ -18121,7 +19152,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -18131,7 +19164,7 @@ 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
+$as_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.
 
@@ -18141,26 +19174,26 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_INIT_CFLAGS=$pkg_cv_E_INIT_CFLAGS
 	E_INIT_LIBS=$pkg_cv_E_INIT_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for E" >&5
-echo $ECHO_N "checking for E... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for E" >&5
+$as_echo_n "checking for E... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$E_CFLAGS"; then
         pkg_cv_E_CFLAGS="$E_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-x
@@ -18197,7 +19230,7 @@ if test -n "$PKG_CONFIG"; then
   ehal
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_CFLAGS=`$PKG_CONFIG --cflags "
   evas
@@ -18229,7 +19262,7 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_E_LIBS="$E_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
   evas
   ecore
   ecore-x
@@ -18266,7 +19299,7 @@ if test -n "$PKG_CONFIG"; then
   ehal
 ") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_E_LIBS=`$PKG_CONFIG --libs "
   evas
@@ -18345,7 +19378,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$E_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (
   evas
   ecore
   ecore-x
@@ -18373,7 +19406,7 @@ Alternatively, you may set the environment variables E_CFLAGS
 and E_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 (
+$as_echo "$as_me: error: Package requirements (
   evas
   ecore
   ecore-x
@@ -18403,7 +19436,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -18413,7 +19448,7 @@ 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
+$as_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.
 
@@ -18423,12 +19458,12 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	E_CFLAGS=$pkg_cv_E_CFLAGS
 	E_LIBS=$pkg_cv_E_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 edbus ehal"
@@ -18440,18 +19475,18 @@ requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecor
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for ECORE_IMF" >&5
-echo $ECHO_N "checking for ECORE_IMF... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ECORE_IMF" >&5
+$as_echo_n "checking for ECORE_IMF... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$ECORE_IMF_CFLAGS"; then
         pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-imf ecore-imf-evas\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-imf ecore-imf-evas\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore-imf ecore-imf-evas") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ECORE_IMF_CFLAGS=`$PKG_CONFIG --cflags "ecore-imf ecore-imf-evas" 2>/dev/null`
 else
@@ -18466,10 +19501,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-imf ecore-imf-evas\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-imf ecore-imf-evas\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore-imf ecore-imf-evas") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ECORE_IMF_LIBS=`$PKG_CONFIG --libs "ecore-imf ecore-imf-evas" 2>/dev/null`
 else
@@ -18497,24 +19532,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ECORE_IMF_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_ECORE_IMF=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; :
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; :
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_ECORE_IMF=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; :
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; :
 
 else
 	ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS
 	ECORE_IMF_LIBS=$pkg_cv_ECORE_IMF_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_ECORE_IMF=yes
                                 pkg_name=$(echo "ecore-imf ecore-imf-evas" | cut -d\   -f1)
@@ -18545,8 +19580,7 @@ _ACEOF
 # ----------------------------------------------------------------------
 
 
-
-e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS
+e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "$execinfo_libs
 e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS
 e_configflags="-DUSE_E_CONFIG_H"
 
@@ -18562,8 +19596,8 @@ if test "${with_profile+set}" = set; then
   withval=$with_profile; profile=$withval
 fi
 
-{ echo "$as_me:$LINENO: Enlightenment build profile set to $profile" >&5
-echo "$as_me: Enlightenment build profile set to $profile" >&6;}
+{ $as_echo "$as_me:$LINENO: Enlightenment build profile set to $profile" >&5
+$as_echo "$as_me: Enlightenment build profile set to $profile" >&6;}
 EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6"
 EDJE_DEF=$EDJE_DEF" -DE17_PROFILE"=$profile
 
@@ -18586,18 +19620,18 @@ fi
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for EET" >&5
-echo $ECHO_N "checking for EET... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for EET" >&5
+$as_echo_n "checking for EET... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$EET_CFLAGS"; then
         pkg_cv_EET_CFLAGS="$EET_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eet >= 1.0.1\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eet >= 1.0.1\"") >&5
   ($PKG_CONFIG --exists --print-errors "eet >= 1.0.1") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EET_CFLAGS=`$PKG_CONFIG --cflags "eet >= 1.0.1" 2>/dev/null`
 else
@@ -18612,10 +19646,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EET_LIBS="$EET_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eet >= 1.0.1\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"eet >= 1.0.1\"") >&5
   ($PKG_CONFIG --exists --print-errors "eet >= 1.0.1") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EET_LIBS=`$PKG_CONFIG --libs "eet >= 1.0.1" 2>/dev/null`
 else
@@ -18643,7 +19677,7 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EET_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (eet >= 1.0.1) were not met:
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (eet >= 1.0.1) were not met:
 
 $EET_PKG_ERRORS
 
@@ -18654,7 +19688,7 @@ Alternatively, you may set the environment variables EET_CFLAGS
 and EET_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 (eet >= 1.0.1) were not met:
+$as_echo "$as_me: error: Package requirements (eet >= 1.0.1) were not met:
 
 $EET_PKG_ERRORS
 
@@ -18667,7 +19701,9 @@ 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
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_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.
 
@@ -18677,7 +19713,7 @@ 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
+$as_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.
 
@@ -18687,12 +19723,12 @@ 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; }; }
+   { (exit 1); exit 1; }; }; }
 else
 	EET_CFLAGS=$pkg_cv_EET_CFLAGS
 	EET_LIBS=$pkg_cv_EET_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	:
 fi
 
@@ -18852,87 +19888,6 @@ fi
 
 
 # ----------------------------------------------------------------------
-# BEGIN: Check for optional module: ibar (default: true)
-#
-
-
-        USING_MODULES=1
-
-        IBAR=true
-        # Check whether --enable-ibar was given.
-if test "${enable_ibar+set}" = set; then
-  enableval=$enable_ibar; IBAR=${enableval:-false}
-fi
-
-        if test x$IBAR = xyes || test x$IBAR = x1; then
-                IBAR=true
-        fi
-        if test x$IBAR = xno || test x$IBAR = x0; then
-                IBAR=false
-        fi
-
-        USE_MODULE_IBAR=$IBAR
-
-
-        # Check for XTerm and define some colors
-        if test "x$TERM" = "xxterm" -o "x$TERM" = "xscreen"; then
-                COLOR_PREF="\0033\0133"
-                COLOR_H="${COLOR_PREF}1m"
-                COLOR_HGREEN="${COLOR_PREF}1;32m"
-                COLOR_HRED="${COLOR_PREF}1;31m"
-                COLOR_GREEN="${COLOR_PREF}32m"
-                COLOR_RED="${COLOR_PREF}31m"
-                COLOR_YELLOW="${COLOR_PREF}1;33m"
-                COLOR_END="${COLOR_PREF}0m"
-        else
-                COLOR_H=""
-                COLOR_HGREEN=""
-                COLOR_HRED=""
-                COLOR_GREEN=""
-                COLOR_RED=""
-                COLOR_YELLOW=""
-                COLOR_END=""
-        fi
-
-
-        # Check list for optional module ibar
-        if test x$IBAR = xtrue; then
-
-
-                if test x$IBAR = xfalse; then
-                        echo -e "${COLOR_YELLOW}Warning:${COLOR_END} optional module ${COLOR_H}ibar${COLOR_END} disabled by extra checks."
-                fi
-        fi
-
-        # Check if user checks succeeded
-        if test x$IBAR = xtrue; then
-                OPTIONAL_MODULES="$OPTIONAL_MODULES ibar"
-
-cat >>confdefs.h <<_ACEOF
-#define USE_MODULE_IBAR 1
-_ACEOF
-
-        else
-                UNUSED_OPTIONAL_MODULES="$UNUSED_OPTIONAL_MODULES ibar"
-        fi
-
-         if test x$IBAR = xtrue; then
-  USE_MODULE_IBAR_TRUE=
-  USE_MODULE_IBAR_FALSE='#'
-else
-  USE_MODULE_IBAR_TRUE='#'
-  USE_MODULE_IBAR_FALSE=
-fi
-
-
-
-
-#
-# END: Check for optional module: ibar (true)
-# ----------------------------------------------------------------------
-
-
-# ----------------------------------------------------------------------
 # BEGIN: Check for optional module: dropshadow (default: true)
 #
 
@@ -19233,18 +20188,18 @@ echo "checking optional module battery:"
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for BATTERY" >&5
-echo $ECHO_N "checking for BATTERY... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for BATTERY" >&5
+$as_echo_n "checking for BATTERY... " >&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
+    { ($as_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
+  $as_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
@@ -19259,10 +20214,10 @@ if test -n "$PKG_CONFIG"; 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
+    { ($as_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
+  $as_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
@@ -19290,24 +20245,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$BATTERY_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_BATTERY=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; BATTERY=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; BATTERY=false
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_BATTERY=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; BATTERY=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; BATTERY=false
 
 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; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_BATTERY=yes
                                 pkg_name=$(echo "ecore ecore-file ecore-con" | cut -d\   -f1)
@@ -19438,18 +20393,18 @@ echo "checking optional module temperature:"
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for ECORE_TXT" >&5
-echo $ECHO_N "checking for ECORE_TXT... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ECORE_TXT" >&5
+$as_echo_n "checking for ECORE_TXT... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$ECORE_TXT_CFLAGS"; then
         pkg_cv_ECORE_TXT_CFLAGS="$ECORE_TXT_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-txt\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-txt\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore-txt") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ECORE_TXT_CFLAGS=`$PKG_CONFIG --cflags "ecore-txt" 2>/dev/null`
 else
@@ -19464,10 +20419,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_ECORE_TXT_LIBS="$ECORE_TXT_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-txt\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore-txt\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore-txt") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ECORE_TXT_LIBS=`$PKG_CONFIG --libs "ecore-txt" 2>/dev/null`
 else
@@ -19495,24 +20450,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ECORE_TXT_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_ECORE_TXT=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; TEMPERATURE=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; TEMPERATURE=false
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_ECORE_TXT=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; TEMPERATURE=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; TEMPERATURE=false
 
 else
 	ECORE_TXT_CFLAGS=$pkg_cv_ECORE_TXT_CFLAGS
 	ECORE_TXT_LIBS=$pkg_cv_ECORE_TXT_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_ECORE_TXT=yes
                                 pkg_name=$(echo "ecore-txt" | cut -d\   -f1)
@@ -19549,18 +20504,18 @@ _ACEOF
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for TEMPERATURE" >&5
-echo $ECHO_N "checking for TEMPERATURE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for TEMPERATURE" >&5
+$as_echo_n "checking for TEMPERATURE... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$TEMPERATURE_CFLAGS"; then
         pkg_cv_TEMPERATURE_CFLAGS="$TEMPERATURE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore ecore-file\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore ecore-file\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore ecore-file") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_TEMPERATURE_CFLAGS=`$PKG_CONFIG --cflags "ecore ecore-file" 2>/dev/null`
 else
@@ -19575,10 +20530,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_TEMPERATURE_LIBS="$TEMPERATURE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore ecore-file\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ecore ecore-file\"") >&5
   ($PKG_CONFIG --exists --print-errors "ecore ecore-file") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_TEMPERATURE_LIBS=`$PKG_CONFIG --libs "ecore ecore-file" 2>/dev/null`
 else
@@ -19606,24 +20561,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TEMPERATURE_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_TEMPERATURE=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; TEMPERATURE=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; TEMPERATURE=false
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_TEMPERATURE=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; TEMPERATURE=false
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; TEMPERATURE=false
 
 else
 	TEMPERATURE_CFLAGS=$pkg_cv_TEMPERATURE_CFLAGS
 	TEMPERATURE_LIBS=$pkg_cv_TEMPERATURE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_TEMPERATURE=yes
                                 pkg_name=$(echo "ecore ecore-file" | cut -d\   -f1)
@@ -20645,18 +21600,18 @@ echo "checking optional module conf-theme:"
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for EXCHANGE" >&5
-echo $ECHO_N "checking for EXCHANGE... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for EXCHANGE" >&5
+$as_echo_n "checking for EXCHANGE... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$EXCHANGE_CFLAGS"; then
         pkg_cv_EXCHANGE_CFLAGS="$EXCHANGE_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exchange\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exchange\"") >&5
   ($PKG_CONFIG --exists --print-errors "exchange") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EXCHANGE_CFLAGS=`$PKG_CONFIG --cflags "exchange" 2>/dev/null`
 else
@@ -20671,10 +21626,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_EXCHANGE_LIBS="$EXCHANGE_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exchange\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exchange\"") >&5
   ($PKG_CONFIG --exists --print-errors "exchange") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_EXCHANGE_LIBS=`$PKG_CONFIG --libs "exchange" 2>/dev/null`
 else
@@ -20702,24 +21657,24 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EXCHANGE_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_EXCHANGE=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; :
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; :
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_EXCHANGE=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }; :
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }; :
 
 else
 	EXCHANGE_CFLAGS=$pkg_cv_EXCHANGE_CFLAGS
 	EXCHANGE_LIBS=$pkg_cv_EXCHANGE_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_EXCHANGE=yes
                                 pkg_name=$(echo "exchange" | cut -d\   -f1)
@@ -24010,18 +24965,18 @@ if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$en
 
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for ALSA" >&5
-echo $ECHO_N "checking for ALSA... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
+$as_echo_n "checking for ALSA... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
     if test -n "$ALSA_CFLAGS"; then
         pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.8\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.8\"") >&5
   ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.8") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.8" 2>/dev/null`
 else
@@ -24036,10 +24991,10 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_ALSA_LIBS="$ALSA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.8\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.8\"") >&5
   ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.8") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.8" 2>/dev/null`
 else
@@ -24067,40 +25022,40 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$ALSA_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
                                 HAVE_ALSA=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };  if test "x$enable_alsa" = "xyes"; then
-        { { echo "$as_me:$LINENO: error: alsa library >= 1.0.8 not found" >&5
-echo "$as_me: error: alsa library >= 1.0.8 not found" >&2;}
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };  if test "x$enable_alsa" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: alsa library >= 1.0.8 not found" >&5
+$as_echo "$as_me: error: alsa library >= 1.0.8 not found" >&2;}
    { (exit 1); exit 1; }; }
      else
-        { echo "$as_me:$LINENO: WARNING: alsa library development files not present. no alsa support." >&5
-echo "$as_me: WARNING: alsa library development files not present. no alsa support." >&2;}
+        { $as_echo "$as_me:$LINENO: WARNING: alsa library development files not present. no alsa support." >&5
+$as_echo "$as_me: WARNING: alsa library development files not present. no alsa support." >&2;}
      fi
 
 
 elif test $pkg_failed = untried; then
 
                                 HAVE_ALSA=no
-                                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };  if test "x$enable_alsa" = "xyes"; then
-        { { echo "$as_me:$LINENO: error: alsa library >= 1.0.8 not found" >&5
-echo "$as_me: error: alsa library >= 1.0.8 not found" >&2;}
+                                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };  if test "x$enable_alsa" = "xyes"; then
+        { { $as_echo "$as_me:$LINENO: error: alsa library >= 1.0.8 not found" >&5
+$as_echo "$as_me: error: alsa library >= 1.0.8 not found" >&2;}
    { (exit 1); exit 1; }; }
      else
-        { echo "$as_me:$LINENO: WARNING: alsa library development files not present. no alsa support." >&5
-echo "$as_me: WARNING: alsa library development files not present. no alsa support." >&2;}
+        { $as_echo "$as_me:$LINENO: WARNING: alsa library development files not present. no alsa support." >&5
+$as_echo "$as_me: WARNING: alsa library development files not present. no alsa support." >&2;}
      fi
 
 
 else
 	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
 	ALSA_LIBS=$pkg_cv_ALSA_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
                                 HAVE_ALSA=yes
                                 pkg_name=$(echo "alsa >= 1.0.8" | cut -d\   -f1)
@@ -24593,7 +25548,7 @@ fi
 # ----------------------------------------------------------------------
 
 
-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/fileman_opinfo/Makefile src/modules/fileman_opinfo/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_wallpaper2/Makefile src/modules/conf_wallpaper2/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_edgebindings/Makefile src/modules/conf_edgebindings/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/modules/conf_scale/Makefile src/modules/conf_scale/module.desktop src/modules/gadman/Makefile src/modules/gadman/module.desktop src/modules/mixer/Makefile src/modules/mixer/module.desktop src/modules/connman/Makefile src/modules/connman/module.desktop src/modules/illume/Makefile src/modules/illume/module.desktop src/modules/illume/keyboards/Makefile src/modules/illume/dicts/Makefile src/modules/syscon/Makefile src/modules/syscon/module.desktop src/modules/everything/Makefile src/modules/everything/module.desktop src/modules/systray/Makefile src/modules/systray/module.desktop src/preload/Makefile data/Makefile data/images/Makefile data/input_methods/Makefile data/themes/Makefile data/themes/images/Makefile data/other/Makefile data/xsession/Makefile data/xsession/enlightenment.desktop data/etc/Makefile data/icons/Makefile data/backgrounds/Makefile doc/Makefile config/Makefile config/default/Makefile config/standard/Makefile config/minimalist/Makefile config/scaleable/Makefile config/netbook/Makefile config/illume/Makefile po/Makefile.in"
+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/fileman_opinfo/Makefile src/modules/fileman_opinfo/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_wallpaper2/Makefile src/modules/conf_wallpaper2/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_edgebindings/Makefile src/modules/conf_edgebindings/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/modules/conf_scale/Makefile src/modules/conf_scale/module.desktop src/modules/gadman/Makefile src/modules/gadman/module.desktop src/modules/mixer/Makefile src/modules/mixer/module.desktop src/modules/connman/Makefile src/modules/connman/module.desktop src/modules/illume/Makefile src/modules/illume/module.desktop src/modules/illume/keyboards/Makefile src/modules/illume/dicts/Makefile src/modules/illume2/Makefile src/modules/illume2/module.desktop src/modules/illume2/keyboards/Makefile src/modules/illume-home/Makefile src/modules/illume-home/module.desktop src/modules/illume-softkey/Makefile src/modules/illume-softkey/module.desktop src/modules/illume-keyboard/Makefile src/modules/illume-keyboard/module.desktop src/modules/illume-keyboard/keyboards/Makefile src/modules/illume-keyboard/dicts/Makefile src/modules/illume-indicator/Makefile src/modules/illume-indicator/module.desktop src/modules/syscon/Makefile src/modules/syscon/module.desktop src/modules/everything/Makefile src/modules/everything/sources/Makefile src/modules/everything/actions/Makefile src/modules/everything/views/Makefile src/modules/everything/module.desktop src/modules/everything/everything.pc src/modules/systray/Makefile src/modules/systray/module.desktop src/preload/Makefile data/Makefile data/images/Makefile data/input_methods/Makefile data/themes/Makefile data/themes/images/Makefile data/other/Makefile data/xsession/Makefile data/xsession/enlightenment.desktop data/tools/Makefile data/etc/Makefile data/icons/Makefile data/backgrounds/Makefile doc/Makefile config/Makefile config/default/Makefile config/standard/Makefile config/minimalist/Makefile config/scaleable/Makefile config/netbook/Makefile config/illume/Makefile config/illume-home/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24622,11 +25577,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -24659,12 +25615,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -24680,7 +25636,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -24692,544 +25648,539 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+
 if test -z "${HAVE_ECORE_IMF_TRUE}" && test -z "${HAVE_ECORE_IMF_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ECORE_IMF\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ECORE_IMF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_ECORE_IMF\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_ECORE_IMF\" 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.
+  { { $as_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.
+$as_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_TEMPERATURE_TRUE}" && test -z "${HAVE_TEMPERATURE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_TEMPERATURE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TEMPERATURE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_TEMPERATURE\" was never defined.
+$as_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_EXCHANGE_TRUE}" && test -z "${HAVE_EXCHANGE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_EXCHANGE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXCHANGE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_EXCHANGE\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_EXCHANGE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_IBAR_TRUE}" && test -z "${USE_MODULE_IBAR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_IBAR\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_IBAR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_IBAR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${USE_MODULE_IBAR_TRUE}" && test -z "${USE_MODULE_IBAR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_IBAR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_IBAR\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_IBAR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_DROPSHADOW_TRUE}" && test -z "${USE_MODULE_DROPSHADOW_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_DROPSHADOW\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_DROPSHADOW\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_DROPSHADOW\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_DROPSHADOW\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CLOCK_TRUE}" && test -z "${USE_MODULE_CLOCK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CLOCK\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CLOCK\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_PAGER_TRUE}" && test -z "${USE_MODULE_PAGER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_PAGER\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_PAGER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_PAGER\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_PAGER\" 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.
+  { { $as_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.
+$as_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 "${USE_MODULE_BATTERY_TRUE}" && test -z "${USE_MODULE_BATTERY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_BATTERY\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_BATTERY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_BATTERY\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_BATTERY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_ECORE_TXT_TRUE}" && test -z "${HAVE_ECORE_TXT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ECORE_TXT\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ECORE_TXT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_ECORE_TXT\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_ECORE_TXT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_TEMPERATURE_TRUE}" && test -z "${HAVE_TEMPERATURE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_TEMPERATURE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TEMPERATURE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_TEMPERATURE\" was never defined.
+$as_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 "${USE_MODULE_TEMPERATURE_TRUE}" && test -z "${USE_MODULE_TEMPERATURE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_TEMPERATURE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_TEMPERATURE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_TEMPERATURE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_TEMPERATURE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CPUFREQ_TRUE}" && test -z "${USE_MODULE_CPUFREQ_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CPUFREQ\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CPUFREQ\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CPUFREQ\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CPUFREQ\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_IBOX_TRUE}" && test -z "${USE_MODULE_IBOX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_IBOX\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_IBOX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_IBOX\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_IBOX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_START_TRUE}" && test -z "${USE_MODULE_START_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_START\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_START\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_START\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_START\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_EXEBUF_TRUE}" && test -z "${USE_MODULE_EXEBUF_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_EXEBUF\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_EXEBUF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_EXEBUF\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_EXEBUF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_WINLIST_TRUE}" && test -z "${USE_MODULE_WINLIST_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_WINLIST\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_WINLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_WINLIST\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_WINLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_FILEMAN_TRUE}" && test -z "${USE_MODULE_FILEMAN_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_FILEMAN\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_FILEMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_FILEMAN\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_FILEMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_FILEMAN_OPINFO_TRUE}" && test -z "${USE_MODULE_FILEMAN_OPINFO_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_FILEMAN_OPINFO\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_FILEMAN_OPINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_FILEMAN_OPINFO\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_FILEMAN_OPINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_WIZARD_TRUE}" && test -z "${USE_MODULE_WIZARD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_WIZARD\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_WIZARD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_WIZARD\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_WIZARD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_TRUE}" && test -z "${USE_MODULE_CONF_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WALLPAPER_TRUE}" && test -z "${USE_MODULE_CONF_WALLPAPER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WALLPAPER\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WALLPAPER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WALLPAPER\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WALLPAPER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WALLPAPER2_TRUE}" && test -z "${USE_MODULE_CONF_WALLPAPER2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WALLPAPER2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WALLPAPER2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WALLPAPER2\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WALLPAPER2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_EXCHANGE_TRUE}" && test -z "${HAVE_EXCHANGE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_EXCHANGE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXCHANGE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_EXCHANGE\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_EXCHANGE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_THEME_TRUE}" && test -z "${USE_MODULE_CONF_THEME_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_THEME\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_THEME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_THEME\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_THEME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_COLORS_TRUE}" && test -z "${USE_MODULE_CONF_COLORS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_COLORS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_COLORS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_COLORS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_COLORS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_FONTS_TRUE}" && test -z "${USE_MODULE_CONF_FONTS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_FONTS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_FONTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_FONTS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_FONTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_BORDERS_TRUE}" && test -z "${USE_MODULE_CONF_BORDERS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_BORDERS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_BORDERS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_BORDERS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_BORDERS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_ICON_THEME_TRUE}" && test -z "${USE_MODULE_CONF_ICON_THEME_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_ICON_THEME\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_ICON_THEME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_ICON_THEME\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_ICON_THEME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_MOUSE_CURSOR_TRUE}" && test -z "${USE_MODULE_CONF_MOUSE_CURSOR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSE_CURSOR\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSE_CURSOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSE_CURSOR\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSE_CURSOR\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_TRANSITIONS_TRUE}" && test -z "${USE_MODULE_CONF_TRANSITIONS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_TRANSITIONS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_TRANSITIONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_TRANSITIONS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_TRANSITIONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_STARTUP_TRUE}" && test -z "${USE_MODULE_CONF_STARTUP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_STARTUP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_STARTUP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_STARTUP\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_STARTUP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_INTL_TRUE}" && test -z "${USE_MODULE_CONF_INTL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_INTL\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_INTL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_INTL\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_INTL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_IMC_TRUE}" && test -z "${USE_MODULE_CONF_IMC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_IMC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_IMC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_IMC\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_IMC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_PROFILES_TRUE}" && test -z "${USE_MODULE_CONF_PROFILES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PROFILES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PROFILES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_PROFILES\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_PROFILES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_MSGBUS_LANG_TRUE}" && test -z "${USE_MODULE_MSGBUS_LANG_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_MSGBUS_LANG\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_MSGBUS_LANG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_MSGBUS_LANG\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_MSGBUS_LANG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_ENGINE_TRUE}" && test -z "${USE_MODULE_CONF_ENGINE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_ENGINE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_ENGINE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_ENGINE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_ENGINE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_APPLICATIONS_TRUE}" && test -z "${USE_MODULE_CONF_APPLICATIONS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_APPLICATIONS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_APPLICATIONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_APPLICATIONS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_APPLICATIONS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DESKS_TRUE}" && test -z "${USE_MODULE_CONF_DESKS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESKS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESKS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DESKS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DESKS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DESK_TRUE}" && test -z "${USE_MODULE_CONF_DESK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESK\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DESK\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DESK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DISPLAY_TRUE}" && test -z "${USE_MODULE_CONF_DISPLAY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DISPLAY\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DISPLAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DISPLAY\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DISPLAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DESKLOCK_TRUE}" && test -z "${USE_MODULE_CONF_DESKLOCK_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESKLOCK\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DESKLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DESKLOCK\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DESKLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_SCREENSAVER_TRUE}" && test -z "${USE_MODULE_CONF_SCREENSAVER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SCREENSAVER\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SCREENSAVER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_SCREENSAVER\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_SCREENSAVER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DPMS_TRUE}" && test -z "${USE_MODULE_CONF_DPMS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DPMS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DPMS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DPMS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DPMS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_SHELVES_TRUE}" && test -z "${USE_MODULE_CONF_SHELVES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SHELVES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SHELVES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_SHELVES\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_SHELVES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_KEYBINDINGS_TRUE}" && test -z "${USE_MODULE_CONF_KEYBINDINGS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_KEYBINDINGS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_KEYBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_KEYBINDINGS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_KEYBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_MOUSEBINDINGS_TRUE}" && test -z "${USE_MODULE_CONF_MOUSEBINDINGS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSEBINDINGS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSEBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSEBINDINGS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSEBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_EDGEBINDINGS_TRUE}" && test -z "${USE_MODULE_CONF_EDGEBINDINGS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_EDGEBINDINGS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_EDGEBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_EDGEBINDINGS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_EDGEBINDINGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_MOUSE_TRUE}" && test -z "${USE_MODULE_CONF_MOUSE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MOUSE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_MOUSE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WINDOW_DISPLAY_TRUE}" && test -z "${USE_MODULE_CONF_WINDOW_DISPLAY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_DISPLAY\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_DISPLAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_DISPLAY\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_DISPLAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WINDOW_FOCUS_TRUE}" && test -z "${USE_MODULE_CONF_WINDOW_FOCUS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_FOCUS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_FOCUS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_FOCUS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_FOCUS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WINDOW_REMEMBERS_TRUE}" && test -z "${USE_MODULE_CONF_WINDOW_REMEMBERS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_REMEMBERS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_REMEMBERS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_REMEMBERS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_REMEMBERS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WINDOW_MANIPULATION_TRUE}" && test -z "${USE_MODULE_CONF_WINDOW_MANIPULATION_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_MANIPULATION\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINDOW_MANIPULATION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_MANIPULATION\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WINDOW_MANIPULATION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_MENUS_TRUE}" && test -z "${USE_MODULE_CONF_MENUS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MENUS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MENUS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_MENUS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_MENUS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_CLIENTLIST_TRUE}" && test -z "${USE_MODULE_CONF_CLIENTLIST_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_CLIENTLIST\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_CLIENTLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_CLIENTLIST\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_CLIENTLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_DIALOGS_TRUE}" && test -z "${USE_MODULE_CONF_DIALOGS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DIALOGS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_DIALOGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_DIALOGS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_DIALOGS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_PERFORMANCE_TRUE}" && test -z "${USE_MODULE_CONF_PERFORMANCE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PERFORMANCE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PERFORMANCE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_PERFORMANCE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_PERFORMANCE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_WINLIST_TRUE}" && test -z "${USE_MODULE_CONF_WINLIST_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINLIST\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_WINLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_WINLIST\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_WINLIST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_EXEBUF_TRUE}" && test -z "${USE_MODULE_CONF_EXEBUF_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_EXEBUF\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_EXEBUF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_EXEBUF\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_EXEBUF\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_PATHS_TRUE}" && test -z "${USE_MODULE_CONF_PATHS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PATHS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_PATHS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_PATHS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_PATHS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_MIME_TRUE}" && test -z "${USE_MODULE_CONF_MIME_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MIME\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_MIME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_MIME\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_MIME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_INTERACTION_TRUE}" && test -z "${USE_MODULE_CONF_INTERACTION_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_INTERACTION\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_INTERACTION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_INTERACTION\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_INTERACTION\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONF_SCALE_TRUE}" && test -z "${USE_MODULE_CONF_SCALE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SCALE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONF_SCALE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONF_SCALE\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONF_SCALE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_GADMAN_TRUE}" && test -z "${USE_MODULE_GADMAN_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_GADMAN\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_GADMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_GADMAN\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_GADMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${HAVE_ALSA_TRUE}" && test -z "${HAVE_ALSA_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
+$as_echo "$as_me: error: conditional \"HAVE_ALSA\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_MIXER_TRUE}" && test -z "${USE_MODULE_MIXER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_MIXER\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_MIXER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_MIXER\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_MIXER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_CONNMAN_TRUE}" && test -z "${USE_MODULE_CONNMAN_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONNMAN\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_CONNMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_CONNMAN\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_CONNMAN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_ILLUME_TRUE}" && test -z "${USE_MODULE_ILLUME_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_ILLUME\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_ILLUME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_ILLUME\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_ILLUME\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_SYSCON_TRUE}" && test -z "${USE_MODULE_SYSCON_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_SYSCON\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_SYSCON\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_SYSCON\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_SYSCON\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_EVERYTHING_TRUE}" && test -z "${USE_MODULE_EVERYTHING_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_EVERYTHING\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_EVERYTHING\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_EVERYTHING\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_EVERYTHING\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_MODULE_SYSTRAY_TRUE}" && test -z "${USE_MODULE_SYSTRAY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_MODULE_SYSTRAY\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_MODULE_SYSTRAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_MODULE_SYSTRAY\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_MODULE_SYSTRAY\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -25242,7 +26193,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -25252,7 +26203,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -25274,17 +26225,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    PATH_SEPARATOR=:
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-  rm -f conf$$.sh
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -25300,8 +26279,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -25324,7 +26301,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -25337,17 +26314,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -25369,7 +26339,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -25420,7 +26390,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -25448,7 +26418,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -25461,19 +26430,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -25498,10 +26470,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -25523,8 +26495,8 @@ 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.062, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by enlightenment $as_me 0.16.999.063, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -25537,7 +26509,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -25545,22 +26526,23 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -25574,13 +26556,13 @@ $config_commands
 Report bugs to <bug-autoconf at gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-enlightenment config.status 0.16.999.062
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+enlightenment config.status 0.16.999.063
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -25588,11 +26570,12 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -25614,30 +26597,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -25656,27 +26645,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -25807,6 +26798,47 @@ enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quot
 enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
 old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
 striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+LD_='`$ECHO "X$LD_" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds_='`$ECHO "X$old_archive_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_='`$ECHO "X$compiler_" | $Xsed -e "$delay_single_quote_subst"`'
+GCC_='`$ECHO "X$GCC_" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_='`$ECHO "X$lt_prog_compiler_no_builtin_flag_" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_='`$ECHO "X$lt_prog_compiler_wl_" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_='`$ECHO "X$lt_prog_compiler_pic_" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static_='`$ECHO "X$lt_prog_compiler_static_" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_='`$ECHO "X$lt_cv_prog_compiler_c_o_" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc_='`$ECHO "X$archive_cmds_need_lc_" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_='`$ECHO "X$enable_shared_with_static_runtimes_" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_='`$ECHO "X$export_dynamic_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec_='`$ECHO "X$whole_archive_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object_='`$ECHO "X$compiler_needs_object_" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_='`$ECHO "X$old_archive_from_new_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_='`$ECHO "X$old_archive_from_expsyms_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_='`$ECHO "X$archive_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds_='`$ECHO "X$archive_expsym_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds_='`$ECHO "X$module_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds_='`$ECHO "X$module_expsym_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld_='`$ECHO "X$with_gnu_ld_" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag_='`$ECHO "X$allow_undefined_flag_" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag_='`$ECHO "X$no_undefined_flag_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_='`$ECHO "X$hardcode_libdir_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_='`$ECHO "X$hardcode_libdir_flag_spec_ld_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator_='`$ECHO "X$hardcode_libdir_separator_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_='`$ECHO "X$hardcode_direct_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute_='`$ECHO "X$hardcode_direct_absolute_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L_='`$ECHO "X$hardcode_minus_L_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_='`$ECHO "X$hardcode_shlibpath_var_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic_='`$ECHO "X$hardcode_automatic_" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath_='`$ECHO "X$inherit_rpath_" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs_='`$ECHO "X$link_all_deplibs_" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path_='`$ECHO "X$fix_srcfile_path_" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols_='`$ECHO "X$always_export_symbols_" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds_='`$ECHO "X$export_symbols_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms_='`$ECHO "X$exclude_expsyms_" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms_='`$ECHO "X$include_expsyms_" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds_='`$ECHO "X$prelink_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec_='`$ECHO "X$file_list_spec_" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action_='`$ECHO "X$hardcode_action_" | $Xsed -e "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
@@ -25869,7 +26901,27 @@ library_names_spec \
 soname_spec \
 finish_eval \
 old_striplib \
-striplib; do
+striplib \
+LD_ \
+compiler_ \
+lt_prog_compiler_no_builtin_flag_ \
+lt_prog_compiler_wl_ \
+lt_prog_compiler_pic_ \
+lt_prog_compiler_static_ \
+lt_cv_prog_compiler_c_o_ \
+export_dynamic_flag_spec_ \
+whole_archive_flag_spec_ \
+compiler_needs_object_ \
+with_gnu_ld_ \
+allow_undefined_flag_ \
+no_undefined_flag_ \
+hardcode_libdir_flag_spec_ \
+hardcode_libdir_flag_spec_ld_ \
+hardcode_libdir_separator_ \
+fix_srcfile_path_ \
+exclude_expsyms_ \
+include_expsyms_ \
+file_list_spec_; do
     case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
@@ -25898,7 +26950,16 @@ postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
+sys_lib_dlsearch_path_spec \
+old_archive_cmds_ \
+old_archive_from_new_cmds_ \
+old_archive_from_expsyms_cmds_ \
+archive_cmds_ \
+archive_expsym_cmds_ \
+module_cmds_ \
+module_expsym_cmds_ \
+export_symbols_cmds_ \
+prelink_cmds_; do
     case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
     *[\\\\\\\`\\"\\\$]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
@@ -25944,7 +27005,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -26082,10 +27143,27 @@ do
     "src/modules/illume/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume/module.desktop" ;;
     "src/modules/illume/keyboards/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume/keyboards/Makefile" ;;
     "src/modules/illume/dicts/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume/dicts/Makefile" ;;
+    "src/modules/illume2/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume2/Makefile" ;;
+    "src/modules/illume2/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume2/module.desktop" ;;
+    "src/modules/illume2/keyboards/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume2/keyboards/Makefile" ;;
+    "src/modules/illume-home/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-home/Makefile" ;;
+    "src/modules/illume-home/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume-home/module.desktop" ;;
+    "src/modules/illume-softkey/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-softkey/Makefile" ;;
+    "src/modules/illume-softkey/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume-softkey/module.desktop" ;;
+    "src/modules/illume-keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-keyboard/Makefile" ;;
+    "src/modules/illume-keyboard/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume-keyboard/module.desktop" ;;
+    "src/modules/illume-keyboard/keyboards/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-keyboard/keyboards/Makefile" ;;
+    "src/modules/illume-keyboard/dicts/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-keyboard/dicts/Makefile" ;;
+    "src/modules/illume-indicator/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/illume-indicator/Makefile" ;;
+    "src/modules/illume-indicator/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/illume-indicator/module.desktop" ;;
     "src/modules/syscon/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/syscon/Makefile" ;;
     "src/modules/syscon/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/syscon/module.desktop" ;;
     "src/modules/everything/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/everything/Makefile" ;;
+    "src/modules/everything/sources/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/everything/sources/Makefile" ;;
+    "src/modules/everything/actions/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/everything/actions/Makefile" ;;
+    "src/modules/everything/views/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/everything/views/Makefile" ;;
     "src/modules/everything/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/everything/module.desktop" ;;
+    "src/modules/everything/everything.pc") CONFIG_FILES="$CONFIG_FILES src/modules/everything/everything.pc" ;;
     "src/modules/systray/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/systray/Makefile" ;;
     "src/modules/systray/module.desktop") CONFIG_FILES="$CONFIG_FILES src/modules/systray/module.desktop" ;;
     "src/preload/Makefile") CONFIG_FILES="$CONFIG_FILES src/preload/Makefile" ;;
@@ -26097,6 +27175,7 @@ do
     "data/other/Makefile") CONFIG_FILES="$CONFIG_FILES data/other/Makefile" ;;
     "data/xsession/Makefile") CONFIG_FILES="$CONFIG_FILES data/xsession/Makefile" ;;
     "data/xsession/enlightenment.desktop") CONFIG_FILES="$CONFIG_FILES data/xsession/enlightenment.desktop" ;;
+    "data/tools/Makefile") CONFIG_FILES="$CONFIG_FILES data/tools/Makefile" ;;
     "data/etc/Makefile") CONFIG_FILES="$CONFIG_FILES data/etc/Makefile" ;;
     "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
     "data/backgrounds/Makefile") CONFIG_FILES="$CONFIG_FILES data/backgrounds/Makefile" ;;
@@ -26108,10 +27187,11 @@ do
     "config/scaleable/Makefile") CONFIG_FILES="$CONFIG_FILES config/scaleable/Makefile" ;;
     "config/netbook/Makefile") CONFIG_FILES="$CONFIG_FILES config/netbook/Makefile" ;;
     "config/illume/Makefile") CONFIG_FILES="$CONFIG_FILES config/illume/Makefile" ;;
+    "config/illume-home/Makefile") CONFIG_FILES="$CONFIG_FILES config/illume-home/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -26152,623 +27232,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-SED!$SED$ac_delim
-FGREP!$FGREP$ac_delim
-LD!$LD$ac_delim
-DUMPBIN!$DUMPBIN$ac_delim
-ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
-NM!$NM$ac_delim
-LN_S!$LN_S$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-lt_ECHO!$lt_ECHO$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-LIPO!$LIPO$ac_delim
-OTOOL!$OTOOL$ac_delim
-OTOOL64!$OTOOL64$ac_delim
-release!$release$ac_delim
-fnmatch_libs!$fnmatch_libs$ac_delim
-VALGRIND_CFLAGS!$VALGRIND_CFLAGS$ac_delim
-VALGRIND_LIBS!$VALGRIND_LIBS$ac_delim
-MODULE_ARCH!$MODULE_ARCH$ac_delim
-PACKAGE_BIN_DIR!$PACKAGE_BIN_DIR$ac_delim
-PACKAGE_LIB_DIR!$PACKAGE_LIB_DIR$ac_delim
-PACKAGE_DATA_DIR!$PACKAGE_DATA_DIR$ac_delim
-LOCALE_DIR!$LOCALE_DIR$ac_delim
-PACKAGE_SYSCONF_DIR!$PACKAGE_SYSCONF_DIR$ac_delim
-XMKMF!$XMKMF$ac_delim
-X_CFLAGS!$X_CFLAGS$ac_delim
-X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-X_LIBS!$X_LIBS$ac_delim
-X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-x_cflags!$x_cflags$ac_delim
-x_libs!$x_libs$ac_delim
-cf_cflags!$cf_cflags$ac_delim
-cf_libs!$cf_libs$ac_delim
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-LTLIBINTL!$LTLIBINTL$ac_delim
-POSUB!$POSUB$ac_delim
-dlopen_libs!$dlopen_libs$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-E_REMOTE_CFLAGS!$E_REMOTE_CFLAGS$ac_delim
-E_REMOTE_LIBS!$E_REMOTE_LIBS$ac_delim
-E_IMC_CFLAGS!$E_IMC_CFLAGS$ac_delim
-E_IMC_LIBS!$E_IMC_LIBS$ac_delim
-E_THUMB_CFLAGS!$E_THUMB_CFLAGS$ac_delim
-E_THUMB_LIBS!$E_THUMB_LIBS$ac_delim
-E_FM_CFLAGS!$E_FM_CFLAGS$ac_delim
-E_FM_LIBS!$E_FM_LIBS$ac_delim
-E_FM_OP_CFLAGS!$E_FM_OP_CFLAGS$ac_delim
-E_FM_OP_LIBS!$E_FM_OP_LIBS$ac_delim
-E_FM_OPEN_CFLAGS!$E_FM_OPEN_CFLAGS$ac_delim
-E_FM_OPEN_LIBS!$E_FM_OPEN_LIBS$ac_delim
-E_SYS_CFLAGS!$E_SYS_CFLAGS$ac_delim
-E_SYS_LIBS!$E_SYS_LIBS$ac_delim
-E_INIT_CFLAGS!$E_INIT_CFLAGS$ac_delim
-E_INIT_LIBS!$E_INIT_LIBS$ac_delim
-E_CFLAGS!$E_CFLAGS$ac_delim
-E_LIBS!$E_LIBS$ac_delim
-ECORE_IMF_CFLAGS!$ECORE_IMF_CFLAGS$ac_delim
-ECORE_IMF_LIBS!$ECORE_IMF_LIBS$ac_delim
-ECORE_IMF_VERSION!$ECORE_IMF_VERSION$ac_delim
-HAVE_ECORE_IMF_TRUE!$HAVE_ECORE_IMF_TRUE$ac_delim
-HAVE_ECORE_IMF_FALSE!$HAVE_ECORE_IMF_FALSE$ac_delim
-HAVE_ECORE_IMF!$HAVE_ECORE_IMF$ac_delim
-e_libs!$e_libs$ac_delim
-e_cflags!$e_cflags$ac_delim
-e_configflags!$e_configflags$ac_delim
-requirements_e!$requirements_e$ac_delim
-EDJE_DEF!$EDJE_DEF$ac_delim
-edje_cc!$edje_cc$ac_delim
-EET_CFLAGS!$EET_CFLAGS$ac_delim
-EET_LIBS!$EET_LIBS$ac_delim
-eet_eet!$eet_eet$ac_delim
-HAVE_BATTERY_TRUE!$HAVE_BATTERY_TRUE$ac_delim
-HAVE_BATTERY_FALSE!$HAVE_BATTERY_FALSE$ac_delim
-BATTERY_LDFLAGS!$BATTERY_LDFLAGS$ac_delim
-HAVE_TEMPERATURE_TRUE!$HAVE_TEMPERATURE_TRUE$ac_delim
-HAVE_TEMPERATURE_FALSE!$HAVE_TEMPERATURE_FALSE$ac_delim
-HAVE_EXCHANGE_TRUE!$HAVE_EXCHANGE_TRUE$ac_delim
-HAVE_EXCHANGE_FALSE!$HAVE_EXCHANGE_FALSE$ac_delim
-HAVE_ALSA_TRUE!$HAVE_ALSA_TRUE$ac_delim
-HAVE_ALSA_FALSE!$HAVE_ALSA_FALSE$ac_delim
-SOUND_CFLAGS!$SOUND_CFLAGS$ac_delim
-SOUND_LIBS!$SOUND_LIBS$ac_delim
-USE_MODULE_IBAR_TRUE!$USE_MODULE_IBAR_TRUE$ac_delim
-USE_MODULE_IBAR_FALSE!$USE_MODULE_IBAR_FALSE$ac_delim
-USE_MODULE_IBAR!$USE_MODULE_IBAR$ac_delim
-USE_MODULE_DROPSHADOW_TRUE!$USE_MODULE_DROPSHADOW_TRUE$ac_delim
-USE_MODULE_DROPSHADOW_FALSE!$USE_MODULE_DROPSHADOW_FALSE$ac_delim
-USE_MODULE_DROPSHADOW!$USE_MODULE_DROPSHADOW$ac_delim
-USE_MODULE_CLOCK_TRUE!$USE_MODULE_CLOCK_TRUE$ac_delim
-USE_MODULE_CLOCK_FALSE!$USE_MODULE_CLOCK_FALSE$ac_delim
-USE_MODULE_CLOCK!$USE_MODULE_CLOCK$ac_delim
-USE_MODULE_PAGER_TRUE!$USE_MODULE_PAGER_TRUE$ac_delim
-USE_MODULE_PAGER_FALSE!$USE_MODULE_PAGER_FALSE$ac_delim
-USE_MODULE_PAGER!$USE_MODULE_PAGER$ac_delim
-BATTERY_CFLAGS!$BATTERY_CFLAGS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-BATTERY_LIBS!$BATTERY_LIBS$ac_delim
-BATTERY_VERSION!$BATTERY_VERSION$ac_delim
-HAVE_BATTERY!$HAVE_BATTERY$ac_delim
-USE_MODULE_BATTERY_TRUE!$USE_MODULE_BATTERY_TRUE$ac_delim
-USE_MODULE_BATTERY_FALSE!$USE_MODULE_BATTERY_FALSE$ac_delim
-USE_MODULE_BATTERY!$USE_MODULE_BATTERY$ac_delim
-ECORE_TXT_CFLAGS!$ECORE_TXT_CFLAGS$ac_delim
-ECORE_TXT_LIBS!$ECORE_TXT_LIBS$ac_delim
-ECORE_TXT_VERSION!$ECORE_TXT_VERSION$ac_delim
-HAVE_ECORE_TXT_TRUE!$HAVE_ECORE_TXT_TRUE$ac_delim
-HAVE_ECORE_TXT_FALSE!$HAVE_ECORE_TXT_FALSE$ac_delim
-HAVE_ECORE_TXT!$HAVE_ECORE_TXT$ac_delim
-TEMPERATURE_CFLAGS!$TEMPERATURE_CFLAGS$ac_delim
-TEMPERATURE_LIBS!$TEMPERATURE_LIBS$ac_delim
-TEMPERATURE_VERSION!$TEMPERATURE_VERSION$ac_delim
-HAVE_TEMPERATURE!$HAVE_TEMPERATURE$ac_delim
-USE_MODULE_TEMPERATURE_TRUE!$USE_MODULE_TEMPERATURE_TRUE$ac_delim
-USE_MODULE_TEMPERATURE_FALSE!$USE_MODULE_TEMPERATURE_FALSE$ac_delim
-USE_MODULE_TEMPERATURE!$USE_MODULE_TEMPERATURE$ac_delim
-USE_MODULE_CPUFREQ_TRUE!$USE_MODULE_CPUFREQ_TRUE$ac_delim
-USE_MODULE_CPUFREQ_FALSE!$USE_MODULE_CPUFREQ_FALSE$ac_delim
-USE_MODULE_CPUFREQ!$USE_MODULE_CPUFREQ$ac_delim
-USE_MODULE_IBOX_TRUE!$USE_MODULE_IBOX_TRUE$ac_delim
-USE_MODULE_IBOX_FALSE!$USE_MODULE_IBOX_FALSE$ac_delim
-USE_MODULE_IBOX!$USE_MODULE_IBOX$ac_delim
-USE_MODULE_START_TRUE!$USE_MODULE_START_TRUE$ac_delim
-USE_MODULE_START_FALSE!$USE_MODULE_START_FALSE$ac_delim
-USE_MODULE_START!$USE_MODULE_START$ac_delim
-USE_MODULE_EXEBUF_TRUE!$USE_MODULE_EXEBUF_TRUE$ac_delim
-USE_MODULE_EXEBUF_FALSE!$USE_MODULE_EXEBUF_FALSE$ac_delim
-USE_MODULE_EXEBUF!$USE_MODULE_EXEBUF$ac_delim
-USE_MODULE_WINLIST_TRUE!$USE_MODULE_WINLIST_TRUE$ac_delim
-USE_MODULE_WINLIST_FALSE!$USE_MODULE_WINLIST_FALSE$ac_delim
-USE_MODULE_WINLIST!$USE_MODULE_WINLIST$ac_delim
-USE_MODULE_FILEMAN_TRUE!$USE_MODULE_FILEMAN_TRUE$ac_delim
-USE_MODULE_FILEMAN_FALSE!$USE_MODULE_FILEMAN_FALSE$ac_delim
-USE_MODULE_FILEMAN!$USE_MODULE_FILEMAN$ac_delim
-USE_MODULE_FILEMAN_OPINFO_TRUE!$USE_MODULE_FILEMAN_OPINFO_TRUE$ac_delim
-USE_MODULE_FILEMAN_OPINFO_FALSE!$USE_MODULE_FILEMAN_OPINFO_FALSE$ac_delim
-USE_MODULE_FILEMAN_OPINFO!$USE_MODULE_FILEMAN_OPINFO$ac_delim
-USE_MODULE_WIZARD_TRUE!$USE_MODULE_WIZARD_TRUE$ac_delim
-USE_MODULE_WIZARD_FALSE!$USE_MODULE_WIZARD_FALSE$ac_delim
-USE_MODULE_WIZARD!$USE_MODULE_WIZARD$ac_delim
-USE_MODULE_CONF_TRUE!$USE_MODULE_CONF_TRUE$ac_delim
-USE_MODULE_CONF_FALSE!$USE_MODULE_CONF_FALSE$ac_delim
-USE_MODULE_CONF!$USE_MODULE_CONF$ac_delim
-USE_MODULE_CONF_WALLPAPER_TRUE!$USE_MODULE_CONF_WALLPAPER_TRUE$ac_delim
-USE_MODULE_CONF_WALLPAPER_FALSE!$USE_MODULE_CONF_WALLPAPER_FALSE$ac_delim
-USE_MODULE_CONF_WALLPAPER!$USE_MODULE_CONF_WALLPAPER$ac_delim
-USE_MODULE_CONF_WALLPAPER2_TRUE!$USE_MODULE_CONF_WALLPAPER2_TRUE$ac_delim
-USE_MODULE_CONF_WALLPAPER2_FALSE!$USE_MODULE_CONF_WALLPAPER2_FALSE$ac_delim
-USE_MODULE_CONF_WALLPAPER2!$USE_MODULE_CONF_WALLPAPER2$ac_delim
-EXCHANGE_CFLAGS!$EXCHANGE_CFLAGS$ac_delim
-EXCHANGE_LIBS!$EXCHANGE_LIBS$ac_delim
-EXCHANGE_VERSION!$EXCHANGE_VERSION$ac_delim
-HAVE_EXCHANGE!$HAVE_EXCHANGE$ac_delim
-USE_MODULE_CONF_THEME_TRUE!$USE_MODULE_CONF_THEME_TRUE$ac_delim
-USE_MODULE_CONF_THEME_FALSE!$USE_MODULE_CONF_THEME_FALSE$ac_delim
-USE_MODULE_CONF_THEME!$USE_MODULE_CONF_THEME$ac_delim
-USE_MODULE_CONF_COLORS_TRUE!$USE_MODULE_CONF_COLORS_TRUE$ac_delim
-USE_MODULE_CONF_COLORS_FALSE!$USE_MODULE_CONF_COLORS_FALSE$ac_delim
-USE_MODULE_CONF_COLORS!$USE_MODULE_CONF_COLORS$ac_delim
-USE_MODULE_CONF_FONTS_TRUE!$USE_MODULE_CONF_FONTS_TRUE$ac_delim
-USE_MODULE_CONF_FONTS_FALSE!$USE_MODULE_CONF_FONTS_FALSE$ac_delim
-USE_MODULE_CONF_FONTS!$USE_MODULE_CONF_FONTS$ac_delim
-USE_MODULE_CONF_BORDERS_TRUE!$USE_MODULE_CONF_BORDERS_TRUE$ac_delim
-USE_MODULE_CONF_BORDERS_FALSE!$USE_MODULE_CONF_BORDERS_FALSE$ac_delim
-USE_MODULE_CONF_BORDERS!$USE_MODULE_CONF_BORDERS$ac_delim
-USE_MODULE_CONF_ICON_THEME_TRUE!$USE_MODULE_CONF_ICON_THEME_TRUE$ac_delim
-USE_MODULE_CONF_ICON_THEME_FALSE!$USE_MODULE_CONF_ICON_THEME_FALSE$ac_delim
-USE_MODULE_CONF_ICON_THEME!$USE_MODULE_CONF_ICON_THEME$ac_delim
-USE_MODULE_CONF_MOUSE_CURSOR_TRUE!$USE_MODULE_CONF_MOUSE_CURSOR_TRUE$ac_delim
-USE_MODULE_CONF_MOUSE_CURSOR_FALSE!$USE_MODULE_CONF_MOUSE_CURSOR_FALSE$ac_delim
-USE_MODULE_CONF_MOUSE_CURSOR!$USE_MODULE_CONF_MOUSE_CURSOR$ac_delim
-USE_MODULE_CONF_TRANSITIONS_TRUE!$USE_MODULE_CONF_TRANSITIONS_TRUE$ac_delim
-USE_MODULE_CONF_TRANSITIONS_FALSE!$USE_MODULE_CONF_TRANSITIONS_FALSE$ac_delim
-USE_MODULE_CONF_TRANSITIONS!$USE_MODULE_CONF_TRANSITIONS$ac_delim
-USE_MODULE_CONF_STARTUP_TRUE!$USE_MODULE_CONF_STARTUP_TRUE$ac_delim
-USE_MODULE_CONF_STARTUP_FALSE!$USE_MODULE_CONF_STARTUP_FALSE$ac_delim
-USE_MODULE_CONF_STARTUP!$USE_MODULE_CONF_STARTUP$ac_delim
-USE_MODULE_CONF_INTL_TRUE!$USE_MODULE_CONF_INTL_TRUE$ac_delim
-USE_MODULE_CONF_INTL_FALSE!$USE_MODULE_CONF_INTL_FALSE$ac_delim
-USE_MODULE_CONF_INTL!$USE_MODULE_CONF_INTL$ac_delim
-USE_MODULE_CONF_IMC_TRUE!$USE_MODULE_CONF_IMC_TRUE$ac_delim
-USE_MODULE_CONF_IMC_FALSE!$USE_MODULE_CONF_IMC_FALSE$ac_delim
-USE_MODULE_CONF_IMC!$USE_MODULE_CONF_IMC$ac_delim
-USE_MODULE_CONF_PROFILES_TRUE!$USE_MODULE_CONF_PROFILES_TRUE$ac_delim
-USE_MODULE_CONF_PROFILES_FALSE!$USE_MODULE_CONF_PROFILES_FALSE$ac_delim
-USE_MODULE_CONF_PROFILES!$USE_MODULE_CONF_PROFILES$ac_delim
-USE_MODULE_MSGBUS_LANG_TRUE!$USE_MODULE_MSGBUS_LANG_TRUE$ac_delim
-USE_MODULE_MSGBUS_LANG_FALSE!$USE_MODULE_MSGBUS_LANG_FALSE$ac_delim
-USE_MODULE_MSGBUS_LANG!$USE_MODULE_MSGBUS_LANG$ac_delim
-USE_MODULE_CONF_ENGINE_TRUE!$USE_MODULE_CONF_ENGINE_TRUE$ac_delim
-USE_MODULE_CONF_ENGINE_FALSE!$USE_MODULE_CONF_ENGINE_FALSE$ac_delim
-USE_MODULE_CONF_ENGINE!$USE_MODULE_CONF_ENGINE$ac_delim
-USE_MODULE_CONF_APPLICATIONS_TRUE!$USE_MODULE_CONF_APPLICATIONS_TRUE$ac_delim
-USE_MODULE_CONF_APPLICATIONS_FALSE!$USE_MODULE_CONF_APPLICATIONS_FALSE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-USE_MODULE_CONF_APPLICATIONS!$USE_MODULE_CONF_APPLICATIONS$ac_delim
-USE_MODULE_CONF_DESKS_TRUE!$USE_MODULE_CONF_DESKS_TRUE$ac_delim
-USE_MODULE_CONF_DESKS_FALSE!$USE_MODULE_CONF_DESKS_FALSE$ac_delim
-USE_MODULE_CONF_DESKS!$USE_MODULE_CONF_DESKS$ac_delim
-USE_MODULE_CONF_DESK_TRUE!$USE_MODULE_CONF_DESK_TRUE$ac_delim
-USE_MODULE_CONF_DESK_FALSE!$USE_MODULE_CONF_DESK_FALSE$ac_delim
-USE_MODULE_CONF_DESK!$USE_MODULE_CONF_DESK$ac_delim
-USE_MODULE_CONF_DISPLAY_TRUE!$USE_MODULE_CONF_DISPLAY_TRUE$ac_delim
-USE_MODULE_CONF_DISPLAY_FALSE!$USE_MODULE_CONF_DISPLAY_FALSE$ac_delim
-USE_MODULE_CONF_DISPLAY!$USE_MODULE_CONF_DISPLAY$ac_delim
-USE_MODULE_CONF_DESKLOCK_TRUE!$USE_MODULE_CONF_DESKLOCK_TRUE$ac_delim
-USE_MODULE_CONF_DESKLOCK_FALSE!$USE_MODULE_CONF_DESKLOCK_FALSE$ac_delim
-USE_MODULE_CONF_DESKLOCK!$USE_MODULE_CONF_DESKLOCK$ac_delim
-USE_MODULE_CONF_SCREENSAVER_TRUE!$USE_MODULE_CONF_SCREENSAVER_TRUE$ac_delim
-USE_MODULE_CONF_SCREENSAVER_FALSE!$USE_MODULE_CONF_SCREENSAVER_FALSE$ac_delim
-USE_MODULE_CONF_SCREENSAVER!$USE_MODULE_CONF_SCREENSAVER$ac_delim
-USE_MODULE_CONF_DPMS_TRUE!$USE_MODULE_CONF_DPMS_TRUE$ac_delim
-USE_MODULE_CONF_DPMS_FALSE!$USE_MODULE_CONF_DPMS_FALSE$ac_delim
-USE_MODULE_CONF_DPMS!$USE_MODULE_CONF_DPMS$ac_delim
-USE_MODULE_CONF_SHELVES_TRUE!$USE_MODULE_CONF_SHELVES_TRUE$ac_delim
-USE_MODULE_CONF_SHELVES_FALSE!$USE_MODULE_CONF_SHELVES_FALSE$ac_delim
-USE_MODULE_CONF_SHELVES!$USE_MODULE_CONF_SHELVES$ac_delim
-USE_MODULE_CONF_KEYBINDINGS_TRUE!$USE_MODULE_CONF_KEYBINDINGS_TRUE$ac_delim
-USE_MODULE_CONF_KEYBINDINGS_FALSE!$USE_MODULE_CONF_KEYBINDINGS_FALSE$ac_delim
-USE_MODULE_CONF_KEYBINDINGS!$USE_MODULE_CONF_KEYBINDINGS$ac_delim
-USE_MODULE_CONF_MOUSEBINDINGS_TRUE!$USE_MODULE_CONF_MOUSEBINDINGS_TRUE$ac_delim
-USE_MODULE_CONF_MOUSEBINDINGS_FALSE!$USE_MODULE_CONF_MOUSEBINDINGS_FALSE$ac_delim
-USE_MODULE_CONF_MOUSEBINDINGS!$USE_MODULE_CONF_MOUSEBINDINGS$ac_delim
-USE_MODULE_CONF_EDGEBINDINGS_TRUE!$USE_MODULE_CONF_EDGEBINDINGS_TRUE$ac_delim
-USE_MODULE_CONF_EDGEBINDINGS_FALSE!$USE_MODULE_CONF_EDGEBINDINGS_FALSE$ac_delim
-USE_MODULE_CONF_EDGEBINDINGS!$USE_MODULE_CONF_EDGEBINDINGS$ac_delim
-USE_MODULE_CONF_MOUSE_TRUE!$USE_MODULE_CONF_MOUSE_TRUE$ac_delim
-USE_MODULE_CONF_MOUSE_FALSE!$USE_MODULE_CONF_MOUSE_FALSE$ac_delim
-USE_MODULE_CONF_MOUSE!$USE_MODULE_CONF_MOUSE$ac_delim
-USE_MODULE_CONF_WINDOW_DISPLAY_TRUE!$USE_MODULE_CONF_WINDOW_DISPLAY_TRUE$ac_delim
-USE_MODULE_CONF_WINDOW_DISPLAY_FALSE!$USE_MODULE_CONF_WINDOW_DISPLAY_FALSE$ac_delim
-USE_MODULE_CONF_WINDOW_DISPLAY!$USE_MODULE_CONF_WINDOW_DISPLAY$ac_delim
-USE_MODULE_CONF_WINDOW_FOCUS_TRUE!$USE_MODULE_CONF_WINDOW_FOCUS_TRUE$ac_delim
-USE_MODULE_CONF_WINDOW_FOCUS_FALSE!$USE_MODULE_CONF_WINDOW_FOCUS_FALSE$ac_delim
-USE_MODULE_CONF_WINDOW_FOCUS!$USE_MODULE_CONF_WINDOW_FOCUS$ac_delim
-USE_MODULE_CONF_WINDOW_REMEMBERS_TRUE!$USE_MODULE_CONF_WINDOW_REMEMBERS_TRUE$ac_delim
-USE_MODULE_CONF_WINDOW_REMEMBERS_FALSE!$USE_MODULE_CONF_WINDOW_REMEMBERS_FALSE$ac_delim
-USE_MODULE_CONF_WINDOW_REMEMBERS!$USE_MODULE_CONF_WINDOW_REMEMBERS$ac_delim
-USE_MODULE_CONF_WINDOW_MANIPULATION_TRUE!$USE_MODULE_CONF_WINDOW_MANIPULATION_TRUE$ac_delim
-USE_MODULE_CONF_WINDOW_MANIPULATION_FALSE!$USE_MODULE_CONF_WINDOW_MANIPULATION_FALSE$ac_delim
-USE_MODULE_CONF_WINDOW_MANIPULATION!$USE_MODULE_CONF_WINDOW_MANIPULATION$ac_delim
-USE_MODULE_CONF_MENUS_TRUE!$USE_MODULE_CONF_MENUS_TRUE$ac_delim
-USE_MODULE_CONF_MENUS_FALSE!$USE_MODULE_CONF_MENUS_FALSE$ac_delim
-USE_MODULE_CONF_MENUS!$USE_MODULE_CONF_MENUS$ac_delim
-USE_MODULE_CONF_CLIENTLIST_TRUE!$USE_MODULE_CONF_CLIENTLIST_TRUE$ac_delim
-USE_MODULE_CONF_CLIENTLIST_FALSE!$USE_MODULE_CONF_CLIENTLIST_FALSE$ac_delim
-USE_MODULE_CONF_CLIENTLIST!$USE_MODULE_CONF_CLIENTLIST$ac_delim
-USE_MODULE_CONF_DIALOGS_TRUE!$USE_MODULE_CONF_DIALOGS_TRUE$ac_delim
-USE_MODULE_CONF_DIALOGS_FALSE!$USE_MODULE_CONF_DIALOGS_FALSE$ac_delim
-USE_MODULE_CONF_DIALOGS!$USE_MODULE_CONF_DIALOGS$ac_delim
-USE_MODULE_CONF_PERFORMANCE_TRUE!$USE_MODULE_CONF_PERFORMANCE_TRUE$ac_delim
-USE_MODULE_CONF_PERFORMANCE_FALSE!$USE_MODULE_CONF_PERFORMANCE_FALSE$ac_delim
-USE_MODULE_CONF_PERFORMANCE!$USE_MODULE_CONF_PERFORMANCE$ac_delim
-USE_MODULE_CONF_WINLIST_TRUE!$USE_MODULE_CONF_WINLIST_TRUE$ac_delim
-USE_MODULE_CONF_WINLIST_FALSE!$USE_MODULE_CONF_WINLIST_FALSE$ac_delim
-USE_MODULE_CONF_WINLIST!$USE_MODULE_CONF_WINLIST$ac_delim
-USE_MODULE_CONF_EXEBUF_TRUE!$USE_MODULE_CONF_EXEBUF_TRUE$ac_delim
-USE_MODULE_CONF_EXEBUF_FALSE!$USE_MODULE_CONF_EXEBUF_FALSE$ac_delim
-USE_MODULE_CONF_EXEBUF!$USE_MODULE_CONF_EXEBUF$ac_delim
-USE_MODULE_CONF_PATHS_TRUE!$USE_MODULE_CONF_PATHS_TRUE$ac_delim
-USE_MODULE_CONF_PATHS_FALSE!$USE_MODULE_CONF_PATHS_FALSE$ac_delim
-USE_MODULE_CONF_PATHS!$USE_MODULE_CONF_PATHS$ac_delim
-USE_MODULE_CONF_MIME_TRUE!$USE_MODULE_CONF_MIME_TRUE$ac_delim
-USE_MODULE_CONF_MIME_FALSE!$USE_MODULE_CONF_MIME_FALSE$ac_delim
-USE_MODULE_CONF_MIME!$USE_MODULE_CONF_MIME$ac_delim
-USE_MODULE_CONF_INTERACTION_TRUE!$USE_MODULE_CONF_INTERACTION_TRUE$ac_delim
-USE_MODULE_CONF_INTERACTION_FALSE!$USE_MODULE_CONF_INTERACTION_FALSE$ac_delim
-USE_MODULE_CONF_INTERACTION!$USE_MODULE_CONF_INTERACTION$ac_delim
-USE_MODULE_CONF_SCALE_TRUE!$USE_MODULE_CONF_SCALE_TRUE$ac_delim
-USE_MODULE_CONF_SCALE_FALSE!$USE_MODULE_CONF_SCALE_FALSE$ac_delim
-USE_MODULE_CONF_SCALE!$USE_MODULE_CONF_SCALE$ac_delim
-USE_MODULE_GADMAN_TRUE!$USE_MODULE_GADMAN_TRUE$ac_delim
-USE_MODULE_GADMAN_FALSE!$USE_MODULE_GADMAN_FALSE$ac_delim
-USE_MODULE_GADMAN!$USE_MODULE_GADMAN$ac_delim
-ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
-ALSA_LIBS!$ALSA_LIBS$ac_delim
-ALSA_VERSION!$ALSA_VERSION$ac_delim
-HAVE_ALSA!$HAVE_ALSA$ac_delim
-USE_MODULE_MIXER_TRUE!$USE_MODULE_MIXER_TRUE$ac_delim
-USE_MODULE_MIXER_FALSE!$USE_MODULE_MIXER_FALSE$ac_delim
-USE_MODULE_MIXER!$USE_MODULE_MIXER$ac_delim
-USE_MODULE_CONNMAN_TRUE!$USE_MODULE_CONNMAN_TRUE$ac_delim
-USE_MODULE_CONNMAN_FALSE!$USE_MODULE_CONNMAN_FALSE$ac_delim
-USE_MODULE_CONNMAN!$USE_MODULE_CONNMAN$ac_delim
-USE_MODULE_ILLUME_TRUE!$USE_MODULE_ILLUME_TRUE$ac_delim
-USE_MODULE_ILLUME_FALSE!$USE_MODULE_ILLUME_FALSE$ac_delim
-USE_MODULE_ILLUME!$USE_MODULE_ILLUME$ac_delim
-USE_MODULE_SYSCON_TRUE!$USE_MODULE_SYSCON_TRUE$ac_delim
-USE_MODULE_SYSCON_FALSE!$USE_MODULE_SYSCON_FALSE$ac_delim
-USE_MODULE_SYSCON!$USE_MODULE_SYSCON$ac_delim
-USE_MODULE_EVERYTHING_TRUE!$USE_MODULE_EVERYTHING_TRUE$ac_delim
-USE_MODULE_EVERYTHING_FALSE!$USE_MODULE_EVERYTHING_FALSE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
+  print line
+}
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-USE_MODULE_EVERYTHING!$USE_MODULE_EVERYTHING$ac_delim
-USE_MODULE_SYSTRAY_TRUE!$USE_MODULE_SYSTRAY_TRUE$ac_delim
-USE_MODULE_SYSTRAY_FALSE!$USE_MODULE_SYSTRAY_FALSE$ac_delim
-USE_MODULE_SYSTRAY!$USE_MODULE_SYSTRAY$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACAWK
 _ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -26784,19 +27385,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -26825,26 +27540,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -26854,7 +27581,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -26880,7 +27607,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -26889,7 +27616,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -26910,17 +27637,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -26965,12 +27692,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -26979,13 +27707,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -26999,15 +27728,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -27018,121 +27748,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -27147,7 +27816,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27167,30 +27836,40 @@ echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27208,33 +27887,33 @@ echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27252,7 +27931,7 @@ echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
+      { as_dir=$dirpart/$fdir
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
@@ -27260,7 +27939,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -27269,7 +27948,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -27290,13 +27969,14 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
  ;;
     "libtool":C)
 
@@ -28041,6 +28721,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -28062,6 +28747,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 # report
diff --git a/configure.ac b/configure.ac
index b4940e3..2719545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 # get rid of that stupid cache mechanism
 rm -f config.cache
 
-AC_INIT([enlightenment], [0.16.999.062], [enlightenment-devel at lists.sourceforge.net])
+AC_INIT([enlightenment], [0.16.999.063], [enlightenment-devel at lists.sourceforge.net])
+release="ver-svn-05"
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -9,8 +10,9 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_ISC_POSIX
 
-AM_INIT_AUTOMAKE(1.6 dist-bzip2)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_CONFIG_HEADER([config.h])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_GNU_SOURCE
 AC_C_BIGENDIAN
@@ -26,7 +28,6 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-release="ver-svn-03"
 AC_SUBST(release)
 
 AC_CHECK_FUNCS(setenv)
@@ -148,6 +149,56 @@ CPPFLAGS="${PCPPFLAGS}"
 AC_SUBST(cf_cflags)
 AC_SUBST(cf_libs)
 
+
+execinfo_libs=""
+AC_CHECK_HEADERS([execinfo.h], [have_execinfo="yes"], [have_execinfo="no"])
+if test "x${have_execinfo}" = "xyes" ; then
+   AC_MSG_CHECKING([whether backtrace_symbols_fd() is in libc])
+
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <execinfo.h>
+         ]],
+         [[
+backtrace_symbols_fd(NULL, 0, 0);
+         ]])],
+      [link_execinfo="yes"],
+      [link_execinfo="no"])
+
+   AC_MSG_RESULT([${link_execinfo}])
+fi
+
+if test "x${link_execinfo}" = "xno" ; then
+   AC_MSG_CHECKING([whether backtrace_symbols_fd() is in libexecinfo])
+
+   LDFLAGS_save="${LDFLAGS}"
+   LDFLAGS="${LDFLAGS} -lexecinfo"
+   AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[
+#include <stdlib.h>
+#include <execinfo.h>
+         ]],
+         [[
+backtrace_symbols_fd(NULL, 0, 0);
+         ]])],
+      [
+       linkexec_info="yes"
+       execinfo_libs="-lexecinfo"
+      ],
+      [linkexec_info="no"])
+   LDFLAGS="${LDFLAGS_save}"
+
+   AC_MSG_RESULT([${link_execinfo}])
+fi
+
+if test "x${link_execinfo}" = "xno" ; then
+   AC_MSG_ERROR([Cannot use backtrace_symbols_fd()])
+fi
+
+
 #ALL_LINGUAS="bg de eo es fi fr ja pl pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW ko"
 #ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
 # a lot of .po's are broken
@@ -165,7 +216,7 @@ AC_SUBST(dlopen_libs)
 
 AC_MSG_CHECKING([whether to enable Files menu item])
 AC_ARG_ENABLE([files],
-   AS_HELP_STRING([--enable-files],[enable Files menu item @<:@yes@:>@]),
+   AS_HELP_STRING([--enable-files],[enable Files menu item @<:@default=yes@:>@]),
    [e_cv_enable_files=$enableval],
    AC_CACHE_VAL([e_cv_enable_files], [e_cv_enable_files=yes]))
 if test "[${e_cv_enable_files}]" = yes; then
@@ -259,8 +310,7 @@ requirements_e="evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecor
 
 AC_E_CHECK_PKG(ECORE_IMF, [ecore-imf ecore-imf-evas], [], [:])
 
-
-e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS
+e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "$execinfo_libs
 e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS
 e_configflags="-DUSE_E_CONFIG_H"
 
@@ -362,7 +412,6 @@ AC_SUBST(SOUND_CFLAGS)
 AC_SUBST(SOUND_LIBS)
 
 AC_E_OPTIONAL_MODULE([ibar], true)
-AC_E_OPTIONAL_MODULE([ibar], true)
 AC_E_OPTIONAL_MODULE([dropshadow], true)
 AC_E_OPTIONAL_MODULE([clock], true)
 AC_E_OPTIONAL_MODULE([pager], true)
@@ -555,10 +604,27 @@ src/modules/illume/Makefile
 src/modules/illume/module.desktop
 src/modules/illume/keyboards/Makefile
 src/modules/illume/dicts/Makefile
+src/modules/illume2/Makefile
+src/modules/illume2/module.desktop
+src/modules/illume2/keyboards/Makefile
+src/modules/illume-home/Makefile
+src/modules/illume-home/module.desktop
+src/modules/illume-softkey/Makefile
+src/modules/illume-softkey/module.desktop
+src/modules/illume-keyboard/Makefile
+src/modules/illume-keyboard/module.desktop
+src/modules/illume-keyboard/keyboards/Makefile
+src/modules/illume-keyboard/dicts/Makefile
+src/modules/illume-indicator/Makefile
+src/modules/illume-indicator/module.desktop
 src/modules/syscon/Makefile
 src/modules/syscon/module.desktop
 src/modules/everything/Makefile
+src/modules/everything/sources/Makefile
+src/modules/everything/actions/Makefile
+src/modules/everything/views/Makefile
 src/modules/everything/module.desktop
+src/modules/everything/everything.pc
 src/modules/systray/Makefile
 src/modules/systray/module.desktop
 src/preload/Makefile
@@ -570,6 +636,7 @@ data/themes/images/Makefile
 data/other/Makefile
 data/xsession/Makefile
 data/xsession/enlightenment.desktop
+data/tools/Makefile
 data/etc/Makefile
 data/icons/Makefile
 data/backgrounds/Makefile
@@ -581,6 +648,7 @@ config/minimalist/Makefile
 config/scaleable/Makefile
 config/netbook/Makefile
 config/illume/Makefile
+config/illume-home/Makefile
 po/Makefile.in
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 6035b5f..e1c8697 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
 images \
 themes \
 other \
+tools \
 xsession \
 input_methods \
 etc \
diff --git a/data/Makefile.in b/data/Makefile.in
index 71a45c8..49dee54 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -319,6 +319,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -328,6 +329,7 @@ SUBDIRS = \
 images \
 themes \
 other \
+tools \
 xsession \
 input_methods \
 etc \
@@ -341,8 +343,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -448,7 +450,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/data/backgrounds/Makefile.in b/data/backgrounds/Makefile.in
index f21ec13..e6dc08b 100644
--- a/data/backgrounds/Makefile.in
+++ b/data/backgrounds/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -335,8 +336,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/etc/Makefile.in b/data/etc/Makefile.in
index 3f10cb5..2462bfa 100644
--- a/data/etc/Makefile.in
+++ b/data/etc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -334,8 +335,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index dcceaa5..c9e9bbd 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -341,8 +342,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/images/Makefile.in b/data/images/Makefile.in
index d22d314..1283b0a 100644
--- a/data/images/Makefile.in
+++ b/data/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -362,8 +363,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/input_methods/Makefile.in b/data/input_methods/Makefile.in
index 7066a0c..b353125 100644
--- a/data/input_methods/Makefile.in
+++ b/data/input_methods/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -336,8 +337,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/other/Makefile.in b/data/other/Makefile.in
index 989f8b2..1dd8885 100644
--- a/data/other/Makefile.in
+++ b/data/other/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -337,8 +338,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index 4c3a089..89a00a7 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -329,6 +329,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -358,8 +359,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -482,7 +483,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 2c90c14..ad3fac8 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -5618,8 +5618,8 @@ collections { /* begin the collection of edje groups that are in this file */
 	    type: SWALLOW;
 	    description { state: "default" 0.0;
 	       align: 0.5 0.5;
-	       aspect: 1.0 1.0;
-	       aspect_preference: VERTICAL;
+//	       aspect: 1.0 1.0;
+//	       aspect_preference: VERTICAL;
 	       rel1 {
 		  relative: 0.0 0.0;
 		  offset: 2 2;
@@ -7124,7 +7124,7 @@ collections { /* begin the collection of edje groups that are in this file */
                color: 255 255 0 150;
             }
          }
-         part { name: "e.swallow.slider";
+         part { name: "e.swallow.check";
             type: SWALLOW;
             description { state: "default" 0.0;
                rel1 {
@@ -7135,8 +7135,23 @@ collections { /* begin the collection of edje groups that are in this file */
                }
                rel2 {
                   relative: 1 1;
+                  offset: -5 30;
+                  to_y: "e.text.description";
+               }
+            }
+         }
+         part { name: "e.swallow.slider";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1 1;
+                  offset: 5 2;
+                  to_x: "e.swallow.background";
+                  to_y: "e.swallow.check";
+               }
+               rel2 {
+                  relative: 1 1;
                   offset: -5 -5;
-                  to_y: "e.swallow.background";
                }
             }
          }
@@ -24305,29 +24320,29 @@ BORDERICON("properties","icon_border_properties.png")
 
 // EFM icons //
 
-#define EFMICON(NAME, FILE, SIZE)                       \
-group { name: "e/icons/fileman/"NAME;                   \
-   max:  SIZE SIZE;                                     \
-   parts {                                              \
-      part { name: "icon";                              \
-	 mouse_events:  0;                              \
-	 description { state: "default" 0.0;            \
-	    aspect: 1.0 1.0;                            \
-	    aspect_preference: BOTH;                    \
-	    image.image: FILE COMP;                     \
-	    image.normal: FILE ;                        \
-	 }                                              \
-      }                                                 \
-   }                                                    \
-}
+/* #define EFMICON(NAME, FILE, SIZE)                    \
+ * group { name: "e/icons/fileman/"NAME;                \
+ *    max:  SIZE SIZE;                                  \
+ *    parts {                                           \
+ *       part { name: "icon";                           \
+ * 	 mouse_events:  0;                              \
+ * 	 description { state: "default" 0.0;            \
+ * 	    aspect: 1.0 1.0;                            \
+ * 	    aspect_preference: BOTH;                    \
+ * 	    image.image: FILE COMP;                     \
+ * 	    image.normal: FILE ;                        \
+ * 	 }                                              \
+ *       }                                              \
+ *    }                                                 \
+ * } */
 
 //EFMICON("folder","icon_efm_folder.png", 128)
-EFMICON("chrdev","icon_efm_file.png", 128)
-EFMICON("blkdev","icon_efm_file.png", 128)
-EFMICON("fifo","icon_efm_file.png", 128)
-EFMICON("socket","icon_efm_file.png", 128)
-EFMICON("executable","icon_efm_file.png", 128)
-EFMICON("file","icon_efm_file.png", 128)
+//EFMICON("chrdev","icon_efm_file.png", 128)
+//EFMICON("blkdev","icon_efm_file.png", 128)
+//EFMICON("fifo","icon_efm_file.png", 128)
+//EFMICON("socket","icon_efm_file.png", 128)
+//EFMICON("executable","icon_efm_file.png", 128)
+
 //EFMICON("home","icon_efm_home.png", 128)
 //EFMICON("root","icon_efm_root.png", 128)
 //EFMICON("tmp","icon_efm_tmp.png", 128)
@@ -24364,6 +24379,17 @@ MIMEICON("application/x-bzip2-compressed-tar","icon_mime_package.png",128);
 MIMEICON("application/x-compressed-tar","icon_mime_package.png",128);
 MIMEICON("application/x-tar","icon_mime_package.png", 128);
 MIMEICON("application/x-rar","icon_mime_package.png", 128);
+MIMEICON("inode/chardevice","icon_efm_file.png", 128);
+MIMEICON("inode/blockdevice","icon_efm_file.png", 128);
+MIMEICON("inode/fifo","icon_efm_file.png", 128);
+MIMEICON("inode/socket","icon_efm_file.png", 128);
+MIMEICON("inode/directory","icon_efm_folder.png", 128);
+MIMEICON("inode/file","icon_efm_file.png", 128); 
+MIMEICON("application/octet-stream","icon_efm_file.png", 128);
+MIMEICON("application/x-executable","icon_mime_executable_generic.png", 128);
+MIMEICON("application/x-ms-dos-executable","icon_mime_executable_generic.png", 128);
+MIMEICON("application/x-7z-compressed","icon_mime_package.png", 128);
+MIMEICON("application/vnd.ms-cab-compressed","icon_mime_package.png", 128);
 
 
 // Dynamic MIME Icons //
@@ -24405,17 +24431,29 @@ MIMEBASE("video/mpeg","icon_mime_video_generic.png", ".MPEG", 128);
 MIMEBASE("application/ogg","icon_mime_video_generic.png", ".OGG", 128);
 MIMEBASE("video/x-theora+ogg","icon_mime_video_generic.png", ".OGG", 128);
 MIMEBASE("video/x-msvideo","icon_mime_video_generic.png", ".AVI", 128);
+MIMEBASE("video/ogg","icon_mime_video_generic.png", ".OGG", 128);
+MIMEBASE("video/mp4","icon_mime_video_generic.png", ".MP4", 128);
+MIMEBASE("video/quicktime","icon_mime_video_generic.png", ".MOV", 128);
+MIMEBASE("video/x-matroska","icon_mime_video_generic.png", ".MKV", 128);
+MIMEBASE("video/x-flv","icon_mime_video_generic.png", ".FLV", 128);
+MIMEBASE("application/vnd.rn-realmedia","icon_mime_video_generic.png", ".REAL", 128);
+MIMEBASE("video/x-ms-wmv","icon_mime_video_generic.png", ".WMV", 128);
 
 MIMEBASE("image/png","icon_mime_image_generic.png", ".PNG", 128);
 MIMEBASE("image/jpeg","icon_mime_image_generic.png", ".JPEG", 128);
 MIMEBASE("image/gif","icon_mime_image_generic.png", ".GIF", 128);
 MIMEBASE("image/bmp","icon_mime_image_generic.png", ".BMP", 128);
 MIMEBASE("application/x-xcf","icon_mime_image_generic.png", ".XCF", 128);
+MIMEBASE("application/x-cbz","icon_mime_image_generic.png", ".CBZ", 128);
+MIMEBASE("application/x-cbr","icon_mime_image_generic.png", ".CBR", 128);
 
 MIMEBASE("audio/mpeg","icon_mime_audio_generic.png", ".MP3", 128);
 MIMEBASE("audio/x-wav","icon_mime_audio_generic.png", ".WAV", 128);
 MIMEBASE("audio/x-flac","icon_mime_audio_generic.png", ".FLAC", 128);
 MIMEBASE("audio/x-musepack","icon_mime_audio_generic.png", ".MPC", 128);
+MIMEBASE("audio/x-vorbis+ogg","icon_mime_audio_generic.png", ".OGG", 128);
+MIMEBASE("application/x-audacity-project","icon_mime_audio_generic.png", ".AUP", 128);
+MIMEBASE("audio/x-ms-wma","icon_mime_audio_generic.png", ".WMA", 128);
 
 MIMEBASE("text/css","icon_mime_text_generic.png", ".CSS", 128);
 MIMEBASE("text/html","icon_mime_text_generic.png", ".HTML", 128);
@@ -24426,7 +24464,16 @@ MIMEBASE("text/x-csharp","icon_mime_text_generic.png", ".C#", 128);
 MIMEBASE("text/x-patch","icon_mime_text_generic.png", ".PATCH", 128);
 MIMEBASE("text/plain","icon_mime_text_generic.png", ".TXT", 128);
 MIMEBASE("application/x-msword","icon_mime_text_generic.png", ".DOC", 128);
+MIMEBASE("application/vnd.ms-powerpoint","icon_mime_text_generic.png", ".PPT", 128);
+MIMEBASE("application/vnd.ms-excel","icon_mime_text_generic.png", ".XLS", 128);
 MIMEBASE("application/x-abiword","icon_mime_text_generic.png", ".ABW", 128);
+MIMEBASE("application/vnd.scribus","icon_mime_text_generic.png", ".SLA", 128);
+MIMEBASE("text/x-python","icon_mime_text_generic.png", ".PY", 128);
+MIMEBASE("application/x-awk","icon_mime_text_generic.png", ".AWK", 128);
+MIMEBASE("application/x-lyx","icon_mime_text_generic.png", ".LYX", 128);
+MIMEBASE("application/vnd.oasis.opendocument.spreadsheet","icon_mime_text_generic.png", ".ODS", 128);
+MIMEBASE("application/vnd.oasis.opendocument.text","icon_mime_text_generic.png", ".ODT", 128);
+MIMEBASE("application/vnd.oasis.opendocument.presentation","icon_mime_text_generic.png", ".ODP", 128);
 
 MIMEBASE("application/x-object","icon_efm_file.png", "", 128);
 MIMEBASE("application/x-shellscript","icon_applications.png", "", 128);
@@ -26579,411 +26626,2002 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
    }
 
 
-/////////////////////////////////////////////////////////////////////////////
+   /////////////////////////////////////////////////////////////////////////////
    /*** MOD: EVERYTHING ***/
+   
+   ICON("everything-launch","icon_advanced.png",64)
+     
+   group { name: "e/modules/everything/main";
+       images {
+	   image: "base_bg.png" COMP;
+	   image: "inset_sunk.png" COMP;
+	   image: "menu_sel_bg.png" COMP;
+	   image: "menu_sel_fg.png" COMP;
+	   image: "everything_drop.png" COMP;
+       }
+       data.item: "shaped" "1";
+       parts {
+	   part { name: "win";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+		   min: 386 118;
+	       }
+	       description { state: "composite" 0.0;
+		   visible: 0;
+		   min: 486 218;
+	       }	       
+	   }
+	   part { name: "frame";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+	       }
+	       description { state: "composite" 0.0;
+		   visible: 0;
+		   rel1.offset: 50 50;
+		   rel2.offset: -50 -51;
+	       }	       
+	   }
+	   part { name: "shadow";
+	       description { state: "default" 0.0;
+		   visible: 0;
+	   	   image {
+	   	       normal: "everything_drop.png";
+	   	       border: 50 50 50 50;
+	   	   }
+		   rel1.offset: 4 4;
+		   rel2.offset: -5 -5;
+	   	   fill.smooth: 0;
+	   	   color: 255 255 255 220;
+	       }
+	       description { state: "composite" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+	       }
+	   }
+	   part { name: "bg";
+	       description { state: "default" 0.0;
+	       max: 999 118;
+	     	   image {
+	     	       normal: "bt_base2.png";
+	     	       border: 7 7 5 5;
+	     	   }
+	       }
+	       description { state: "composite" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.offset: 50 50;
+		   rel2.offset: -50 -51;
+	       }
+	   }
+	   part { name: "border_bg";
+	       mouse_events:  0;
+	       description { state: "default" 0.0;
+		   color: 255 255 255 66; //32;	       
+		   rel1.to: "bg";
+		   rel1.offset: 2 4;
+		   rel2.to: "bg";
+		   rel2.offset: -3 -3;		   
+		   image {
+		       normal: "everything_item_bg.png";
+		       border: 5 5 5 5;
+		   }
+	       }
+	   }
+	   part { name: "selector_frame";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   color: 255 255 255 255;
+		   rel1 {
+		       offset: 8 5;
+		       to: "bg";
+		   }
+		   rel2 {
+		       offset: -9 -6;
+		       to: "bg";
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.subject_selector";
+	       type: SWALLOW;
+	       clip_to: "selector_frame";
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset: 0 2;
+		       to: "selector_frame";
+		   }
+		   rel2 {
+		       relative: 0.5 1.0;
+		       offset:  -1 -2;
+		       to_y: "selector_frame";
+		   }
+	       }
+	       description { state: "wide" 0;
+		   inherit: "default" 0.0;
+		   visible: 0;
+		   rel1 {
+		       relative: -0.5 0.0;
+		       offset: 0 2;
+		   }
+		   rel2 {
+		       relative: 0.0 1.0;
+		       offset:   0 -2;
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.action_selector";
+	       type: SWALLOW;
+	       clip_to: "selector_frame";
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.5 0.0;
+		       offset: 0 2;
+		       to: "selector_frame";
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset: -1 -2;
+		       to: "selector_frame";
+		   }
+	       }
+	       description { state: "wide" 0;
+		   inherit: "default" 0.0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset: 0 2;
+		   }
+		   rel2 {
+		       relative: 0.5 1.0;
+		       offset:   -1 -2;
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.object_selector";
+	       type: SWALLOW;
+	       clip_to: "selector_frame";
+	       description { state: "default" 0.0;
+		   visible: 0;
+		   rel1 {
+		       relative: 1.0 0.0;
+		       offset: 0 2;
+		       to: "selector_frame";
+		   }
+		   rel2 {
+		       relative: 1.5 1.0;
+		       offset: -1 -2;
+		       to: "selector_frame";
+		   }
+	       }
+	       description { state: "wide" 0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+		   rel1 {
+		       relative: 0.5 0.0;
+		       offset: 0 2;
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset: -1 -2;
+		   }
+	       }
+	   }
+	   part { name: "over1";
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   rel1.to: "bg";
+		   rel2.to: "bg";
+		   rel2.relative: 1.0 0.5;
+		   image {
+		       normal: "bt_hilight.png";
+		       border: 7 7 7 0;
+		   }
+		   color: 255 255 255 220;
+	       }
+	   }
+	   part { name: "over2";
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   rel1.to: "bg";
+		   rel2.to: "bg";
+		   rel2.offset: -1 40;
+		   image {
+		       normal: "bt_shine.png";
+		       border: 7 7 7 0;
+		   }
+	       }
+	   }
+       }
+       programs {
+	   program { name: "object_selector_hide";
+	       signal: "e,state,object_selector_hide";
+	       source: "e";
+	       action: STATE_SET "default" 0.00;
+	       transition: SINUSOIDAL 0.15;
+	       target: "e.swallow.object_selector";
+	       target: "e.swallow.subject_selector";
+	       target: "e.swallow.action_selector";
+	   }
+	   program { name: "object_selector_show";
+	       signal: "e,state,object_selector_show";
+	       source: "e";
+	       action: STATE_SET "wide" 0.00;
+	       transition: SINUSOIDAL 0.2;
+	       target: "e.swallow.object_selector";
+	       target: "e.swallow.subject_selector";
+	       target: "e.swallow.action_selector";
+	   }
+	   program { name: "composite_mode";
+	       signal: "e,state,composited";
+	       source: "e";
+	       action: STATE_SET "composite" 0.0;
+	       target: "win";
+	       target: "frame";
+	       target: "shadow";
+	       target: "bg";
+	   }
+       }
+   }
+
+   group { name: "e/modules/everything/selector_item";
+       images {
+	   image: "everything_border.png" COMP;
+	   image: "everything_item_bg.png" COMP;
+       }
+       parts {
+	   part { name: "clip";
+	       type: RECT;
+	       mouse_events: 0;
+	       description {
+		   state: "default" 0.0;
+	       }
+	   }
+	   part { name: "border_bg";
+	       clip_to: "clip";
+	       mouse_events:  0;
+	       description { state: "default" 0.0;
+		   color: 255 255 255 10; //32;	       
+		   rel1.offset: 2 2;
+		   rel2.offset: -3 -3;		   
+		   image {
+		       normal: "everything_item_bg.png";
+		       border: 5 5 5 5;
+		   }
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 36;
+	       }
+	   }
+	   part { name: "border";
+	       clip_to: "clip";
+	       mouse_events:  0;
+	       description { state: "default" 0.0;
+		   color: 255 255 255 80;	       
+		   image {
+		       normal: "everything_border.png";
+		       border: 10 10 10 10;
+		   }
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 160;
+	       }
+	   }
+	   part { name: "inner_clip";
+	       type: RECT;
+	       clip_to: "clip";
+	       description {
+		   state: "default" 0.0;
+		   rel1.offset:   10   10;
+		   rel2.offset:   -11   -11;
+	       }
+	   }
+	   part { name: "icon_clip";
+	       type: RECT;
+	       clip_to: "inner_clip";
+	       description {
+		   state: "default" 0.0;
+		   color: 255 255 255 255;
+	       }
+	       description {
+		   state: "faded" 0.0;
+		   color: 255 255 255 120;
+	       }
+	   }
+	   part {
+	       name: "e.swallow.icons";
+	       type: SWALLOW;
+	       clip_to: "icon_clip";
+	       description {
+		   state: "default" 0.0;
+		   min: 64 64;
+		   max: 64 64;
+		   aspect: 1.0 1.0;
+		   align: 0.0 0.5;
+		   aspect_preference: VERTICAL;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset:   15   15;
+		   }
+		   rel2 {
+		       relative: 0.0 0.0;
+		       offset:   79  79;
+		   }
+	       }
+	   }
+	   part {
+	       name: "e.swallow.thumb";
+	       type: SWALLOW;
+	       clip_to: "icon_clip";
+	       description {
+		   state: "default" 0.0;
+		   min: 86 64;
+		   max: 86 64;
+		   aspect: 1.0 1.0;
+		   align: 0.0 0.5;
+		   aspect_preference: VERTICAL;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset:   15   15;
+		   }
+		   rel2 {
+		       relative: 0.0 0.0;
+		       offset:   100  79;
+		   }
+		   color: 255 255 255 0;
+	       }
+	   }
+	   part { name: "e.text.label";
+	       type: TEXT;
+	       clip_to: "inner_clip";
+	       effect: SOFT_SHADOW;
+	       mouse_events: 0;
+	       scale: 1;
+	       description {
+		   state: "default" 0.0;
+		   rel1 {
+		       offset: 20 6;
+		       relative: 0.0 0.6;
+		   }
+		   rel2.offset: -11 -2;
+		   color: 205 205 205 255;
+		   color3: 40 40 40 64;
+		   text {
+		       font: "Sans:style=Bold";
+		       size: 10;
+		       min: 0 1;
+		       align: 0.5 0.5;
+		   }
+	       }
+	       description {
+		   state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 255;
+	       }
 
-   group { name: "e/widgets/everything/main";
+	   }
+	   part { name: "e.text.plugin";
+	       type: TEXT;
+	       clip_to: "inner_clip";
+	       effect: SOFT_SHADOW;
+	       mouse_events: 0;
+	       scale: 1;
+	       description {
+		   state: "default" 0.0;
+		   rel1 {
+		       offset: 6 12;
+		       relative: 1.0 0.0;
+		       to_x: "e.swallow.icons";
+		   }
+		   rel2.offset: -13 -2;
+		   color: 210 210 210 255;
+		   color3: 0 0 0 0;
+		   text {
+		       font: "Sans";
+		       size: 10;
+		       min: 0 1;
+		       align: 1.0 0.0;
+		   }
+	       }
+	   }
+       }
+       programs {
+	   program { name: "sel";
+	       signal: "e,state,selected";
+	       source: "e";
+	       action: STATE_SET "selected" 0.0;
+	       transition: SINUSOIDAL 0.2;
+	       target: "border";
+	       target: "border_bg";
+	       target: "e.text.label";
+	   }
+	   program { name: "unsel";
+	       signal: "e,state,unselected";
+	       source: "e";
+	       action: STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.3;
+	       target: "border";
+	       target: "border_bg";
+	       target: "e.text.label";
+	   }
+	   program { name: "update";
+	       signal: "e,signal,update";
+	       source: "e";
+	       action: STATE_SET "faded" 0.0;
+	       transition: DECELERATE 0.1;
+	       target: "icon_clip";
+	       after: "show_icon";
+	   }
+	   program { name: "show_icon";
+	       action: STATE_SET "default" 0.0;
+	       transition: ACCELERATE 0.3;
+	       target: "icon_clip";
+	   }
+	   program { name: "thumb_show";
+	      signal:  "e,action,thumb,show";
+	      source:  "e";
+	       action:  STATE_SET "faded" 0.0;
+	       /* transition: SINUSOIDAL 0.05; */
+	       target: "icon_clip";
+	       after:   "thumb_show2";
+	   }	   
+	   program { name: "thumb_show2";
+	       action:  STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.2;
+	       target: "icon_clip";
+	   }	   
+       }
+   }
+   
+   /////////////////////////////////////////////////////////////////////////////
+   /*** EVERYTHING LIST POPUP ***/   
+   group { name: "e/modules/everything/list";
+       images {
+	   image: "base_bg.png" COMP;
+	   image: "inset_sunk.png" COMP;
+	   image: "menu_sel_bg.png" COMP;
+	   image: "menu_sel_fg.png" COMP;
+	   image: "everything_bar.png" COMP;
+	   image: "everything_box.png" COMP;
+	   image: "vgrad_dark.png" COMP;
+	   image: "everything_drop.png" COMP;
+       }
+       /* offset to main popup */
+       data.item: "offset_y" "-2";
+       data.item: "offset_x" "16";
+       data.item: "offset_composite_y" "-52";
+       data.item: "offset_composite_x" "16";
+       data.item: "shaped" "1";
+
+       parts {
+	   part { name: "win";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+		   min: 400 255;
+	       }
+	       description { state: "composite" 0.0;
+		   visible: 0;
+		   min: 500 305;
+	       }	       
+	   }
+	   part { name: "frame";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+	       }
+	       description { state: "composite" 0.0;
+		   visible: 0;
+		   rel1.offset: 50 0;
+		   rel2.offset: -51 -51;
+	       }	       
+	   }
+	   part { name: "shadow_clip";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   rel1.to: "shadow";
+		   rel2.to: "shadow";
+		   color: 255 255 255 0;
+	       }
+	       description { state: "visible" 0.0;
+		   inherit: "default" 0.0;
+	   	   color: 255 255 255 255;
+	       }	       
+	   }
+	   part { name: "shadow";
+	       clip_to: "shadow_clip";
+	       description { state: "default" 0.0;
+		   visible: 0;
+	   	   rel1.offset: 0 -50;
+	   	   rel2 {
+	   	       relative: 1.0 1.0;
+	   	       to_y: "base";
+	   	       offset: -1 49;
+	   	   } 
+	   	   image {
+	   	       normal: "everything_drop.png";
+	   	       border: 50 50 50 50;
+	   	   }
+	   	   fill.smooth: 0;
+	       }
+	       description { state: "composite" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+	   	   rel1.offset: 0 -50;
+	   	   rel2 {
+	   	       relative: 1.0 1.0;
+	   	       to_y: "base";
+	   	       offset: -1 49;
+	   	   } 
+	       }
+	   }
+	   part { name: "base";
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.0 1.0;
+		       to_x: "frame";
+		       to_y: "input_base";
+		   }
+		    rel2 {
+			to_x: "frame";
+			to_y: "input_base";
+		    }
+		}
+		description { state: "visible" 0.0;
+		    rel1 {
+			relative: 0.0 1.0;
+			to_x: "frame";
+			to_y: "input_base";
+		    }
+		    rel2 {
+			to: "frame";
+			offset: -1 -1;
+		    }
+		}
+	    }
+	    part { name: "input_base";
+		type: RECT;
+		description { state: "default" 0.0;
+		    rel1.to_x: "base";
+		    rel2 {
+			relative: 1.0 0.0;
+			to_x: "base";
+			offset: -1 1;
+		    }
+		}
+		description { state: "visible" 0.0;
+		    inherit: "default" 0.0;
+		    rel2.offset: -1 24;
+		}
+	    }
+	    part { name: "bg";
+		description { state: "default" 0.0;
+		    rel1.to_x: "base";
+		    rel1.to_y: "input_base";
+		    rel2.to:   "base";
+		    image {
+			normal: "base_bg.png";
+			border: 2 2 2 2;
+		    }
+		    fill.smooth: 0;
+		    color: 205 205 205 255;
+		}
+	    }
+	    part { name: "bar_base";
+		type: RECT;
+		description { state: "default" 0.0;
+		    visible: 0;
+		    rel1 {
+			relative: 0.0 1.0;
+			to: "base";
+			offset: 0 -27;
+		    }
+		    rel2 {
+			relative: 1.0 1.0;
+			to: "base";
+			offset: -1 -1;
+		    }
+		} 
+	    }
+	    part { name: "bar_clip";
+		type: RECT;
+		description { state: "default" 0.0;
+		    rel1 {
+			to: "bar_base";
+			offset: 2 3;
+		    }
+		    rel2 {
+			to: "bar_base";
+			offset: -2 -3;
+		    }
+		}
+		description {
+		    state: "faded" 0.0;
+		    inherit: "default" 0.0;
+		    color: 255 255 255 0;
+		}
+	    }	   
+	    part { name: "bar_bg";
+		clip_to: "base";
+		description { state: "default" 0.0;
+		    min: 32 25;
+		    max: 9999 25;
+		    rel1 {
+			offset: -1 2;
+			to: "bar_base";
+		    }
+		    rel2 {
+			offset: -1 -1;
+			to: "bar_base";
+		    }
+		    image {
+			normal: "everything_bar.png";
+			border: 2 2 2 2;
+		    }
+		    color: 225 225 225 255;		   
+		}
+	    }
+	    part { name: "e.swallow.bar";
+		clip_to: "bar_clip";
+		type: SWALLOW;
+		description {
+		    state: "default" 0.0;
+		    rel1.to: "bar_clip";
+		    rel1.offset: -1 0;
+		    rel2.to: "bar_clip";
+		    rel2.offset: -1 -1;
+		}
+	    }
+	    part { name: "bar_over2";
+		clip_to: "base";
+		description { state: "default" 0.0;
+		    rel1.to: "bar_bg";
+		    rel1.offset: -1 -2;
+		    rel2.to: "bar_bg";
+		    rel2.offset: 1 1;
+		    image {
+			normal: "bt_dis_shine.png";
+			border: 4 4 4 4;
+		    }
+		    color: 255 255 255 235;
+		}
+	    }
+	    part { name: "bar_over1";
+		clip_to: "base";
+		description { state: "default" 0.0;
+		    rel1.to: "bar_bg";
+		    rel1.offset: 0 -2;
+		    rel2.to: "bar_bg";
+		    rel2.offset: 1 -1;
+		    rel2.relative: 1.0 0.5;
+		    image {
+			normal: "bt_dis_hilight.png";
+			border: 4 4 4 0;
+		    }
+		    color: 255 255 255 128;
+		}
+	    }
+	    part { name: "input_bg";
+		clip_to: "input_base";
+		description { state: "default" 0.0;
+		    min: 32 28;
+		    max: 9999 28;
+		    rel1 {
+			offset:  -3 0;
+			to: "input_base";
+		    }
+		    rel2 {
+			offset: 1 0;
+			to: "input_base";
+		    }
+		    image {
+			normal: "bt_dis_base.png";
+			border: 4 4 4 4;
+		    }
+		    color: 235 235 235 255;		   
+		}
+	    }
+	    part { name: "e.text.label";
+		type: TEXT;
+		effect: SHADOW;
+		scale: 1;
+		clip_to: "input_base";
+		description { state: "default" 0.0;
+		    fixed: 0 1;
+		    align: 0.0 0.5;
+		    rel1 {
+			offset:   10   7;
+			to: "input_bg";
+		    }
+		    rel2 {
+			relative: 0.0 1.0;
+			offset:   10  -5;
+			to: "input_bg";
+		    }
+		    color: 0 0 0 255;
+		    color3: 255 255 255 128;
+		    text {
+			font: "Sans:style=Bold";
+			size: 14;
+			align: 0.0 0.5;
+			min: 1 1;
+		    }
+		}
+	    }
+	    part { name: "input_over2";
+		mouse_events: 0;
+		clip_to: "input_base";
+		description { state: "default" 0.0;
+		    visible: 0;
+		    rel1.to: "input_bg";
+		    rel2.to: "input_bg";
+		    image {
+			normal: "bt_dis_shine.png";
+			border: 4 4 4 4;
+		    }
+		    color: 255 255 255 180;
+		}
+		description { state: "visible" 0.0;
+		    inherit: "default" 0.0;
+		    visible: 1;
+		}
+	    }
+	    part { name: "input_over1";
+		mouse_events: 0;
+		clip_to: "input_base";
+		description { state: "default" 0.0;
+		    visible: 0;
+		    rel1.to: "input_bg";
+		    rel1.offset: -1 0;
+		    rel2.to: "input_bg";
+		    rel2.offset: -1 4;
+		    rel2.relative: 1.0 0.5;
+		    image {
+			normal: "bt_dis_hilight.png";
+			border: 4 4 4 0;
+		    }
+		    color: 255 255 255 100;
+		}
+		description { state: "visible" 0.0;
+		    inherit: "default" 0.0;
+		    visible: 1;
+		}
+	    }
+	    part { name: "list_clip";
+		type: RECT;
+		clip_to: "base";
+		description { state: "default" 0.0;
+		    color: 255 255 255 255;
+		    rel1 {
+			relative: 0.0 0.0;
+		       offset:   2 0;
+		       to: "base";
+		   }
+		   rel2 {
+		       relative: 1.0 0.0;
+		       offset:   -3  0;
+		       to_y: "bar_base";
+		       to_x: "base";
+		   }
+	       }
+	   }
+	   part { name: "list_bg";
+	       clip_to: "base";
+	       description { state: "default" 0.0;
+		   image.normal: "vgrad_dark.png";
+		   rel1 {
+		       to: "list_clip";
+		       offset: 0 0;
+		   }
+		   rel2 {
+		       to: "list_clip";
+		       offset: 0  0;
+		   }
+		   fill.smooth: 0;
+	       }
+	   }
+	   part { name: "e.swallow.list";
+	       type: SWALLOW;
+	       clip_to: "list_clip";
+	       description { state: "default" 0.0;
+		   min: 32 170;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset:   0 3;
+		       to: "list_clip";
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset:   -1  -1;
+		       to: "list_clip";
+		   }
+	       }
+	       description { state: "visible" 0.0;
+		   inherit: "default" 0.0;
+		   min: 32 150;
+	       }
+	   }
+	   part { name: "list_over";
+	       clip_to: "base";
+	       description { state: "default" 0.0;
+		   rel1 {
+		       offset: -1 -1;
+		       to: "list_bg";
+		   }
+		   rel2 {
+		       offset: -1 -1;
+		       to: "list_bg";
+		   }
+		   image {
+		       normal: "inset_sunk.png";
+		       border: 7 7 7 7;
+		       middle: 0;
+		   }
+		   fill.smooth : 0;
+		   color: 200 200 200 255;		   
+	       }
+	   }
+	   part { name: "list_over2";
+	       clip_to: "base";
+	       description { state: "default" 0.0;
+		   rel1 {
+		       offset: -1 -1;
+		       to: "list_bg";
+		   }
+		   rel2 {
+		       offset: -1 -1;
+		       to: "list_bg";
+		   }
+		   image {
+		       normal: "inset_sunk.png";
+		       border: 7 7 7 7;
+		       middle: 0;
+		   }
+		   fill.smooth : 0;
+		   color: 200 200 200 255;		   
+	       }
+	   }
+	   part { name: "box";
+	       description { state: "default" 0.0;
+	   	   rel1 {
+	   	       to_x: "base";
+	   	   }
+	   	   rel2 {
+	   	       to: "base";
+	   	   }
+	   	   image {
+	   	       normal: "everything_box.png";
+	   	       border: 3 3 3 3;
+	   	       middle: 0;
+	   	   }
+	   	   fill.smooth : 1;
+	   	   color: 255 255 255 250;
+	       }
+	   }
+       }
+       programs {
+	   program { name: "show_list";
+	       signal: "e,state,list_show";
+	       source: "e";
+	       action: STATE_SET "visible" 0.0;
+	       transition: DECELERATE 0.1;
+	       target: "base";
+	       target: "shadow_clip";
+	   }
+	   program { name: "hide_list";
+	       signal: "e,state,list_hide";
+	       source: "e";
+	       action: STATE_SET "default" 0.0;
+	       transition: ACCELERATE 0.08; 
+	       target: "base";
+	       target: "shadow_clip";
+	   }
+	   program { name: "show_entry";
+	       signal: "e,state,entry_show";
+	       source: "e";
+	       action: STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.08;
+	       target: "input_over1";
+	       target: "input_over2";
+	       target: "input_base";
+	       target: "e.swallow.list";
+	     }
+	   program { name: "hide_entry";
+	       signal: "e,state,entry_hide";
+	       source: "e";
+	       action: STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.08;
+	       target: "input_over1";
+	       target: "input_over2";
+	       target: "input_base";
+	       target: "e.swallow.list";
+	   }
+	   program { name: "update_list";
+	       signal: "e,signal,update";
+	       source: "e";
+	       action: STATE_SET "faded" 0.0;
+	       transition: SINUSOIDAL 0.35;
+	       target: "bar_clip";
+	       after:  "update_list2";
+	   }
+	   program { name: "update_list2";
+	       action: STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.15;
+	       target: "bar_clip";
+	   }
+	   program { name: "composite_mode";
+	       signal: "e,state,composited";
+	       source: "e";
+	       action: STATE_SET "composite" 0.0;
+	       target: "win";
+	       target: "shadow";
+	       target: "frame";
+	   }
+       }
+   }
+   
+   group { name: "e/modules/everything/tab_item";
+       images {
+	   image: "toolbar_sel.png" COMP;
+       }
+       min: 70 10;
+       max: 100 10;
+       parts {
+	   part { name: "label2";
+	       type: TEXT;
+	       scale: 1;
+	       description { state: "default" 0.0;
+		   align: 0.5 0.5;
+		   fixed: 0 1;
+		   rel1.to: "e.text.label";
+		   rel2.to: "e.text.label";
+		   color: 0 0 0 255;
+		   text {
+		       font: "Sans:style";
+		       text_source: "e.text.label";
+		       size: 11;
+		       min: 1 1;
+		       align: 0.5 0.5;
+		   }
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 10 10 10 0;
+		   visible: 0;
+	       }
+	   }
+	   part { name: "bg";
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   color: 255 255 255 40;
+		   image {
+		       normal: "toolbar_sel.png";
+		       border: 2 2 0 0;
+		   }
+		   fill.smooth: 1;
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 245 245 245 250;
+	       }
+	   }
+	   part { name: "e.text.label";
+	       type: TEXT;
+	       mouse_events:  0;
+	       scale: 1;
+	       description { state: "default" 0.0;
+		   align: 0.5 0.5;
+		   fixed: 0 1;
+		   rel1.offset:   5 3;
+		   rel2.offset:   -6 -1;
+		   visible: 0;
+		   color: 224 224 224 255;
+		   text {
+		       font: "Sans:style=Bold";
+		       size: 10;
+		       min: 1 1;
+		       align: 0.5 0.5;
+		   }
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+	       }
+	   }
+       }
+       programs {
+	   program { name: "go_active";
+	       signal:  "e,state,selected";
+	       source:  "e";
+	       action:  STATE_SET "selected" 0.0;
+	       target:  "bg";
+	       target:  "e.text.label";
+	       target:  "label2";
+	       transition: LINEAR 0.3;
+	   }
+	   program { name: "go_passive";
+	       signal:  "e,state,unselected";
+	       source:  "e";
+	       action:  STATE_SET "default" 0.0;
+	       target:  "bg";
+	       target:  "e.text.label";
+	       target:  "label2";
+	   }
+       }
+   }
+   
+   /////////////////////////////////////////////////////////////////////////////
+   /*** EVERYTHING PREVIEW ***/
+   group { name: "e/modules/everything/preview";
+       parts {
+	   part { name: "bg";
+	       type: RECT;
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   color: 64 64 63 255;
+		   rel1 {
+			offset: -4 -4;
+		   }
+		   rel2 {
+		       offset: 4 4;
+		   }
+	       }
+	   }
+	   part { name: "frame";
+	       type: RECT;
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   visible: 0;		   
+		   align: 0 0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset: -1 -4;
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.icon1";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       to: "frame";
+		       offset: 2 2;
+		   }
+		   rel2 {
+		       relative: 0.3333 1.0;
+		       to: "frame";
+		       offset: -3 -3;
+		   }
+	       }
+	       description { state: "right" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 0.3333 0.0;
+		   rel2.relative: 0.6666 1.0;
+	       }
+	       description { state: "left" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 0.0 0.0;
+		   rel2.relative: 0.0 1.0;
+	       }
+	   }
+	   part { name: "e.swallow.icon2";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.3333 0.0;
+		       to: "frame";
+		       offset: 2 2;
+		   }
+		   rel2 {
+		       relative: 0.6666 1.0;
+		       to: "frame";
+		       offset: -3 -3;
+		   }
+	       }
+	       description { state: "left" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 0.00 0.0;
+		   rel2.relative: 0.3333 1.0;
+	       }
+	       description { state: "right" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 0.6666 0.0;
+		   rel2.relative: 0.9999 1.0;
+	       }	
+	   }	
+	   part { name: "e.swallow.icon3";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       relative: 0.6666 0.0;
+		       to: "frame";
+		       offset: 2 2;
+		   }
+		   rel2 {
+		       relative: 0.9999 1.0;
+		       to: "frame";
+		       offset: -3 -3;
+		   }
+	       }
+	       description { state: "left" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 0.3333 0.0;
+		   rel2.relative: 0.6666 1.0;
+	       }
+	       description { state: "right" 0.0;
+		   inherit: "default" 0.0;
+		   rel1.relative: 1.0 0.0;
+		   rel2.relative: 1.0 1.0;
+	       }
+	   }
+       }
+       programs {
+	   program { name: "slide_left";
+	       signal:  "e,signal,slide_left";
+	       source:  "e";
+	       action:  STATE_SET "right" 0.0;
+	       target:  "e.swallow.icon1";
+	       target:  "e.swallow.icon2";
+	       target:  "e.swallow.icon3";
+	       after:   "slide_middle";
+	   }
+	   program { name: "slide_right";
+	       signal:  "e,signal,slide_right";
+	       source:  "e";
+	       action:  STATE_SET "left" 0.0;
+	       target:  "e.swallow.icon1";
+	       target:  "e.swallow.icon2";
+	       target:  "e.swallow.icon3";
+	       after:   "slide_middle";
+	   }
+	   program { name: "slide_middle";
+	       action:  STATE_SET "default" 0.0;
+	       target:  "e.swallow.icon1";
+	       target:  "e.swallow.icon2";
+	       target:  "e.swallow.icon3";
+	       transition: LINEAR 0.25;
+	   }
+       }
+   }
+   
+   /////////////////////////////////////////////////////////////////////////////
+   /*** EVERYTHING THUMB VIEW ***/
+   group { name: "e/modules/everything/thumbview/main/window";
       images {
-	 image: "base_bg.png" COMP;
-	 image: "inset_sunk.png" COMP;
-	 image: "menu_sel_bg.png" COMP;
-	 image: "menu_sel_fg.png" COMP;
+	 image: "vgrad_dark.png" COMP;
+	 image: "dia_topshad.png" COMP;
+	 image: "dia_botshad.png" COMP;
+         image: "dia_botshad.png" COMP;
+         image: "topsh.png" COMP;
+         image: "wp-bot1.png" COMP;
+         image: "wp-bot2.png" COMP;
+         image: "wp-tb1.png" COMP;
+         image: "wp-tb2.png" COMP;
+         image: "wp-tb3.png" COMP;
+         image: "wp-tbs.png" COMP;
+         image: "big_arrow_up.png" COMP;
+
+	 image: "busy-1.png" COMP;
+         image: "busy-2.png" COMP;
+         image: "busy-3.png" COMP;
+         image: "busy-4.png" COMP;
+         image: "busy-5.png" COMP;
+         image: "busy-6.png" COMP;
+         image: "busy-7.png" COMP;
+         image: "busy-8.png" COMP;
+         image: "busy-9.png" COMP;
       }
       parts {
 	 part { name: "base";
 	    mouse_events:  0;
-	    description { state: "default" 0.0;
-	       image {
-		  normal: "base_bg.png";
-		  border: 2 2 2 2;
-	       }
-
-	       fill.smooth: 0;
-	       color: 245 245 245 255;
-	    }
-	 }
-
-	 part { name: "bg";
-	    mouse_events: 0;
-	    description { state: "default" 0.0;
-	       min: 0 42;
-	       max: 99999 42;
-
+	     type: RECT;
+	     description { state: "default" 0.0;
+		 visible: 0;
 	       rel1 {
 		  relative: 0.0 0.0;
-		  offset:   4   8;
+		  offset:   0   -3;
 	       }
 	       rel2 {
-		  relative: 1.0 0.0;
-		  offset:   -6  50;
-	       }
-
-	       image {
-		  normal: "menu_sel_bg.png";
-		  border: 8 8 5 9;
+		  relative: 1.0 1.0;
+		  offset:   -1  6;
 	       }
 	    }
 	 }
-	 
-	 part { name: "list_bg";
-	    type: RECT;
+	 part { name: "e.swallow.preview";
+	    type: SWALLOW;
 	    description { state: "default" 0.0;
-	       rel1 {
-		  relative: 0.0 1.0;
-		  to: "selector_base";
-		  offset: 3 6;
-	       }
-	       rel2 {
-		  to: "e.swallow.list";
-		  offset: 0  0;
-	       }
-	       color: 255 255 255 255;
 	    }
 	 }
-
-	 part { name: "selector_base";
-	    mouse_events: 1;
+	 part { name: "events";
+	    type: RECT;
 	    description { state: "default" 0.0;
-	       min: 32 32;
-	       max: 9999 32;
-
-	        rel1 {
-		  relative: 0.0 1.0;
-		  offset: 8 6;
-		  to_y: "bg";
-	       }
-		rel2 {
-		  relative: 1.0 1.0;
-		  offset: -9 38;
-		  to_y: "bg";
-		}
-		
-	       image {
-		  normal: "bt_dis_base.png";
-		  border: 4 4 4 4;
-	       }
+	       color: 0 0 0 0;
 	    }
 	 }
-	 part { name: "clipper";
-	    type: RECT;
-	    mouse_events: 0;
-	    description {
-	       state: "default" 0.0;
+	 part { name: "e.swallow.list";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
 	       rel1 {
-		  to: "selector_base";
-		  offset: 2 2;
+		  relative: 0.0 0.0;
+		  offset:   6   1;
 	       }
 	       rel2 {
-		  to: "selector_base";
-		  offset: -3 -3;
+		  relative: 1.0 1.0;
+		  offset:   -3  -3;
 	       }
 	    }
 	 }
-	 part { name: "e.swallow.bar";
-	    clip_to: "clipper";
-	    type: SWALLOW;
-	    description {
-	       state: "default" 0.0;
-	       rel1.to: "clipper";
-	       rel2.to: "clipper";
-	    }
-	 }
-	 part { name: "over2";
-	    mouse_events: 0;
+	 part { name: "cover";
+	    type: RECT;
 	    description { state: "default" 0.0;
-	       rel1.to: "selector_base";
-	       rel2.to: "selector_base";
-	       image {
-		  normal: "bt_dis_shine.png";
-		  border: 4 4 4 4;
-	       }
+	       color: 0 0 0 0;
+               visible: 0;
 	    }
-	 }
-	 part { name: "over1";
-	    mouse_events: 0;
-	    description { state: "default" 0.0;
-	       rel1.to: "selector_base";
-	       rel2.to: "selector_base";
-	       rel2.relative: 1.0 0.5;
-	       image {
-		  normal: "bt_dis_hilight.png";
-		  border: 4 4 4 0;
-	       }
-	       color: 255 255 255 128;
+	    description { state: "out" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
 	    }
 	 }
-
-	 part { name: "e.swallow.list";
-	    type: SWALLOW;
-	    clip_to: "list_clip";
+	 part { name: "shadow2";
+	    mouse_events:  0;
 	    description { state: "default" 0.0;
-	       min: 32 64;
-	       align: 0.5 0.0;
-	       rel1 {
-		  relative: 0.0 1.0;
-		  offset:   12 7;
-		  to_y: "selector_base";
+	       rel1.relative: 0.0 1.0;
+	       rel1.offset: 0 -4;
+	       image.normal: "dia_botshad.png";
+	       fill {
+		  smooth: 0;
+		  size {
+		     relative: 0.0 1.0;
+		     offset: 64 0;
+		  }
 	       }
-	       rel2.offset:   -13  -13;
 	    }
 	 }
-	 part { name: "list_clip";
+	 part { name: "busy_clip";
 	    type: RECT;
 	    description { state: "default" 0.0;
+               visible: 0;
+	       color: 255 255 255 0;
+	    }
+	    description { state: "visible" 0.0;
+               visible: 1;
 	       color: 255 255 255 255;
-	       rel1.to_y: "e.swallow.list";
-	       rel2.to_y: "e.swallow.list";
 	    }
 	 }
-	 part { name: "list_over";
+	 part { name: "busy";
 	    mouse_events:  0;
+            clip_to: "busy_clip";
 	    description { state: "default" 0.0;
+	       min: 32 32;
+	       max: 32 32;
+	       aspect: 1.0 1.0;
+	       aspect_preference: BOTH;
 	       rel1 {
-		  offset: -1 -1;
-		  to: "list_bg";
+		  relative: 0.5 0.5;
+		  offset:   0 0;
 	       }
-	       rel2 {
-		  offset: 0 0;
-		  to: "list_bg";
+               rel2 {
+		  relative: 0.5 0.5;
+		  offset:   -1 1;
 	       }
 	       image {
-		  normal: "inset_sunk.png";
-		  border: 7 7 7 7;
-		  middle: 0;
+		  normal: "busy-9.png";
+		  tween:  "busy-1.png";
+		  tween:  "busy-2.png";
+		  tween:  "busy-3.png";
+		  tween:  "busy-4.png";
+		  tween:  "busy-5.png";
+		  tween:  "busy-6.png";
+		  tween:  "busy-7.png";
+		  tween:  "busy-8.png";
 	       }
-	       fill.smooth : 0;
 	    }
 	 }
+      }
+      programs {
+	 program { name: "busy1";
+	    signal: "e,state,busy,on";
+	    source: "e";
+            action:  STATE_SET "visible" 0.0;
+	    transition: LINEAR 1.0;
+            target: "busy_clip";
+	 }
+         program { name: "busy_anim";
+	    signal: "e,state,busy,on";
+	    source: "e";
+	    action: STATE_SET "default" 0.0;
+	    transition: LINEAR 0.3333;
+	    target: "busy";
+	    after:  "busy_anim";
+	 }
+	 program { name: "busy2";
+	    signal: "e,state,busy,off";
+	    source: "e";
+            action:  STATE_SET "default" 0.0;
+	    transition: LINEAR 1.0;
+            target: "busy_clip";
+            after: "busy3";
+	 }
+	 program { name: "busy3";
+            action: ACTION_STOP;
+            target: "busy_anim";
+	 }
+      }
+   }
 
-	 part { name: "e.text.label";
-	    type: TEXT;
-	    effect: SHADOW;
+   group { name: "e/modules/everything/thumbview/item/thumb";
+       images {
+	   image: "e17_mini_button_shadow2.png" COMP;
+	   image: "everything_item_bg.png" COMP;
+       }
+       parts {
+	   part { name: "bg";
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "base";
+		       offset: -1 -3;
+		   }
+		   rel2 {
+		       to: "base";
+		       offset: 0 2;
+		   }
+		   fill.smooth: 0;
+		   image {
+		       normal: "everything_item_bg.png";
+		       border: 5 5 5 5;
+		   }
+		   color: 255 255 255 32;
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 128;
+	       }
+	   }
+	   part { name: "base";
+	       mouse_events:  0;
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset:   0   4;
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset:   -5  -5;
+		   }
+		   color: 255 255 255 0;
+	       }
+	       description { state: "visible" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+		   color: 255 255 255 255;
+	       }
+	   }
+	   part { name: "clip";
+	       mouse_events:  0;
+	       type: RECT;
+	       clip_to: "base";
+	       description { state: "default" 0.0;
+		   rel1.to: "base";
+		   rel2.to: "base";
+		   color: 235 235 235 255;
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 255;
+	       }
+	   }
+	   part { name: "e.swallow.icon";
+	       clip_to: "clip";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "base";
+		       relative: 0.0 0.0;
+		       offset:   2   0;
+		   }
+		   rel2 {
+		       to: "base";
+		       relative: 1.0 1.0;
+		       offset:   -3  -11;
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.thumb";
+	       clip_to: "clip";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "base";
+		       relative: 0.0 0.0;
+		       offset:   5   3;
+		   }
+		   rel2 {
+		       to: "base";
+		       relative: 1.0 1.0;
+		       offset:   -6  -13;
+		   }
+	       }
+	   }
+	   part { name: "e.text.label";
+	       type: TEXT;
+	       clip_to: "base";
+	       effect: SOFT_SHADOW;
+	       mouse_events: 0;
+	       scale: 1;
+	       description {
+		   state: "default" 0.0;
+		   rel1 {
+		       offset: 2 -12;
+		       relative: 0.0 1.0;
+		   }
+		   rel2.offset: -2 -4;
+		   color: 210 210 210 255;
+		   color3: 0 0 0 0;
+		   text {
+		       font: "Sans";
+		       size: 10;
+		       min: 0 1;
+		       align: 0.5 0.0;
+		   }
+	       }
+	   }
+       }
+       programs {
+	   program { name: "sel";
+	       signal:  "e,state,selected";
+	       source:  "e";
+	       action:  STATE_SET "selected" 0.0;
+	       /* transition: DECELERATE 0.; */
+	       target:  "bg";
+	       /* target:  "clip"; */
+	   }
+	   program { name: "unsel";
+	       signal:  "e,state,unselected";
+	       source:  "e";
+	       action:  STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.1;
+	       target:  "bg";
+	       /* target:  "clip"; */
+	   }
+	   program { name: "thumb_gen";
+	      signal:  "e,action,thumb,gen";
+	      source:  "e";
+	      action:  STATE_SET "default" 0.0;
+	       transition: DECELERATE 0.0;
+	       target:  "base";
+	       after: "thumb_ungen";	       
+	   }
+	   program { name: "thumb_ungen";
+	      signal:  "e,action,thumb,ungen";
+	      source:  "e";
+	      action:  STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.15;
+	       target:  "base";
+	   }
+	   program { name: "thumb_show_delayed";
+	      signal:  "e,action,thumb,show_delayed";
+	      source:  "e";
+	       action:  STATE_SET "default" 0.0;
+	       target:  "base";
+	       after: "thumb_show_delayed2";
+	   }
+	   program { name: "thumb_show_delayed2";
+	       action:  STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.3;
+	       target:  "base";
+	   }
+	   program { name: "thumb_show";
+	      signal:  "e,action,thumb,show";
+	      source:  "e";
+	       action:  STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.1;
+	       target:  "base";
+	   }	   
+       }
+   }
+
+   group { name: "e/modules/everything/thumbview/item/list";
+       images {
+	   image: "e17_mini_button_shadow2.png" COMP;
+	   image: "everything_item_bg.png" COMP;
+	   image: "icon_right_arrow.png" COMP;
+       }
+       parts {
+	   part { name: "bg";
+	       mouse_events: 0;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "base";
+		       offset: -1 -3;
+		   }
+		   rel2 {
+		       to: "base";
+		       offset: -2 2;
+		   }
+		   fill.smooth: 0;
+		   image {
+		       normal: "everything_item_bg.png";
+		       border: 5 5 5 5;
+		   }
+		   color: 255 255 255 32;
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 128;
+	       }
+	   }
+	   part { name: "base";
+	       mouse_events:  0;
+	       type: RECT;
+	       description { state: "default" 0.0;
+		   visible: 0;
+		   rel1 {
+		       relative: 0.0 0.0;
+		       offset:   0   3;
+		   }
+		   rel2 {
+		       relative: 1.0 1.0;
+		       offset:   -5  -4;
+		   }
+		   color: 255 255 255 0;
+	       }
+	       description { state: "visible" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+		   color: 255 255 255 255;
+	       }
+	   }
+	   part { name: "clip";
+	       mouse_events:  0;
+	       type: RECT;
+	       clip_to: "base";
+	       description { state: "default" 0.0;
+
+		   rel1 {
+		       to: "base";
+		       relative: 0.0 0.0;
+		       offset:   2   0;
+		   }
+		   rel2 {
+		       to: "base";
+		       relative: 0.0 1.0;
+		       offset:   36   -1;
+		   }
+		   
+		   color: 235 235 235 255;
+	       }
+	       description { state: "selected" 0.0;
+		   inherit: "default" 0.0;
+		   color: 255 255 255 255;
+	       }
+	   }
+	   part { name: "e.swallow.icon";
+	       clip_to: "clip";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "clip";
+		   }
+		   rel2 {
+		       to: "clip";
+		   }
+	       }
+	   }
+	   part { name: "e.swallow.thumb";
+	       clip_to: "clip";
+	       type: SWALLOW;
+	       description { state: "default" 0.0;
+		   rel1 {
+		       to: "clip";
+		   }
+		   rel2 {
+		       to: "clip";
+		   }
+	       }
+	   }
+	   part { name: "arrow";
+	       description {
+		   state: "default" 0.0;
+		   align: 0.0 0.5;
+		   aspect_preference: VERTICAL;
+		   visible: 0;
+		   rel1 {
+		       to: "base";
+		       relative: 1.0 0.0;
+		       offset:   -6  6;
+		   }
+		   rel2 {
+		       to: "base";
+		       relative: 1.0 1.0;
+		       offset:   1 -7;
+		   }
+		   image {
+		       normal: "icon_right_arrow.png";
+		   }
+	       }
+	       description {
+		   state: "visible" 0.0;
+		   inherit: "default" 0.0;
+		   visible: 1;
+		   max: 20 20;
+		   rel1 {
+		       to: "base";
+		       relative: 1.0 0.0;
+		       offset:   -21  6;
+		   }
+	       }
+	   }
+	   part { name: "e.text.label";
+	       type: TEXT;
+	       clip_to: "base";
+	       effect: SOFT_SHADOW;
+	       mouse_events: 0;
+	       scale: 1;
+	       description {
+		   state: "default" 0.0;
+		   rel1 {
+		       to_x: "clip";
+		       to_y: "base";
+		       offset: 5 6;
+		       relative: 1.0 0.5;
+		   }
+		   rel2 {
+		       relative: 0.0 0.5;
+		       offset: 4 -1;
+		       to_y: "base";
+		       to_x: "arrow";
+		   }
+		   
+		   color: 210 210 210 255;
+		   color3: 0 0 0 0;
+		   text {
+		       font: "Sans";
+		       size: 11;
+		       min: 0 1;
+		       align: 0.0 0.5;
+		   }
+	       }
+	   }
+       }
+       programs {
+	   program { name: "sel";
+	       signal:  "e,state,selected";
+	       source:  "e";
+	       action:  STATE_SET "selected" 0.0;
+	       target:  "bg";
+	       /* target:  "clip"; */
+	   }
+	   program { name: "unsel";
+	       signal:  "e,state,unselected";
+	       source:  "e";
+	       action:  STATE_SET "default" 0.0;
+	       transition: SINUSOIDAL 0.1;
+	       target:  "bg";
+	       /* target:  "clip"; */
+	   }
+	   program { name: "arrow_show";
+	       signal:  "e,state,browseable";
+	       source:  "e";
+	       action:  STATE_SET "visible" 0.0;
+	       /* transition: SINUSOIDAL 0.1; */
+	       target:  "arrow";
+	   }
+	   program { name: "thumb_gen";
+	      signal:  "e,action,thumb,gen";
+	      source:  "e";
+	      action:  STATE_SET "default" 0.0;
+	       transition: DECELERATE 0.0;
+	       target:  "base";
+	       after: "thumb_ungen";	       
+	   }
+	   program { name: "thumb_ungen";
+	      signal:  "e,action,thumb,ungen";
+	      source:  "e";
+	      action:  STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.15;
+	       target:  "base";
+	   }
+	   program { name: "thumb_show_delayed";
+	      signal:  "e,action,thumb,show_delayed";
+	      source:  "e";
+	       action:  STATE_SET "default" 0.0;
+	       target:  "base";
+	       after: "thumb_show_delayed2";
+	   }
+	   program { name: "thumb_show_delayed2";
+	       action:  STATE_SET "visible" 0.0;
+	       transition: SINUSOIDAL 0.3;
+	       target:  "base";
+	   }
+	   program { name: "thumb_show";
+	      signal:  "e,action,thumb,show";
+	      source:  "e";
+	       action:  STATE_SET "visible" 0.0;
+	       /* transition: SINUSOIDAL 0.1; */
+	       target:  "base";
+	   }	   
+       }
+   }
+
+   group { name: "e/modules/everything/thumbview/main/scrollframe";
+      images {
+	 image: "arrow_up.png" COMP;
+	 image: "arrow_down.png" COMP;
+	 image: "bt_sm_base1.png" COMP;
+	 image: "bt_sm_base2.png" COMP;
+	 image: "bt_sm_shine.png" COMP;
+	 image: "bt_sm_hilight.png" COMP;
+	 image: "sb_runnerv.png" COMP;
+      }
+      parts {
+//	 part { name: "clipper";
+//	    type: RECT;
+//	    mouse_events: 0;
+//	    description { state: "default" 0.0;
+//	    }
+//	 }
+	 part { name: "e.swallow.content"; 
+//	    clip_to: "clipper";
+	    type: SWALLOW;
+	    description { state: "default" 0.0;
+	       rel1.offset: 0 0;
+	       rel2 {
+		  relative: 0.0  1.0;
+		  offset:   2   -1;
+		  to_x: "sb_vbar";
+	       }
+	    }
+	 }
+	 part { name: "sb_vbar";
+	    type: RECT;
+	    mouse_events: 0;
 	    scale: 1;
 	    description { state: "default" 0.0;
-	       fixed: 0 1;
-	       align: 0.0 0.5;
+	       min: 7 17;
+	       align: 1.0 0.0;
 	       rel1 {
 		  relative: 1.0 0.0;
-		  offset:   4   8;
-		  to_x:     "e.swallow.icons";
+		  offset:   -1 0;
 	       }
 	       rel2 {
-		  relative: 1.0 0.0;
-		  offset:   -10  50;
-		  to_x:     "e.swallow.icons";
-	       }
-	       color: 255 255 255 255;
-	       color3: 0 0 0 64;
-	       text {
-		  font: "Sans:style=Bold";
-		  size: 14;
-		  align: 0.0 0.5;
-		  min: 1 1;
-		  text_class: "exebuf_command";
+		  relative: 1.0 1.0;
+		  offset:   -1 -1;
 	       }
 	    }
-	 }
-	 part { name:  "cursor";
-	    type:  RECT;
-	    mouse_events:  0;
-	    description { state: "default" 0.0;
-	       min: 1 18;
-	       max: 1 18;
-	       align: 0.0 0.5;
-	       fixed: 1 1;
+	    description { state: "hidden" 0.0;
+	       visible: 0;
+	       max: 0 99999;
 	       rel1 {
-		  relative: 1.0  0.0;
-		  offset:   1    0;
-		  to: "e.text.label";
+		  relative: 1.0 0.0;
+		  offset:   -1 0;
 	       }
 	       rel2 {
-		  relative: 1.0  1.0;
-		  offset:   1    -1;
-		  to: "e.text.label";
+		  relative: 1.0 1.0;
+		  offset:   -1 -1;
 	       }
-	       color: 255 255 255 220;
-	    }
-	    description { state:    "faded" 0.0;
-	       inherit:  "default" 0.0;
-	       color:    255 255 255 0;
 	    }
 	 }
-	 part { name: "e.swallow.icons";
-	    type: SWALLOW;
+	 part { name: "sb_vbar_base";
+	    type: RECT;
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
 	    description { state: "default" 0.0;
-	       min: 32 32;
-	       max: 32 32;
-	       align: 0.0 0.0;
+	       color: 0 0 0 0;
 	       rel1 {
-		  offset:  6  4;
-		  to: "bg";
+		  relative: 0.0  1.0;
+		  offset:   0	 -1;
+		  to:       "sb_vbar_a1";
 	       }
 	       rel2 {
-		  offset:   -7  -5;
-		  to: "bg";
+		  relative: 1.0  0.0;
+		  offset:   -1	 0;
+		  to:       "sb_vbar_a2";
 	       }
 	    }
 	 }
-	 part { name: "fg";
+	 part { name: "sb_vbar_runner";
+	    clip_to: "sb_vbar";
 	    mouse_events: 0;
 	    description { state: "default" 0.0;
-	       rel1.to: "bg";
-	       rel2.to: "bg";
+	       max: 3 99999;
+	       rel1.to:       "sb_vbar_base";
+	       rel1.offset:   -2 0;
+	       rel2.to:       "sb_vbar_base";
 	       image {
-		  normal: "menu_sel_fg.png";
-		  border: 8 8 5 9;
+		  normal: "sb_runnerv.png";
+		  border: 0 0 4 4;
 	       }
+	       fill.smooth: 0;
 	    }
 	 }
-      }
-      programs {
-	 program { name: "blink_off";
-	    signal:  "show";
-	    source:  "";
-	    action:  STATE_SET "faded" 0.0;
-	    transition: SINUSOIDAL 0.5;
-	    target:  "cursor";
-	    after:   "blink_on";
-	 }
-	 program { name: "blink_on";
-	    action:  STATE_SET "default" 0.0;
-	    transition: SINUSOIDAL 0.25;
-	    target:  "cursor";
-	    after:   "blink_off";
-	 }
-      }
-   }
-
-   group { name: "e/widgets/everything/item";
-      parts {
-	 part { name: "bg";
-	    mouse_events: 0;
+	 part { name: "sb_vbar_p1";
+	    type: RECT;
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
 	    description { state: "default" 0.0;
-	       visible: 0;
-	       color: 255 255 255 0;
-	       rel1.offset: -5 -3;
-	       rel2.offset: 4 5;
-	       image {
-		  normal: "menu_sel_bg.png";
-		  border: 8 8 5 9;
+	       color: 0 0 0 0;
+	       rel1 {
+		  relative: 0.0 1.0;
+		  to:       "sb_vbar_a1";
+	       }
+	       rel2 {
+		  relative: 1.0 0.0;
+		  to:       "e.dragable.vbar";
 	       }
 	    }
-	    description { state: "selected" 0.0;
-	       inherit: "default" 0.0;
-	       visible: 1;
-	       color: 255 255 255 255;
-	       rel1.offset: -2 0;
-	       rel2.offset: 1 2;
+	 }
+	 part { name: "sb_vbar_p2";
+	    type: RECT;
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
+	    description { state: "default" 0.0;
+	       color: 0 0 0 0;
+	       rel1 {
+		  relative: 0.0 1.0;
+		  to:       "e.dragable.vbar";
+	       }
+	       rel2 {
+		  relative: 1.0 0.0;
+		  to:       "sb_vbar_a2";
+	       }
 	    }
 	 }
-         part { name: "e.text.title";
-	    type: TEXT;
-	    effect: SOFT_SHADOW;
-            mouse_events: 0;
+	 part { name: "e.dragable.vbar";
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
 	    scale: 1;
-	    description {
-	       state: "default" 0.0;
+	    dragable {
+	       x: 0 0 0;
+	       y: 1 1 0;
+	       confine: "sb_vbar_base";
+	    }
+	    description { state: "default" 0.0;
+	       min: 7 17;
 	       rel1 {
-		  offset: 2 1;
-		  relative: 1.0 0.0;
-		  to_x: "e.swallow.icons";
+		  relative: 0.5  0.5;
+		  offset:   -1    0;
+		  to: "sb_vbar_base";
 	       }
-	       rel2.offset: -3 -2;
-	       color: 0 0 0 255;
-	       color3: 0 0 0 0;
-	       color_class: "menu_item";
-	       text {
-		  font: "Sans";
-		  size: 10;
-		  min: 0 1;
-		  align: 0.0 0.5;
-		  text_class: "menu_item";
+	       rel2 {
+		  relative: 0.5  0.5;
+		  offset:   -1    0;
+		  to: "sb_vbar_base";
+	       }
+	       image {
+		  normal: "bt_sm_base2.png";
+		  border: 6 6 6 6;
 	       }
 	    }
-	    description { state: "selected" 0.0;
+	    description { state: "clicked" 0.0;
 	       inherit: "default" 0.0;
-	       color: 255 255 255 255;
-	       color3: 0 0 0 64;
-	       color_class: "menu_item";
+	       image.normal: "bt_sm_base1.png";
 	    }
 	 }
-	 part {
-	    name: "e.swallow.icons";
-	    type: SWALLOW;
-	    description {
-	       state: "default" 0.0;
-	       max: 18 18;
-	       aspect: 1.0 1.0;
-	       align: 0.0 0.5;
-	       aspect_preference: VERTICAL;
-	       rel1 {
-		  relative: 0.0 0.0;
-		  offset:   3   1;
-	       }
-	       rel2 {
-		  relative: 0.0 1.0;
-		  offset:   -3   -2;
+	 part { name: "sb_vbar_over1";
+	    clip_to: "sb_vbar";
+	    mouse_events: 0;
+	    description { state: "default" 0.0;
+	       rel1.to: "e.dragable.vbar";
+	       rel2.relative: 1.0 0.5;
+	       rel2.to: "e.dragable.vbar";
+	       image {
+		  normal: "bt_sm_hilight.png";
+		  border: 6 6 6 0;
 	       }
 	    }
 	 }
-	 part { name: "fg";
+	 part { name: "sb_vbar_over2";
+	    clip_to: "sb_vbar";
 	    mouse_events: 0;
 	    description { state: "default" 0.0;
-	       visible: 0;
-	       color: 255 255 255 0;
-	       rel1.to: "bg";
-	       rel2.to: "bg";
+	       rel1.to: "e.dragable.vbar";
+	       rel2.to: "e.dragable.vbar";
 	       image {
-		  normal: "menu_sel_fg.png";
-		  border: 8 8 5 9;
+		  normal: "bt_sm_shine.png";
+		  border: 6 6 6 0;
 	       }
 	    }
-	    description { state: "selected" 0.0;
-	       inherit: "default" 0.0;
-	       visible: 1;
-	       color: 255 255 255 255;
+	 }
+
+	 part { name: "sb_vbar_a1";
+	    type: RECT;
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
+	    description { state: "default" 0.0;
+	       min: 7 17;
+	       align: 0.5 0.0;
+	       /* aspect: 1.0 1.0; */
+	       aspect_preference: HORIZONTAL;
+	       color: 0 0 0 0;
+	       rel1 { to: "sb_vbar";
+		  relative: 0.0  0.0;
+		  offset:   0    0;
+	       }
+	       rel2 { to: "sb_vbar";
+		  relative: 1.0  0.0;
+		  offset:   -1   0;
+	       }
 	    }
 	 }
-	 part {
-	    name:          "e.event.exebuf.item";
-	    type:          RECT;
-	    mouse_events:  1;
-	    description {
-	       state:    "default" 0.0;
-	       min:      14 14;
-	       visible:  1;
+	 part { name: "sb_vbar_a2";
+	    type: RECT;
+	    clip_to: "sb_vbar";
+	    mouse_events: 1;
+	    description { state: "default" 0.0;
+	       min: 7 17;
+	       align: 0.5 1.0;
+	       /* aspect: 1.0 1.0; */
+	       aspect_preference: HORIZONTAL;
 	       color: 0 0 0 0;
 	       rel1 {
-		  relative: 1.0  0.0;
-		  offset:   1    -1;
-		  to_x: "e.swallow.icons";
+		  to: "sb_vbar";
+		  relative: 0.0  1.0;
+		  offset:   0    0;
 	       }
 	       rel2 {
+		  to: "sb_vbar";
 		  relative: 1.0  1.0;
-		  offset:   -1   -1;
+		  offset:   -1   0;
 	       }
 	    }
 	 }
       }
       programs {
-	 program { name: "sel";
-	    signal: "e,state,selected";
+	 program { name: "sb_vbar_show";
+	    signal: "e,action,show,vbar";
 	    source: "e";
-	    action: STATE_SET "selected" 0.0;
-	    transition: LINEAR 0.2;
-	    target: "bg";
-	    target: "fg";
-	    target: "e.text.title";
+	    action:  STATE_SET "default" 0.0;
+	    target: "sb_vbar";
 	 }
-	 program { name: "unsel";
-	    signal: "e,state,unselected";
+	 program { name: "sb_vbar_hide";
+	    signal: "e,action,hide,vbar";
 	    source: "e";
-	    action: STATE_SET "default" 0.0;
-	    transition: LINEAR 0.1;
-	    target: "bg";
-	    target: "fg";
-	    target: "e.text.title";
+	    action:  STATE_SET "hidden" 0.0;
+	    target: "sb_vbar";
+	 }
+	 program { name: "sb_vbar_a1_down2";
+	    signal: "mouse,down,1";
+	    source: "sb_vbar_a1";
+	    action:  DRAG_VAL_STEP 0.0 -1.0;
+	    target: "e.dragable.vbar";
+	 }
+	 program { name: "sb_vbar_a2_down2";
+	    signal: "mouse,down,1";
+	    source: "sb_vbar_a2";
+	    action:  DRAG_VAL_STEP 0.0 1.0;
+	    target: "e.dragable.vbar";
+	 }
+	 program { name: "sb_vbar_p1_down";
+	    signal: "mouse,down,1";
+	    source: "sb_vbar_p1";
+	    action:  DRAG_VAL_PAGE 0.0 -1.0;
+	    target: "e.dragable.vbar";
+	 }
+	 program { name: "sb_vbar_p2_down";
+	    signal: "mouse,down,1";
+	    source: "sb_vbar_p2";
+	    action:  DRAG_VAL_PAGE  0.0 1.0;
+	    target: "e.dragable.vbar";
+	 }
+	 program { name: "sb_vbar_down";
+	    signal: "mouse,down,1";
+	    source: "e.dragable.vbar";
+	    action:  STATE_SET "clicked" 0.0;
+	    target: "e.dragable.vbar";
+	 }
+	 program { name: "sb_vbar_up";
+	    signal: "mouse,up,1";
+	    source: "e.dragable.vbar";
+	    action:  STATE_SET "default" 0.0;
+	    target: "e.dragable.vbar";
 	 }
       }
    }
-}
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 682c908..20b768a 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -249,6 +249,11 @@ dia_grad.png \
 dia_topshad.png \
 e17_fileman_thumb_bg.png \
 e17_mini_button_shadow2.png \
+everything_bar.png \
+everything_border.png \
+everything_box.png \
+everything_drop.png \
+everything_item_bg.png \
 exclam.png \
 frame_1.png \
 frame_2.png \
@@ -364,6 +369,7 @@ icon_mime_c.png \
 icon_mime_css.png \
 icon_mime_deb.png \
 icon_mime_doc.png \
+icon_mime_executable_generic.png \
 icon_mime_font_generic.png \
 icon_mime_h.png \
 icon_mime_html.png \
diff --git a/data/themes/images/Makefile.in b/data/themes/images/Makefile.in
index fbebac7..39e35a0 100644
--- a/data/themes/images/Makefile.in
+++ b/data/themes/images/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -307,6 +307,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -562,6 +563,11 @@ dia_grad.png \
 dia_topshad.png \
 e17_fileman_thumb_bg.png \
 e17_mini_button_shadow2.png \
+everything_bar.png \
+everything_border.png \
+everything_box.png \
+everything_drop.png \
+everything_item_bg.png \
 exclam.png \
 frame_1.png \
 frame_2.png \
@@ -677,6 +683,7 @@ icon_mime_c.png \
 icon_mime_css.png \
 icon_mime_deb.png \
 icon_mime_doc.png \
+icon_mime_executable_generic.png \
 icon_mime_font_generic.png \
 icon_mime_h.png \
 icon_mime_html.png \
@@ -887,8 +894,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/data/themes/images/everything_bar.png b/data/themes/images/everything_bar.png
new file mode 100644
index 0000000..e29f6b4
Binary files /dev/null and b/data/themes/images/everything_bar.png differ
diff --git a/data/themes/images/everything_border.png b/data/themes/images/everything_border.png
new file mode 100644
index 0000000..6493278
Binary files /dev/null and b/data/themes/images/everything_border.png differ
diff --git a/data/themes/images/everything_box.png b/data/themes/images/everything_box.png
new file mode 100644
index 0000000..f2b4990
Binary files /dev/null and b/data/themes/images/everything_box.png differ
diff --git a/data/themes/images/everything_drop.png b/data/themes/images/everything_drop.png
new file mode 100644
index 0000000..49b9a19
Binary files /dev/null and b/data/themes/images/everything_drop.png differ
diff --git a/data/themes/images/everything_item_bg.png b/data/themes/images/everything_item_bg.png
new file mode 100644
index 0000000..1bd167b
Binary files /dev/null and b/data/themes/images/everything_item_bg.png differ
diff --git a/data/themes/images/icon_mime_executable_generic.png b/data/themes/images/icon_mime_executable_generic.png
new file mode 100644
index 0000000..c9e16e5
Binary files /dev/null and b/data/themes/images/icon_mime_executable_generic.png differ
diff --git a/data/tools/Makefile.am b/data/tools/Makefile.am
new file mode 100644
index 0000000..c3d733f
--- /dev/null
+++ b/data/tools/Makefile.am
@@ -0,0 +1,8 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+enlightenment_remotedir = $(bindir)
+
+enlightenment_remote_SCRIPTS = enlightenment_remote
+
+EXTRA_DIST = enlightenment_remote
+
diff --git a/data/tools/Makefile.in b/data/tools/Makefile.in
new file mode 100644
index 0000000..e399c11
--- /dev/null
+++ b/data/tools/Makefile.in
@@ -0,0 +1,516 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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 = data/tools
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+am__installdirs = "$(DESTDIR)$(enlightenment_remotedir)"
+enlightenment_remoteSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(enlightenment_remote_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+enlightenment_remotedir = $(bindir)
+enlightenment_remote_SCRIPTS = enlightenment_remote
+EXTRA_DIST = enlightenment_remote
+all: all-am
+
+.SUFFIXES:
+$(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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/tools/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/tools/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
+install-enlightenment_remoteSCRIPTS: $(enlightenment_remote_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(enlightenment_remotedir)" || $(MKDIR_P) "$(DESTDIR)$(enlightenment_remotedir)"
+	@list='$(enlightenment_remote_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(enlightenment_remoteSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(enlightenment_remotedir)/$$f'"; \
+	    $(enlightenment_remoteSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(enlightenment_remotedir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-enlightenment_remoteSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(enlightenment_remote_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(enlightenment_remotedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(enlightenment_remotedir)/$$f"; \
+	done
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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 $(SCRIPTS)
+installdirs:
+	for dir in "$(DESTDIR)$(enlightenment_remotedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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 mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-enlightenment_remoteSCRIPTS
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-enlightenment_remoteSCRIPTS
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-enlightenment_remoteSCRIPTS install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-enlightenment_remoteSCRIPTS
+
+# 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/data/tools/enlightenment_remote b/data/tools/enlightenment_remote
new file mode 100644
index 0000000..1c3179b
--- /dev/null
+++ b/data/tools/enlightenment_remote
@@ -0,0 +1,523 @@
+#!/bin/bash
+#
+# See the function show_help_new_tool in order to know more about this tool
+
+
+#-------------------------------------------------------------------------------
+#   Show help
+#-------------------------------------------------------------------------------
+show_help(){
+   # Actual implemented features:
+echo -e "
+OPTIONS:
+  -h This help
+  -help This help
+  --help This help
+  --h This help
+  --help-new Info about this tool
+
+  -restart Restart Enlightenment
+  -exit Exit Enlightenment
+
+  -module-enable OPT1 Enable the module named 'OPT1'
+  -module-disable OPT1 Disable the module named 'OPT1'
+  -module-load OPT1 Loads the module named 'OPT1' into memory
+  -module-unload OPT1 Unloads the module named 'OPT1' from memory
+
+  -profile-list List all existing profiles
+  -profile-add OPT1 Add profile named OPT1
+  -profile-del OPT1 Delete profile named OPT1
+  -default-profile-get Get the default configuration profile
+  -default-profile-set OPT1 Set the default configuration profile to OPT1
+
+
+Note: This is a new implementation of enlightenment_remote,
+      for more information about it see the '--help-new' option.
+"
+# List of available features: qdbus org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject
+}
+
+
+#-------------------------------------------------------------------------------
+#   Show info about the new implementation of enlightenment_remote
+#-------------------------------------------------------------------------------
+show_help_new_tool(){
+   echo -e "
+This is a new implementation of enlightenment_remote, it uses dbus calls to
+enlightenment so it is using the new system, this tool is a front-end just like
+the original tool, created for the ease-to-use of the users and in order to
+maintain a bit of compatibility with possible scripts from the users too.
+
+The original tool is not (at the date of today) not removed and you can still
+have access to it, it is renamed to enlightenment_remote_old
+
+This tool depends of the command dbus-send, normally included in the main 
+dbus package
+
+This tool is just a front-end and may be not updated, you should
+use dbus calls instead
+
+If you want to see the list of actual dbus calls available for Enlightenment,
+run: qdbus org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject
+"
+}
+
+
+#===  FUNCTION  ================================================================
+#          NAME:  ERC
+#   DESCRIPTION:  eremote callback
+#    PARAMETERS:  interface/method call
+#       RETURNS:  
+#===============================================================================
+ERC(){
+   dbus-send --print-reply=literal --dest=org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject "$1"
+}
+
+#===  FUNCTION  ================================================================
+#          NAME:  ERCS
+#   DESCRIPTION:  eremote call with string parameter
+#    PARAMETERS:  interface/method call, string parameter
+#       RETURNS:  
+#===============================================================================
+ERCS(){
+   dbus-send --print-reply=literal --dest=org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject "$1" string:"$2"
+}
+
+#===  FUNCTION  ================================================================
+#          NAME:  ERGS 
+#   DESCRIPTION:  Get a (single) value (string)
+#    PARAMETERS:  interface/method call
+#       RETURNS:  value (string)
+#===============================================================================
+ERGS(){
+   result="$( dbus-send --print-reply=literal --dest=org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject "$1" )"
+   echo $result
+   unset result
+}
+
+#===  FUNCTION  ================================================================
+#          NAME:  ERGM
+#   DESCRIPTION:  Get a (multiple) values (string)
+#    PARAMETERS:  interface/method call
+#       RETURNS:  values (string)
+#===============================================================================
+ERGM(){
+   result="$( dbus-send --print-reply=literal --dest=org.enlightenment.wm.service /org/enlightenment/wm/RemoteObject "$1" )"
+   result="${result##*[}"
+   result="${result%%]*}"
+   for value in $result
+   do
+      echo -n "$value "
+   done
+   echo ""
+   unset result value
+}
+
+
+
+#-------------------------------------------------------------------------------
+#   E Restart
+#-------------------------------------------------------------------------------
+er_restart(){
+   ERC org.enlightenment.wm.Core.Restart
+   sleep 6
+}
+
+#-------------------------------------------------------------------------------
+#   E Logout
+#-------------------------------------------------------------------------------
+er_exit(){
+   ERC org.enlightenment.wm.Core.Shutdown
+}
+
+#-------------------------------------------------------------------------------
+#   E Module Disable
+#-------------------------------------------------------------------------------
+er_module_disable(){
+   ERCS org.enlightenment.wm.Module.Disable "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Module Enable
+#-------------------------------------------------------------------------------
+er_module_enable(){
+   ERCS org.enlightenment.wm.Module.Enable "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Module Load
+#-------------------------------------------------------------------------------
+er_module_load(){
+   ERCS org.enlightenment.wm.Module.Load "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Module Unload
+#-------------------------------------------------------------------------------
+er_module_unload(){
+   ERCS org.enlightenment.wm.Module.Unload "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Profile Add
+#-------------------------------------------------------------------------------
+er_profile_add(){
+   ERCS org.enlightenment.wm.Profile.Add "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Profile Delete
+#-------------------------------------------------------------------------------
+er_profile_del(){
+   ERCS org.enlightenment.wm.Profile.Delete "$2"
+}
+
+#-------------------------------------------------------------------------------
+#   E Profile List
+#-------------------------------------------------------------------------------
+er_profile_list(){
+   ERGM org.enlightenment.wm.Profile.List
+}
+
+#-------------------------------------------------------------------------------
+#   E Profile Get
+#-------------------------------------------------------------------------------
+er_default_profile_get(){
+   ERGS org.enlightenment.wm.Profile.Get
+}
+
+
+#-------------------------------------------------------------------------------
+#   E Profile Set
+#-------------------------------------------------------------------------------
+er_default_profile_set(){
+   ERCS org.enlightenment.wm.Profile.Set "$2"
+}
+
+
+
+
+
+
+#===  FUNCTION  ================================================================
+#          NAME:  Main
+#   DESCRIPTION:  We start there and go to the desired option
+#    PARAMETERS:  get options and use them
+#       RETURNS:  just finishes and exit
+#===============================================================================
+
+for dir in $( echo $PATH | tr ':' ' ' )
+do
+   test -x ${dir}/dbus-send && dbus_send_found=yes
+done
+if [[ "$dbus_send_found" != "yes" ]] ; then
+   echo "E: dbus-send command not found, please install it first"
+   exit 1
+fi
+
+case "$1" in
+   --help-new)
+      show_help_new_tool
+   ;;
+   -restart)
+      er_restart
+   ;;
+   -exit)
+      er_exit 
+   ;;
+   -module-enable)
+      er_module_enable "$@"
+   ;;
+   -module-disable)
+      er_module_disable "$@"
+   ;;
+   -module-load)
+      er_module_load "$@"
+   ;;
+   -module-unload)
+      er_module_unload "$@"
+   ;;
+   -profile-add)
+      er_profile_add "$@"
+   ;;
+   -profile-del)
+      er_profile_del "$@"
+   ;;
+   -profile-list)
+      er_profile_list
+   ;;
+   -default-profile-get)
+      er_default_profile_get
+   ;;
+   -default-profile-set)
+      er_default_profile_set "$@"
+   ;;
+
+
+   # This entry needs to be allways the last option of the list (*)
+   -h|-help|--help|--h|*)
+      show_help
+   ;;
+esac
+
+
+################################################################################
+################################################################################
+################################################################################
+ignore_this(){
+# IGNORE THIS SECTION
+# think at it just like as a TODO list or a list where are listed all the old options of enlightenmen_remote
+# Remember that the elements of this next list are removed everytime they are implemented on this tool
+
+echo "
+  -module-list List all loaded modules
+  -default-bg-set OPT1 Set the default background edje to the desktop background in the file 'OPT1' (must be a full path)
+  -default-bg-get Get the default background edje file path
+  -font-available-list List all available fonts
+  -font-apply Apply font settings changes
+  -font-fallback-append OPT1 Append OPT1 to the fontset
+  -font-fallback-prepend OPT1 Prepend OPT1 to the fontset
+  -font-fallback-list List the fallback fonts in order
+  -font-fallback-remove OPT1 Remove OPT1 from the fontset
+  -font-default-set OPT1 OPT2 OPT3 Set textclass (OPT1) font (OPT2) and size (OPT3)
+  -font-default-get OPT1 List the default font associated with OPT1
+  -font-default-remove OPT1 Remove the default text class OPT1
+  -font-default-list List all configured text classes
+  -font-fallback-clear Clear list of fallback fonts
+  -lang-list List all available languages
+  -lang-set OPT1 Set the current language to 'OPT1'
+  -lang-get Get the current language
+  -dirs-list OPT1 List the directory of type specified by 'OPT1', try 'themes'
+  -dirs-list-append OPT1 OPT2 Append the directory of type specified by 'OPT2' to the list in 'OPT1'
+  -dirs-list-prepend OPT1 OPT2 Prepend the directory of type specified by 'OPT2' to the list in 'OPT1'
+  -dirs-list-remove OPT1 OPT2 Remove the directory of type specified by 'OPT2' from the list in 'OPT1'
+  -framerate-set OPT1 Set the animation framerate (fps)
+  -framerate-get Get the animation framerate (fps)
+  -menus-scroll-speed-set OPT1 Set the scroll speed of menus (pixels/sec)
+  -menus-scroll-speed-get Get the scroll speed of menus (pixels/sec)
+  -focus-policy-set OPT1 Set the focus policy. OPT1 = CLICK, MOUSE or SLOPPY
+  -focus-policy-get Get focus policy
+  -edge-flip-dragging-set OPT1 Set the edge flip while dragging policy flag (0/1)
+  -edge-flip-dragging-get Get the edge flip while dragging policy flag
+  -font-cache-set OPT1 Set the font cache size (Kb)
+  -font-cache-get Get the speculative font cache size (Kb)
+  -image-cache-set OPT1 Set the image cache size (Kb)
+  -image-cache-get Get the speculative image cache size (Kb)
+  -edje-cache-set OPT1 Set the edje cache size (items)
+  -edje-cache-get Get the speculative edje cache size (items)
+  -edje-collection-cache-set OPT1 Set the edje collection cache size (items)
+  -edje-collection-cache-get Get the speculative edje collection cache size (items)
+  -menus-fast-move-threshold-set OPT1 Set the mouse speed (pixels/second) that is considered a 'fast move'
+  -menus-fast-move-threshold-get Get the mouse speed (pixels/second) that is considered a 'fast move'
+  -menus-click-drag-timeout-set OPT1 Set the time (in sec) between a mouse press and release that will keep the menu up anyway
+  -menus-click-drag-timeout-get Get the time (in sec) between a mouse press and release that will keep the menu up anyway
+  -border-shade-animate-set OPT1 Set the shading animation flag (0/1)
+  -border-shade-animate-get Get the shading animation flag (0/1)
+  -border-shade-transition-set OPT1 Set the shading animation algorithm (0, 1, 2 or 3)
+  -border-shade-transition-get Get the shading animation algorithm (0, 1, 2 or 3)
+  -border-shade-speed-set OPT1 Set the shading speed (pixels/sec)
+  -border-shade-speed-get Get the shading speed (pixels/sec)
+  -desks-set OPT1 OPT2 Set the number of virtual desktops (X x Y desks OPT1 = X, OPT2 = Y)
+  -desks-get Get the number of virtual desktops
+  -maximize-policy-set OPT1 Set the maximize policy. OPT1 = FULLSCREEN, SMART, EXPAND or FILL
+  -maximize-policy-get Get maximize policy
+  -maximize-manipulation-set OPT1 Allow manipulation, 1 for enabled 0 for disabled
+  -maximize-manipulation-get Get manipulation, 1 for enabled 0 for disabled
+  -binding-mouse-list List all mouse bindings
+  -binding-mouse-add OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 Add an existing mouse binding. OPT1 = Context, OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters
+  -binding-mouse-del OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 Delete an existing mouse binding. OPT1 = Context, OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters
+  -binding-key-list List all key bindings
+  -binding-key-add OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 Add an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters
+  -binding-key-del OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 Delete an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters
+  -always-click-to-raise-set OPT1 Set the always click to raise policy, 1 for enabled 0 for disabled
+  -always-click-to-raise-get Get the always click to raise policy, 1 for enabled 0 for disabled
+  -always-click-to-focus-set OPT1 Set the always click to focus policy, 1 for enabled 0 for disabled
+  -always-click-to-focus-get Get the always click to focus policy, 1 for enabled 0 for disabled
+  -use-auto-raise-set OPT1 Set use auto raise policy, 1 for enabled 0 for disabled
+  -use-auto-raise-get Get use auto raise policy, 1 for enabled 0 for disabled
+  -pass-click-on-set OPT1 Set pass click on policy, 1 for enabled 0 for disabled
+  -pass-click-on-get Get pass click on policy, 1 for enabled 0 for disabled
+  -auto-raise-delay-set OPT1 Set the auto raise delay (Seconds)
+  -auto-raise-delay-get Get the auto raise delay  (Seconds)
+  -use-resist-set OPT1 Set resist policy, 1 for enabled 0 for disabled
+  -use-resist-get Get use resist policy, 1 for enabled 0 for disabled
+  -drag-resist-set OPT1 Set drag resist threshold (0-100)
+  -drag-resist-get Get drag resist threshold
+  -desk-resist-set OPT1 Set desktop resist threshold (0-100)
+  -desk-resist-get Get desktop resist threshold
+  -window-resist-set OPT1 Set window resist threshold (0-100)
+  -window-resist-get Get window resist threshold
+  -gadget-resist-set OPT1 Set gadget resist threshold (0-100)
+  -gadget-resist-get Get gadget resist threshold
+  -desktop-bg-add OPT1 OPT2 OPT3 OPT4 OPT5 Add a desktop bg definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y. OPT5 = bg file path
+  -desktop-bg-del OPT1 OPT2 OPT3 OPT4 Delete a desktop bg definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y.
+  -desktop-bg-list List all current desktop bg definitions
+  -winlist-warp-while-selecting-set OPT1 Set winlist (alt+tab) warp while selecting policy
+  -winlist-warp-while-selecting-get Get winlist (alt+tab) warp while selecting policy
+  -winlist-warp-at-end-set OPT1 Set winlist (alt+tab) warp at end policy
+  -winlist-warp-at-end-get Get winlist (alt+tab) warp at end policy
+  -winlist-warp-speed-set OPT1 Set winlist warp speed (0.0-1.0)
+  -winlist-warp-speed-get Get winlist warp speed
+  -winlist-scroll-animate-set OPT1 Set winlist (alt+tab) scroll animate policy
+  -winlist-scroll-animate-get Get winlist (alt+tab) scroll animate policy
+  -winlist-scroll-speed-set OPT1 Set winlist scroll speed (0.0-1.0)
+  -winlist-scroll-speed-get Get winlist scroll speed
+  -winlist-list-show-iconified-set OPT1 Set whether winlist (alt+tab) will show iconfied windows
+  -winlist-list-show-iconified-get Get whether winlist (alt+tab) will show iconfied windows
+  -winlist-list-show-other-desk-iconified-set OPT1 Set whether winlist (alt+tab) will show iconfied windows from other desks
+  -winlist-list-show-other-desk-iconified-get Get whether winlist (alt+tab) will show iconfied windows from other desks
+  -winlist-list-show-other-screen-iconified-set OPT1 Set whether winlist (alt+tab) will show iconfied windows from other screens
+  -winlist-list-show-other-screen-iconified-get Get whether winlist (alt+tab) will show iconfied windows from other screens
+  -winlist-list-show-other-desk-windows-set OPT1 Set whether winlist (alt+tab) will show other desk windows
+  -winlist-list-show-other-desk-windows-get Get winlist (alt+tab) show other desk windows
+  -winlist-list-show-other-screen-windows-set OPT1 Set winlist (alt+tab) show other screen windows policy
+  -winlist-list-show-other-screen-windows-get Get winlist (alt+tab) show other screen windows policy
+  -winlist-list-uncover-while-selecting-set OPT1 Set whether winlist (alt+tab) will show iconified windows while selecting
+  -winlist-list-uncover-while-selecting-get Get whether winlist (alt+tab) will show iconified windows while selecting
+  -winlist-list-jump-desk-while-selecting-set OPT1 Set winlist (alt+tab) jump desk while selecting policy
+  -winlist-list-jump-desk-while-selecting-get Get winlist (alt+tab) jump desk while selecting policy
+  -winlist-pos-align-x-set OPT1 Set winlist position align for x axis (0.0-1.0)
+  -winlist-pos-align-x-get Get winlist position align for x axis
+  -winlist-pos-align-y-set OPT1 Set winlist position align for y axis (0.0-1.0)
+  -winlist-pos-align-y-get Get winlist position align for y axis
+  -winlist-pos-size-w-set OPT1 Set winlist position size width (0.0-1.0)
+  -winlist-pos-size-w-get Get winlist position size width
+  -winlist-pos-size-h-set OPT1 Set winlist position size height (0.0-1.0)
+  -winlist-pos-size-h-get Get winlist position size height
+  -winlist-pos-min-w-set OPT1 Set winlist (alt+tab) minimum width
+  -winlist-pos-min-w-get Get winlist (alt+tab) minimum width
+  -winlist-pos-min-h-set OPT1 Set winlist (alt+tab) minimum height
+  -winlist-pos-min-h-get Get winlist (alt+tab) minimum height
+  -winlist-pos-max-w-set OPT1 Set winlist (alt+tab) maximum width
+  -winlist-pos-max-w-get Get winlist (alt+tab) maximum width
+  -winlist-pos-max-h-set OPT1 Set winlist (alt+tab) maximum height
+  -winlist-pos-max-h-get Get winlist (alt+tab) maximum height
+  -kill-if-close-not-possible-set OPT1 Set whether E should kill an application if it can not close
+  -kill-if-close-not-possible-get Get whether E should kill an application if it can not close
+  -kill-process-set OPT1 Set whether E should kill the process directly or through x
+  -kill-process-get Get whether E should kill the process directly or through x
+  -kill-timer-wait-set OPT1 Set interval to wait before killing client (0.0-120.0)
+  -kill-timer-wait-get Get interval to wait before killing client
+  -ping-clients-set OPT1 Set whether E should ping clients
+  -ping-clients-get Get whether E should ping clients
+  -transition-start-set OPT1 Get the background transition used when E starts
+  -transition-start-get Get the background transition used when E starts
+  -transition-desk-set OPT1 Set the transition used when switching desktops
+  -transition-desk-get Get the transition used when switching desktops
+  -transition-change-set OPT1 Set the transition used when changing backgrounds
+  -transition-change-get Get the transition used when changing backgrounds
+  -focus-setting-set OPT1 Set the focus setting policy ("NONE", "NEW_WINDOW", "NEW_DIALOG", "NEW_DIALOG_IF_OWNER_FOCUSED")
+  -focus-setting-get Get the focus setting policy
+  -exec-action OPT1 OPT2 Executes an action given the name (OPT1) and a string of parameters (OPT2).
+  -theme-list List themes and associated categories
+  -theme-set OPT1 OPT2 Set theme category (OPT1) and edje file (OPT2)
+  -theme-get OPT1 List the theme associated with the category OPT1
+  -theme-remove OPT1 Remove the theme category OPT1
+  -move-info-follows-set OPT1 Set whether the move dialog should follow the client window
+  -move-info-follows-get Get whether the move dialog should follow the client window
+  -resize-info-follows-set OPT1 Set whether the resize dialog should follow the client window
+  -resize-info-follows-get Set whether the resize dialog should follow the client window
+  -move-info-visible-set OPT1 Set whether the move dialog should be visible
+  -move-info-visible-get Get whether the move dialog should be visible
+  -resize-info-visible-set OPT1 Set whether the resize dialog should be visible
+  -resize-info-visible-get Set whether the resize dialog should be visible
+  -focus-last-focused-per-desktop-set OPT1 Set whether E should remember focused windows when switching desks
+  -focus-last-focused-per-desktop-get Get whether E should remember focused windows when switching desks
+  -focus-revert-on-hide-or-close-set OPT1 Set whether E will focus the last focused window when you hide or close a focused window
+  -focus-revert-on-hide-or-close-get Get whether E will focus the last focused window when you hide or close a focused window
+  -desktop-name-add OPT1 OPT2 OPT3 OPT4 OPT5 Add a desktop name definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y. OPT5 = desktop name
+  -desktop-name-del OPT1 OPT2 OPT3 OPT4 Delete a desktop name definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y.
+  -desktop-name-list List all current desktop name definitions
+  -cursor-size-set OPT1 Set the E cursor size
+  -cursor-size-get Get the E cursor size
+  -use-e-cursor-set OPT1 Set whether E's cursor should be used
+  -use-e-cursor-get Get whether E's cursor should be used
+  -menu-autoscroll-margin-set OPT1 Set the distance from the edge of the screen the menu will autoscroll to
+  -menu-autoscroll-margin-get Get the distance from the edge of the screen the menu will autoscroll to
+  -menu-autoscroll-cursor-margin-set OPT1 Set the distance from the edge of the screen the cursor needs to be to start menu autoscrolling
+  -menu-autoscroll-cursor-margin-get Get the distance from the edge of the screen the cursor needs to be to start menu autoscrolling
+  -transient-move-set OPT1 Set if transients should move with it's parent
+  -transient-move-get Get if transients should move with it's parent
+  -transient-resize-set OPT1 Set if transients should move when it's parent resizes
+  -transient-resize-get Get if transients should move when it's parent resizes
+  -transient-raise-set OPT1 Set if transients should raise with it's parent
+  -transient-raise-get Get if transients should raise with it's parent
+  -transient-lower-set OPT1 Set if transients should lower with it's parent
+  -transient-lower-get Get if transients should lower with it's parent
+  -transient-layer-set OPT1 Set if transients should change layer with it's parent
+  -transient-layer-get Get if transients should change layer with it's parent
+  -transient-desktop-set OPT1 Set if transients should change desktop with it's parent
+  -transient-desktop-get Get if transients should change desktop with it's parent
+  -transient-iconify-set OPT1 Set if transients should iconify with it's parent
+  -transient-iconify-get Get if transients should iconify with it's parent
+  -modal-windows-set OPT1 Set if enlightenment should honour modal windows
+  -modal-windows-get Get if enlightenment should honour modal windows
+  -input-method-list List all available input methods
+  -input-method-set OPT1 Set the current input method to 'OPT1'
+  -input-method-get Get the current input method
+  -window-placement-policy-set OPT1 Set the window placement policy. OPT1 = SMART, ANTIGADGET, CURSOR or MANUAL
+  -window-placement-policy-get Get window placement policy
+  -binding-signal-list List all signal bindings
+  -binding-signal-add OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 OPT7 Add an existing signal binding. OPT1 = Context, OPT2 = signal, OPT3 = source, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters
+  -binding-signal-del OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 OPT7 Delete an existing signal binding. OPT1 = Context, OPT2 = signal, OPT3 = source, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters
+  -binding-wheel-list List all wheel bindings
+  -binding-wheel-add OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 OPT7 Add an existing wheel binding. OPT1 = Context, OPT2 = direction, OPT3 = z, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters
+  -binding-wheel-del OPT1 OPT2 OPT3 OPT4 OPT5 OPT6 OPT7 Delete an existing wheel binding. OPT1 = Context, OPT2 = direction, OPT3 = z, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters
+  -winlist-list-focus-while-selecting-set OPT1 Set winlist (alt+tab) focus while selecting policy
+  -winlist-list-focus-while-selecting-get Get winlist (alt+tab) focus while selecting policy
+  -winlist-list-raise-while-selecting-set OPT1 Set winlist (alt+tab) raise while selecting policy
+  -winlist-list-raise-while-selecting-get Get winlist (alt+tab) raise while selecting policy
+  -theme-category-list List all available theme categories
+  -transition-list List all available transitions
+  -action-list List all available actions
+  -default-engine-set OPT1 Set the default rendering engine to OPT1 (SOFTWARE, SOFTWARE_16 or XRENDER)
+  -default-engine-get Get the default rendering engine
+  -engine-list List all existing rendering engines
+  -engine-set OPT1 OPT2 Set the rendering engine for OPT1 to OPT2 (SOFTWARE or XRENDER)
+  -engine-get OPT1 Get the rendering engine for OPT1
+  -menu-eap-name-show-set OPT1 Set whether to show eapps' name field in menus
+  -menu-eap-name-show-get Get whether eapps' name field is shown in menus
+  -menu-eap-generic-show-set OPT1 Set whether to show eapps' generic field in menus
+  -menu-eap-generic-show-get Get whether eapps' generic field is shown in menus
+  -menu-eap-comment-show-set OPT1 Set whether to show eapps' comment field in menus
+  -menu-eap-comment-show-get Get whether eapps' comment field is shown in menus
+  -fullscreen-policy-set OPT1 Set the fullscreen policy. OPT1 = RESIZE or ZOOM
+  -fullscreen-policy-get Get fullscreen policy
+  -color-class-color-set OPT1 OPT2 OPT3 OPT4 OPT5 Set color_class (OPT1) r, g, b, a (OPT2-5)
+  -color-class-color2-set OPT1 OPT2 OPT3 OPT4 OPT5 Set color_class (OPT1) color2 r, g, b, a (OPT2-5)
+  -color-class-color3-set OPT1 OPT2 OPT3 OPT4 OPT5 Set color_class (OPT1) color3 r, g, b, a (OPT2-5)
+  -color-class-color-list List color values for all set color classes
+  -color-class-color2-list List color2 values for all set color classes
+  -color-class-color3-list List color3 values for all set color classes
+  -color-class-del OPT1 Delete color class named OPT1
+  -color-class-list List all color classes used by currently loaded edje objects
+  -cfgdlg-auto-apply-set OPT1 Set config dialogs to use auto apply, 1 for enabled 0 for disabled
+  -cfgdlg-auto-apply-get Get config dialogs use auto apply policy, 1 for enabled 0 for disabled
+  -cfgdlg-default-mode-set OPT1 Set default mode for config dialogs. OPT1 = BASIC or ADVANCED
+  -cfgdlg-default-mode-get Get default mode for config dialogs
+  -lock-desktop Locks the desktop
+  -init-set OPT1 Set edje file (OPT1) to use for init screen
+  -init-get Get the current edje file for init screen
+  -font-hinting-set OPT1 Set font hinting method to use, 0 = Bytecode, 1 = Auto, 2 = None
+  -font-hinting-get Get font hinting method
+  -use-composite-set OPT1 Set whether composite should be used
+  -use-composite-get Get whether composite should be used
+  -remember-internal-windows-set OPT1 Set whether internal windows should be remembered
+  -remember-internal-windows-get Get whether internal windows are remembered
+  -logout Logout your user
+  -hibernate Hibernate the computer
+  -reboot Reboot the computer
+  -suspend Suspend the computer
+  -shutdown Halt (shutdown) the computer
+  -desklock-use-custom-desklock-set OPT1 Set whether a custom desklock will be utilized
+  -desklock-use-custom-desklock-get Get whether a custom desklock is being used
+  -desklock-custom-desklock-cmd-set OPT1 Set the current custom desklock command to OPT1
+  -desklock-custom-desklock-cmd-get Get the current custom desklock command
+"
+}
+
+
+
+
+
+
diff --git a/data/xsession/Makefile.in b/data/xsession/Makefile.in
index e2b089f..18f77df 100644
--- a/data/xsession/Makefile.in
+++ b/data/xsession/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -318,6 +318,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -333,8 +334,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index dcd8ccf..dd6c532 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -337,8 +338,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/enlightenment.pc b/enlightenment.pc
index 677ff6e..895c2e3 100644
--- a/enlightenment.pc
+++ b/enlightenment.pc
@@ -4,12 +4,12 @@ libdir=${exec_prefix}/lib
 includedir=${prefix}/include/enlightenment
 modules=${exec_prefix}/lib/enlightenment/modules
 config_apps=/usr/local/share/enlightenment/config-apps
-release=ver-svn-03
+release=ver-svn-05
 
 Name: enlightenment
 Description: Enlightenmnt Window Manager
 Requires: evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime eina-0 edbus ehal
-Version: 0.16.999.062
+Version: 0.16.999.063
 Libs: -L${libdir}
 Libs.private: 
 Cflags: -I${includedir} -DUSE_E_CONFIG_H
diff --git a/enlightenment.spec b/enlightenment.spec
index 03fdf71..18c5f23 100644
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,6 +1,6 @@
 Summary: The Enlightenment window manager
 Name: enlightenment
-Version: 0.16.999.062
+Version: 0.16.999.063
 Release: 0.%(date '+%Y%m%d')
 License: BSD
 Group: User Interface/Desktops
diff --git a/ltmain.sh b/ltmain.sh
index 6d056ec..b612e9a 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,6 +1,6 @@
 # Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.4
+# ltmain.sh (GNU libtool) 2.2.6
 # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.4 Debian-2.2.4-0ubuntu4
+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,9 +73,9 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.4 Debian-2.2.4-0ubuntu4"
+VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
 TIMESTAMP=""
-package_revision=1.2976
+package_revision=1.3012
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -805,7 +805,7 @@ func_enable_tag ()
 
 
   case $host in
-    *cygwin* | *mingw* | *pw32*)
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
       # don't eliminate duplications in $postdeps and $predeps
       opt_duplicate_compiler_generated_deps=:
       ;;
@@ -893,8 +893,9 @@ $opt_help || {
 # determined imposters.
 func_lalib_p ()
 {
-    $SED -e 4q "$1" 2>/dev/null \
-      | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 }
 
 # func_lalib_unsafe_p file
@@ -907,7 +908,7 @@ func_lalib_p ()
 func_lalib_unsafe_p ()
 {
     lalib_p=no
-    if test -r "$1" && exec 5<&0 <"$1"; then
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
 	for lalib_p_l in 1 2 3 4
 	do
 	    read lalib_p_line
@@ -1275,7 +1276,7 @@ func_mode_compile ()
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -2046,7 +2047,7 @@ func_mode_install ()
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
-	  cygwin* | mingw* | pw32*)
+	  cygwin* | mingw* | pw32* | cegcc*)
 	    case $realname in
 	    *.dll.a)
 	      tstripme=""
@@ -2152,7 +2153,7 @@ func_mode_install ()
 
 	# Do a test to see if this is really a libtool program.
 	case $host in
-	*cygwin*|*mingw*)
+	*cygwin* | *mingw*)
 	    if func_ltwrapper_executable_p "$file"; then
 	      func_ltwrapper_scriptname "$file"
 	      wrapper=$func_ltwrapper_scriptname_result
@@ -2358,7 +2359,7 @@ extern \"C\" {
 	      $RM $export_symbols
 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	      case $host in
-	      *cygwin* | *mingw* )
+	      *cygwin* | *mingw* | *cegcc* )
                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
 	        ;;
@@ -2370,7 +2371,7 @@ extern \"C\" {
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* )
+	        *cygwin | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2426,7 +2427,7 @@ typedef struct {
 } lt_dlsymlist;
 "
 	  case $host in
-	  *cygwin* | *mingw* )
+	  *cygwin* | *mingw* | *cegcc* )
 	    $ECHO >> "$output_objdir/$my_dlsyms" "\
 /* DATA imports from DLLs on WIN32 con't be const, because
    runtime relocations are performed -- see ld's documentation
@@ -2512,7 +2513,7 @@ static const void *lt_preloaded_setup() {
 	# Transform the symbol file into the correct name.
 	symfileobj="$output_objdir/${my_outputname}S.$objext"
 	case $host in
-	*cygwin* | *mingw* )
+	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
 	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -2691,25 +2692,16 @@ func_extract_archives ()
 
 
 
-# func_emit_wrapper arg
+# func_emit_wrapper_part1 [arg=no]
 #
-# emit a libtool wrapper script on stdout
-# don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variable
-# set therein.
-#
-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the '.lib' directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
 {
-	func_emit_wrapper_arg1=no
+	func_emit_wrapper_part1_arg1=no
 	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
+	  func_emit_wrapper_part1_arg1=$1
 	fi
 
 	$ECHO "\
@@ -2794,10 +2786,27 @@ else
     file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
     file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
   done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2888,7 +2897,7 @@ else
 "
 	case $host in
 	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
+	*-*-mingw | *-*-os2* | *-cegcc*)
 	  $ECHO "\
       exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
@@ -2914,7 +2923,207 @@ else
 fi\
 "
 }
-# end: func_emit_wrapper
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -2951,6 +3160,12 @@ EOF
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3057,29 +3272,105 @@ int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
 void lt_fatal (const char *message, ...);
-
-static const char *script_text =
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
 EOF
 
-	    func_emit_wrapper yes |
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+	    func_emit_wrapper_part2 yes |
 	        $SED -e 's/\([\\"]\)/\\\1/g' \
 	             -e 's/^/  "/' -e 's/$/\\n"/'
 	    echo ";"
 
 	    cat <<EOF
 const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
 
 int
 main (int argc, char *argv[])
 {
   char **newargz;
+  int  newargc;
   char *tmp_pathspec;
   char *actual_cwrapper_path;
-  char *shwrapper_name;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
   intptr_t rval = 127;
-  FILE *shwrapper;
 
-  const char *dumpscript_opt = "--lt-dump-script";
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
@@ -3099,38 +3390,14 @@ EOF
 		;;
 	      esac
 
-	    cat <<EOF
-	  printf ("%s", script_text);
+	    cat <<"EOF"
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
 	  return 0;
 	}
     }
 
-  newargz = XMALLOC (char *, argc + 2);
-EOF
-
-	    if test -n "$TARGETSHELL" ; then
-	      # no path translation at all
-	      lt_newargv0=$TARGETSHELL
-	    else
-	      case "$host" in
-		*mingw* )
-		  # awkward: cmd appends spaces to result
-		  lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-		  lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`
-		  case $lt_newargv0 in
-		    *.exe | *.EXE) ;;
-		    *) lt_newargv0=$lt_newargv0.exe ;;
-		  esac
-		  ;;
-		* ) lt_newargv0=$SHELL ;;
-	      esac
-	    fi
-
-		cat <<EOF
-  newargz[0] = (char *) xstrdup ("$lt_newargv0");
-EOF
-
-	    cat <<"EOF"
+  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
     lt_fatal ("Couldn't find %s", argv[0]);
@@ -3142,39 +3409,60 @@ EOF
 			  actual_cwrapper_path));
   XFREE (tmp_pathspec);
 
-  shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, shwrapper_name);
-
-  /* shwrapper_name transforms */
-  strendzap (shwrapper_name, ".exe");
-  tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +
-				 strlen ("_ltshwrapperTMP") + 1));
-  strcpy (tmp_pathspec, shwrapper_name);
-  strcat (tmp_pathspec, "_ltshwrapperTMP");
-  XFREE (shwrapper_name);
-  shwrapper_name = tmp_pathspec;
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
   tmp_pathspec = 0;
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",
-			  shwrapper_name));
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
 EOF
 
 	    cat <<EOF
-  newargz[1] =
+  newargz[0] =
     XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));
-  strcpy (newargz[1], actual_cwrapper_path);
-  strcat (newargz[1], "$objdir");
-  strcat (newargz[1], "/");
-  strcat (newargz[1], shwrapper_name);
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
 EOF
 
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
 
 	    case $host_os in
 	      mingw*)
 	    cat <<"EOF"
   {
     char* p;
-    while ((p = strchr (newargz[1], '\\')) != NULL)
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
       {
 	*p = '/';
       }
@@ -3184,55 +3472,114 @@ EOF
 	    esac
 
 	    cat <<"EOF"
-  XFREE (shwrapper_name);
+  XFREE (target_name);
   XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
 
-  /* always write in binary mode */
-  if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)
-    {
-      lt_fatal ("Could not open %s for writing", newargz[1]);
-    }
-  fprintf (shwrapper, "%s", script_text);
-  fclose (shwrapper);
-
-  make_executable (newargz[1]);
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
 
+  newargc=0;
   for (i = 1; i < argc; i++)
-    newargz[i + 1] = xstrdup (argv[i]);
-  newargz[argc + 1] = NULL;
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
 
-  for (i = 0; i < argc + 1; i++)
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, newargz[i]));
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
     }
 
 EOF
 
 	    case $host_os in
 	      mingw*)
-		cat <<EOF
+		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
       return 127;
     }
   return rval;
-}
 EOF
 		;;
 	      *)
-		cat <<EOF
-  execv ("$lt_newargv0", newargz);
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
   return rval; /* =127, but avoids unused variable warning */
-}
 EOF
 		;;
 	    esac
 
 	    cat <<"EOF"
+}
 
 void *
 xmalloc (size_t num)
@@ -3506,6 +3853,177 @@ lt_fatal (const char *message, ...)
   lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
   va_end (ap);
 }
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
 EOF
 }
 # end: func_emit_cwrapperexe_src
@@ -3515,7 +4033,7 @@ func_mode_link ()
 {
     $opt_debug
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
@@ -3959,6 +4477,13 @@ func_mode_link ()
       -L*)
 	func_stripname '-L' '' "$arg"
 	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -3977,14 +4502,16 @@ func_mode_link ()
 	  ;;
 	esac
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -3995,7 +4522,7 @@ func_mode_link ()
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -4072,7 +4599,7 @@ func_mode_link ()
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
 	  func_warning "\`-no-install' is ignored for $host"
@@ -5032,7 +5559,7 @@ func_mode_link ()
 	if test -n "$library_names" &&
 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 	  case $host in
-	  *cygwin* | *mingw*)
+	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
 	      notinst_deplibs="$notinst_deplibs $lib"
 	      need_relink=no
@@ -5102,7 +5629,7 @@ func_mode_link ()
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw*)
+	      *cygwin* | mingw* | *cegcc*)
 	        func_arith $current - $age
 		major=$func_arith_result
 		versuffix="-$major"
@@ -5884,7 +6411,7 @@ func_mode_link ()
 	tempremovelist=`$ECHO "$output_objdir/*"`
 	for p in $tempremovelist; do
 	  case $p in
-	    *.$objext)
+	    *.$objext | *.gcno)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 	       if test "X$precious_files_regex" != "X"; then
@@ -5955,7 +6482,7 @@ func_mode_link ()
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
@@ -6454,7 +6981,7 @@ EOF
 
 	orig_export_symbols=
 	case $host_os in
-	cygwin* | mingw*)
+	cygwin* | mingw* | cegcc*)
 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	    # exporting using user supplied symfile
 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
@@ -7079,14 +7606,16 @@ EOF
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -7156,6 +7685,10 @@ EOF
           wrappers_required=no
         fi
         ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -7308,11 +7841,10 @@ EOF
 
 	    func_emit_cwrapperexe_src > $cwrappersource
 
-	    # we should really use a build-platform specific compiler
-	    # here, but OTOH, the wrappers (shell script and this C one)
-	    # are only useful if you want to execute the "real" binary.
-	    # Since the "real" binary is built for $host, then this
-	    # wrapper might as well be built for $host, too.
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
 	    $opt_dry_run || {
 	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
 	      $STRIP $cwrapper
@@ -7597,7 +8129,7 @@ EOF
 	  # place dlname in correct position for cygwin
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 0d258e0..9000a05 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,13 +1,13 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-#   Written by Gary V. Vaughan, 2004
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
 #
 # This file 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.
 
-# serial 5 ltsugar.m4
+# serial 6 ltsugar.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@@ -63,14 +63,14 @@ m4_define([lt_append],
 # Produce a SEP delimited list of all paired combinations of elements of
 # PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
 # has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
 m4_define([lt_combine],
-[m4_if([$2], [], [],
-  [m4_if([$4], [], [],
-    [lt_join(m4_quote(m4_default([$1], [[, ]])),
-      lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
-		   [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
-			       [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
-])
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
 
 
 # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 45cb155..b8e154f 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -9,15 +9,15 @@
 
 # Generated from ltversion.in.
 
-# serial 2976 ltversion.m4
+# serial 3012 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.4])
-m4_define([LT_PACKAGE_REVISION], [1.2976])
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.4'
-macro_revision='1.2976'
+[macro_version='2.2.6'
+macro_revision='1.3012'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff --git a/po/LINGUAS b/po/LINGUAS
index 7c26170..bdcb91b 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,3 +1,4 @@
+ar
 bg
 ca
 cs
@@ -15,13 +16,16 @@ hr
 hu
 it
 ja
+km
 ko
 ku
+ms
 nb
 nl
 pl
 pt
 pt_BR
+ro
 ru
 sk
 sl
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 19de96c..0fabe7b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,7 +77,6 @@ src/bin/e_pointer.c
 src/bin/e_popup.c
 src/bin/e_prefix.c
 src/bin/e_remember.c
-src/bin/e_remote_main.c
 src/bin/e_resist.c
 src/bin/e_screensaver.c
 src/bin/e_scrollframe.c
diff --git a/po/ar.gmo b/po/ar.gmo
new file mode 100644
index 0000000..5f7e4a1
Binary files /dev/null and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
new file mode 100644
index 0000000..c9da7eb
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,6883 @@
+# Arabic translation for enlightenment
+# Copyright (c) 2009 Free Software Foundation.
+# This file is distributed under the same license as the enlightenment package.
+# Nizar Kerkeni <nizar.kerkeni at gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment HEAD\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-09 05:03+0000\n"
+"Last-Translator: waso <waso99 at yahoo.com>\n"
+"Language-Team: Arabic <ar at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/bin/e_about.c:17
+msgid "About Enlightenment"
+msgstr "عن Enlightenment"
+
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:180
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
+#: src/modules/mixer/app_mixer.c:531
+msgid "Close"
+msgstr "إغلاق"
+
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
+msgid "Enlightenment"
+msgstr "إنجلتمنت"
+
+#: src/bin/e_about.c:26
+msgid ""
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
+"hope you enjoy using this software as much as we enjoyed writing it."
+"<br><br>This software is provided as-is with no explicit or implied "
+"warranty. This software is governed by licensing conditions, so please see "
+"the COPYING and COPYING-PLAIN licence files installed on your system."
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+"is not stable. Many features are incomplete or even non-existant yet and may "
+"have many bugs. You have been <hilight>WARNED!</hilight>"
+msgstr ""
+"حقوق التأليف والنشر © 1999-2009 ، من قبل فريق تطوير إنليتمنت. <br><br>نأمل "
+"أن تستمتع باستخدام هذا البرنامج بقدر ما تمتعنا به حتى كتابة هذا التقرير. "
+"<br><br>يتم توفير هذا البرنامج كما هو واضح ليس مع أي ضمان ضمني. هذا البرنامج "
+"هو يحكمه شروط الترخيص ، لذلك يرجى الاطلاع على ملفات الترخيص المثبت على "
+"نظامك. <br><br>انليتمنت هو تحت التطوير الضخم <hilight></ hilight> وأنها ليست "
+"مستقرة. العديد من الميزات غير مكتملة أو حتى غير موجودة بعد وربما يكون العديد "
+"من الأخطاء. قد تم <hilight>تحذيرك! </ hilight>"
+
+#: src/bin/e_about.c:50
+msgid "<title>The Team</title>"
+msgstr "<title>الفريق</title>"
+
+#: src/bin/e_actions.c:345
+#, c-format
+msgid ""
+"You are about to kill %s.<br><br>Please keep in mind that all data of this "
+"window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
+"you want to kill this window?"
+msgstr ""
+"أنت على وشك قتل %s.<br><br> يرجى إدراك أن كل بيانات هذه النافذة,<br>اللتي لم "
+"يتم حفظها بعد ستفقد!<br><br>هل أنت متأكد أنك تريد قتل هذه النافذة؟"
+
+#: src/bin/e_actions.c:357
+msgid "Are you sure you want to kill this window?"
+msgstr "أمتأكد من أنك تريد قتل هذه النافذة؟"
+
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
+msgid "Yes"
+msgstr "نعم"
+
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "لا"
+
+#: src/bin/e_actions.c:1762
+msgid "Are you sure you want to exit?"
+msgstr "أمتأكد من أنك تريد الخروج؟"
+
+#: src/bin/e_actions.c:1764
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr "لقد طلبت الخروج من إنجلتمنت.<br><br>هل أنت متأكد؟"
+
+#: src/bin/e_actions.c:1860
+msgid "Are you sure you want to log out?"
+msgstr "أمتأكد من أنك تريد تسجيل الخروج؟"
+
+#: src/bin/e_actions.c:1862
+msgid "You are about to log out.<br><br>Are you sure you want to do this?"
+msgstr "أنت على وشك تسجيل الخروج.<br><br>هل أنت متأكد من أنك تريد فعل ذلك؟"
+
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
+msgid "Are you sure you want to turn off?"
+msgstr "أأنت متأكد من أنك تريد الإطفاء؟"
+
+#: src/bin/e_actions.c:1926
+msgid ""
+"You requested to turn off your Computer.<br><br>Are you sure you want to "
+"shut down?"
+msgstr "لقد طلبت إطفاء حاسوبك.<br><br>هل أنت متأكد أنك تريد إطفائه؟"
+
+#: src/bin/e_actions.c:1988
+msgid "Are you sure you want to reboot?"
+msgstr "هل أنت متاكد أنك تريد إعادة التشغيل؟"
+
+#: src/bin/e_actions.c:1990
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr "لقد طلبت إعادة تشغيل الحاسوب.<br><br>أأنت متاكد انك تريد إعادة تشغيله؟"
+
+#: src/bin/e_actions.c:2054
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr "لقد طلبت تعليق حاسوبك.<br><br>أأنت متأكد أنك تريد تعليقه؟"
+
+#: src/bin/e_actions.c:2116
+msgid "Are you sure you want to hibernate?"
+msgstr "أأنت متاكد أنك تريد تنويم حاسوبك؟"
+
+#: src/bin/e_actions.c:2118
+msgid ""
+"You requested to hibernate your Computer.<br><br>Are you sure you want to "
+"suspend to disk?"
+msgstr "لقد طلبت تنويم حاسوبك.<br><br>أأنت متأكد أنك تريد تنويمه؟"
+
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
+msgid "Window : Actions"
+msgstr "النوافذ : الإجاراءات"
+
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "الحركة"
+
+#: src/bin/e_actions.c:2518
+msgid "Resize"
+msgstr "أعد تحجيم"
+
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr "القائمة"
+
+#: src/bin/e_actions.c:2529
+msgid "Window Menu"
+msgstr "قائمة النافذة"
+
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
+msgid "Raise"
+msgstr "ارفع"
+
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
+msgid "Lower"
+msgstr "اخفض"
+
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
+msgid "Kill"
+msgstr "اقتل"
+
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
+msgid "Window : State"
+msgstr "النافذة : الحالة"
+
+#: src/bin/e_actions.c:2557
+msgid "Sticky Mode Toggle"
+msgstr "نمط الإلتصاق المتناوب"
+
+#: src/bin/e_actions.c:2564
+msgid "Iconic Mode Toggle"
+msgstr "التبديل لوضع اﻷيقونات"
+
+#: src/bin/e_actions.c:2571
+msgid "Fullscreen Mode Toggle"
+msgstr "تحول إلى نمط كامل الشاشة"
+
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
+msgid "Maximize"
+msgstr "تكبير"
+
+#: src/bin/e_actions.c:2580
+msgid "Maximize Vertically"
+msgstr "كبّر رأسيا"
+
+#: src/bin/e_actions.c:2583
+msgid "Maximize Horizontally"
+msgstr "كبّر أفقيا"
+
+#: src/bin/e_actions.c:2586
+msgid "Maximize Fullscreen"
+msgstr "تكبير كامل الشاشة"
+
+#: src/bin/e_actions.c:2588
+msgid "Maximize Mode \"Smart\""
+msgstr "نمط التكبير \"ذكي\""
+
+#: src/bin/e_actions.c:2590
+msgid "Maximize Mode \"Expand\""
+msgstr "نمط التكبير \"تكبير\""
+
+#: src/bin/e_actions.c:2592
+msgid "Maximize Mode \"Fill\""
+msgstr "وضع التكبير \"إمتلاء\""
+
+#: src/bin/e_actions.c:2599
+msgid "Shade Up Mode Toggle"
+msgstr "التحويل لوضع الظل اﻷعلى"
+
+#: src/bin/e_actions.c:2601
+msgid "Shade Down Mode Toggle"
+msgstr "التحويل لوضع الظل اﻷسفل"
+
+#: src/bin/e_actions.c:2603
+msgid "Shade Left Mode Toggle"
+msgstr "التحويل لوضع الظل اﻷيسر"
+
+#: src/bin/e_actions.c:2605
+msgid "Shade Right Mode Toggle"
+msgstr "التحويل لوضع الظل اﻷيمن"
+
+#: src/bin/e_actions.c:2607
+msgid "Shade Mode Toggle"
+msgstr "نمط الضل المتناوب"
+
+#: src/bin/e_actions.c:2614
+msgid "Toggle Borderless State"
+msgstr "التحول لحالة بدون حدود"
+
+#: src/bin/e_actions.c:2619
+msgid "Toggle Pinned State"
+msgstr "التحول لحالة الثقب"
+
+#: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:103
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
+msgid "Desktop"
+msgstr "سطح المكتب"
+
+#: src/bin/e_actions.c:2624
+msgid "Flip Desktop Left"
+msgstr "قلب سطح المكتب لليسار"
+
+#: src/bin/e_actions.c:2626
+msgid "Flip Desktop Right"
+msgstr "قلب سطح المكتب لليمين"
+
+#: src/bin/e_actions.c:2628
+msgid "Flip Desktop Up"
+msgstr "قلب سطح المكتب للأعلى"
+
+#: src/bin/e_actions.c:2630
+msgid "Flip Desktop Down"
+msgstr "قلب سطح المكتب للأسفل"
+
+#: src/bin/e_actions.c:2632
+msgid "Flip Desktop By..."
+msgstr "قلب سطح المكتبة بواسطة..."
+
+#: src/bin/e_actions.c:2638
+msgid "Show The Desktop"
+msgstr "ارعرض سطح المكتب"
+
+#: src/bin/e_actions.c:2644
+msgid "Show The Shelf"
+msgstr "اعرض الدرج"
+
+#: src/bin/e_actions.c:2649
+msgid "Flip Desktop To..."
+msgstr "قلب سطح المكتب إلى..."
+
+#: src/bin/e_actions.c:2655
+msgid "Flip Desktop Linearly..."
+msgstr "قلب سطح المكتب بشكل خطي..."
+
+#: src/bin/e_actions.c:2661
+msgid "Switch To Desktop 0"
+msgstr "تحول إلى سطح المكتب 0"
+
+#: src/bin/e_actions.c:2663
+msgid "Switch To Desktop 1"
+msgstr "تحول لسطح المكتب 1"
+
+#: src/bin/e_actions.c:2665
+msgid "Switch To Desktop 2"
+msgstr "تحول لسطح المكتب 2"
+
+#: src/bin/e_actions.c:2667
+msgid "Switch To Desktop 3"
+msgstr "تحول لسطح المكتب 3"
+
+#: src/bin/e_actions.c:2669
+msgid "Switch To Desktop 4"
+msgstr "تحول لسطح المكتب 4"
+
+#: src/bin/e_actions.c:2671
+msgid "Switch To Desktop 5"
+msgstr "تحول لسطح المكتب 5"
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 6"
+msgstr "تحول لسطح المكتب 6"
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 7"
+msgstr "تحول لسطح المكتب 7"
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 8"
+msgstr "تحول لسطح المكتب 8"
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 9"
+msgstr "تحول لسطح المكتب 9"
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 10"
+msgstr "تحول لسطح المكتب 10"
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 11"
+msgstr "تحول لسطح المكتب 11"
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop..."
+msgstr "تحول لسطح المكتب..."
+
+#: src/bin/e_actions.c:2691
+msgid "Flip Desktop Left (All Screens)"
+msgstr "قلب سطح المكتب بشكل لليسار (كل الشاشات)"
+
+#: src/bin/e_actions.c:2693
+msgid "Flip Desktop Right (All Screens)"
+msgstr "قلب سطح المكتب بشكل لليمين (كل الشاشات)"
+
+#: src/bin/e_actions.c:2695
+msgid "Flip Desktop Up (All Screens)"
+msgstr "قلب سطح المكتب بشكل للأعلى (كل الشاشات)"
+
+#: src/bin/e_actions.c:2697
+msgid "Flip Desktop Down (All Screens)"
+msgstr "قلب سطح المكتب بشكل للأسفل (كل الشاشات)"
+
+#: src/bin/e_actions.c:2699
+msgid "Flip Desktop By... (All Screens)"
+msgstr "قلب سطح المكتب بشكل بواسطة... (كل الشاشات)"
+
+#: src/bin/e_actions.c:2705
+msgid "Flip Desktop To... (All Screens)"
+msgstr "قلب سطح المكتب بشكل إلى... (كل الشاشات)"
+
+#: src/bin/e_actions.c:2711
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr "قلب سطح المكتب بشكل بشكل خطي... (كل الشاشات)"
+
+#: src/bin/e_actions.c:2717
+msgid "Flip Desktop In Direction..."
+msgstr "قلب سطح المكتب بشكل في الإتجاه... (كل الشاشات)"
+
+#: src/bin/e_actions.c:2722
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr "تحول لسطح المكتب 0 (كل الشاشات("
+
+#: src/bin/e_actions.c:2724
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr "تحول لسطح المكتب 1 (كل الشاشات)"
+
+#: src/bin/e_actions.c:2726
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr "تحول لسطح المكتب 2 (كل الشاشات)"
+
+#: src/bin/e_actions.c:2728
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr "تحول لسطح المكتب 3 (كل الشاشات)"
+
+#: src/bin/e_actions.c:2730
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr "تحول لسطح المكتب 4 (كل الشاشات)"
+
+#: src/bin/e_actions.c:2732
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr "تحول لسطح المكتب 5 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2734
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr "تحول لسطح المكتب 6 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2736
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr "تحول لسطح المكتب 7 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2738
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr "تحول لسطح المكتب 8 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2740
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr "تحول لسطح المكتب 9 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2742
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr "تحول لسطح المكتب 10 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2744
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr "تحول لسطح المكتب 11 (كل الشاشة)"
+
+#: src/bin/e_actions.c:2746
+msgid "Switch To Desktop... (All Screens)"
+msgstr "تحول لسطح المكتب... (كل الشاشة)"
+
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
+#: 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
+#: src/modules/conf_dpms/e_mod_main.c:34
+#: src/modules/conf_screensaver/e_mod_main.c:34
+#: src/modules/ibox/e_mod_config.c:134
+msgid "Screen"
+msgstr "الشاشة"
+
+#: src/bin/e_actions.c:2753
+msgid "Send Mouse To Screen 0"
+msgstr "أرسل الفأرة للشاشة 0"
+
+#: src/bin/e_actions.c:2755
+msgid "Send Mouse To Screen 1"
+msgstr "أرسل الفأرة للشاشة 1"
+
+#: src/bin/e_actions.c:2757
+msgid "Send Mouse To Screen..."
+msgstr "أرسل الفأرة للشاشة..."
+
+#: src/bin/e_actions.c:2762
+msgid "Send Mouse Forward 1 Screen"
+msgstr "ارسل الفأرة شاشة للامام"
+
+#: src/bin/e_actions.c:2764
+msgid "Send Mouse Back 1 Screen"
+msgstr "أرسل الفأرة شاشة للخلف"
+
+#: src/bin/e_actions.c:2766
+msgid "Send Mouse Forward/Back Screens..."
+msgstr "ارسل الفأرة أمام\\خلف الشاشات"
+
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
+msgid "Window : Moving"
+msgstr "النافذة : التحريك"
+
+#: src/bin/e_actions.c:2804
+msgid "To Next Desktop"
+msgstr "إلى سطح المكتب التالي"
+
+#: src/bin/e_actions.c:2806
+msgid "To Previous Desktop"
+msgstr "سطح المكتب السابق"
+
+#: src/bin/e_actions.c:2808
+msgid "By Desktop #..."
+msgstr "بواسط سطح المكتب #..."
+
+#: src/bin/e_actions.c:2814
+msgid "To Desktop..."
+msgstr "إلى سطح المكتب..."
+
+#: src/bin/e_actions.c:2820
+msgid "Show Main Menu"
+msgstr "إظهار القائمة الرئيسية"
+
+#: src/bin/e_actions.c:2822
+msgid "Show Favorites Menu"
+msgstr "إظهار قائمة المفظلات"
+
+#: src/bin/e_actions.c:2824
+msgid "Show All Applications Menu"
+msgstr "أظهر قائمة كل البرامج"
+
+#: src/bin/e_actions.c:2826
+msgid "Show Clients Menu"
+msgstr "أظهر قائمة العميل"
+
+#: src/bin/e_actions.c:2828
+msgid "Show Menu..."
+msgstr "آظهر القائمة..."
+
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+msgid "Launch"
+msgstr "تشغيل"
+
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
+msgid "Command"
+msgstr "الأمر"
+
+#: src/bin/e_actions.c:2840
+msgid "Application"
+msgstr "التطبيق"
+
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr "أعِد التشغيل"
+
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr "خروج"
+
+#: src/bin/e_actions.c:2852
+msgid "Exit Now"
+msgstr "اخرج الآن"
+
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
+msgid "Enlightenment : Mode"
+msgstr "إنجلتمنت : النمط"
+
+#: src/bin/e_actions.c:2857
+msgid "Presentation Mode Toggle"
+msgstr "التحول لعرض التقديم"
+
+#: src/bin/e_actions.c:2862
+msgid "Offline Mode Toggle"
+msgstr "التحول لوضع \"غير متاح\""
+
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
+#: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
+#: src/modules/conf_desklock/e_int_config_desklock.c:301
+#: src/modules/conf_imc/e_int_config_imc.c:827
+#: src/modules/conf_startup/e_int_config_startup.c:267
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
+#: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
+#: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
+#: src/modules/syscon/e_mod_main.c:122
+msgid "System"
+msgstr "النظام"
+
+#: src/bin/e_actions.c:2866
+msgid "Log Out"
+msgstr "سجّل الخروج"
+
+#: src/bin/e_actions.c:2870
+msgid "Power Off Now"
+msgstr "أطفئ الآن"
+
+#: src/bin/e_actions.c:2874
+msgid "Power Off"
+msgstr "أطفئ"
+
+#: src/bin/e_actions.c:2878
+msgid "Reboot"
+msgstr "أعِد التشغيل"
+
+#: src/bin/e_actions.c:2882
+msgid "Suspend"
+msgstr "تعليق"
+
+#: src/bin/e_actions.c:2886
+msgid "Hibernate"
+msgstr "سبات"
+
+#: src/bin/e_actions.c:2894
+msgid "Lock"
+msgstr "اقفل"
+
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
+msgid "Cleanup Windows"
+msgstr "تنظيف النوافذ"
+
+#: src/bin/e_actions.c:2904
+msgid "Generic : Actions"
+msgstr "اﻷحداث"
+
+#: src/bin/e_actions.c:2904
+msgid "Delayed Action"
+msgstr "الحدث المتأخر"
+
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr "عين كخلفية"
+
+#: src/bin/e_border.c:4922
+msgid "Desktop files scan done"
+msgstr "تم فحص ملفات سطح المكتب"
+
+#: src/bin/e_border.c:4935
+msgid "Desktop file scan"
+msgstr "فحص ملف سطح المكتب"
+
+#: src/bin/e_color_dialog.c:29
+msgid "Color Selector"
+msgstr "منتقي الألوان"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/modules/conf_dpms/e_int_config_dpms.c:85
+#: src/modules/conf_imc/e_int_config_imc_import.c:112
+#: src/modules/conf_mime/e_int_config_mime_edit.c:283
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
+#: src/modules/conf_theme/e_int_config_theme_import.c:113
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
+#: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
+#: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
+msgid "OK"
+msgstr "حسنا"
+
+#: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/modules/conf_mime/e_int_config_mime_edit.c:284
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_theme/e_int_config_theme_import.c:117
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
+#: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
+msgid "Cancel"
+msgstr "ألغ"
+
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
+msgid ""
+"Settings data needed upgrading. Your old settings have<br>been wiped and a "
+"new set of defaults initialized. This<br>will happen regularly during "
+"development, so don't report a<br>bug. This simply means Enlightenment needs "
+"new settings<br>data by default for usable functionality that your "
+"old<br>settings simply lack. This new set of defaults will fix<br>that by "
+"adding it in. You can re-configure things now to your<br>liking. Sorry for "
+"the hiccup in your settings.<br>"
+msgstr ""
+"إعدادات الضبط تحتاج للترقية. إعداداتك القديمة <br>قد تم محوها ، ومجموعة "
+"جديدة من اﻹعدادات الافتراضية تم تهيئتها. <br>هذا  يحدث بشكل منتظم خلال "
+"التطوير ، وبالتالي لا ترسل تقرير <br>بخطأ. هذا يعني ببساطة أن انليتمنت تحتاج "
+"لإعدادات جديدة <br>البيانات اﻷساسية للوظائف المستخدمة يمكن استخدامها في "
+"الإعدادات <br>القديمة ببساطة . هذه مجموعة جديدة من الإعدادات اﻹفتراضية التي "
+"ستقوم بالإصلاح <br>بإضافتها يمكنك إعادة تكوين الأشياء الآن إلى حسابك <br>كما "
+"كانت. آسف للتدخل في الإعدادات الخاصة بك. <br>"
+
+#: src/bin/e_config.c:777
+msgid ""
+"Your settings are NEWER than Enlightenment. This is very<br>strange. This "
+"should not happen unless you downgraded<br>Enlightenment or copied the "
+"settings from a place where<br>a newer version of Enlightenment was running. "
+"This is bad and<br>as a precaution your settings have been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1740
+msgid "Settings Upgraded"
+msgstr "تم ترقية الإعدادات"
+
+#: src/bin/e_config.c:1763
+#, c-format
+msgid ""
+"An error occured while saving Enlightenment's<br>settings 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 ""
+"حدث خطأ أثناء <br>حفظ إعدادات إنليتمنت إلى القرص. الخطأ لا يمكن <br>حسابه. "
+"<br><br> الملف حيث حدث الخطأ هو:<br>%s<br><br> هذا الملف قد تم مسحه لتفادي "
+"حدوث تدمير للبيانات.<br>"
+
+#: src/bin/e_config.c:1774
+#, c-format
+msgid ""
+"Enlightenment's settings files are too big<br>for the file system they are "
+"being saved to.<br>This error is very strange as the files should<br>be "
+"extremely small. Please check the settings<br>for your home directory."
+"<br><br>The file where the error occured was:<br>%s<br><br>This file has "
+"been deleted to avoid corrupt data.<br>"
+msgstr ""
+"ملفات إعدادات إنليتمنت كبيرة جدا<br>لملفات النظام التي يجب أن تحفظ فيها."
+"<br>هذا الخطأ غريب جدا حيثما يجب أن يكون الملف<br>صغير جدا.رجاء إفحص "
+"اﻹعدادات<br>لمسار المنزل لديك.<br><br>الملف الذي حدث به الخطأ هو:<br>%"
+"s<br><br>هذا الملف قد تم حذفه لتفادي حدوث دمار للبيانات"
+
+#: src/bin/e_config.c:1787
+#, c-format
+msgid ""
+"An output error occured when writing the settings<br>files for "
+"Enlightenment. Your disk is having troubles<br>and possibly needs "
+"replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
+"file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+"هناك خطأ يظهر عند كتابة<br>ملفات اﻹعدادات ﻹنليتمنت. هناك مشاكل في "
+"القرص<br>ومن المحتمل أنه بحاجة للإستبدال.<br><br>الملف الذي حدث به الخطأ هو:"
+"<br>%s<br><br> هذا الملف قد تم مسحه لتجنب حدوث دمار للبيانات.<br>"
+
+#: src/bin/e_config.c:1798
+#, c-format
+msgid ""
+"Enlightenment cannot write its settings file<br>because it ran out of space "
+"to write the file.<br>You have either run out of disk space or have<br>gone "
+"over your quota limit.<br><br>The file where the error occured was:<br>%"
+"s<br><br>This file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+"إنليتمنت لا يستطيع كتابة ملف إعداداته<br>حيث أنه لم يعد هناك مساحة لكتابة "
+"الملف.<br>يبدو أنك إستنفذت المساحة المتبقية في القرص أو أنك <br>تعديت "
+"المساحة المخصصة لك.<br><br>الملف المتسبب في الخطأ هو:<br>%s<br><br>هذا الملف "
+"قد تم مسحه لتجنب حدوث دمار للبيانات.<br>"
+
+#: src/bin/e_config.c:1810
+#, c-format
+msgid ""
+"Enlightenment unexpectedly had the settings 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 ""
+"إنجلتمنت حصل على ملف الإعدادات بشكل غير متوقع<br>كان يكتب الإغلاق عليه. هذا "
+"شيئ غير طبيعي.<br><br>الملف اللذي حدث فيه الخلل:<br>%s<br>تم حذف هذا الملف "
+"لتفادي بيانات فاسدة.<br>"
+
+#: src/bin/e_config.c:1835
+msgid "Enlightenment Settings Write Problems"
+msgstr "خلل في كتابة أعدادات إنجلتمنت"
+
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
+#: src/modules/conf_engine/e_mod_main.c:34
+#: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_paths/e_mod_main.c:34
+#: src/modules/conf_performance/e_mod_main.c:34
+msgid "Advanced"
+msgstr "متقدم"
+
+#: src/bin/e_config_dialog.c:237
+msgid "Basic"
+msgstr "أساسي"
+
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
+msgid "Apply"
+msgstr "طبِق"
+
+#: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
+#: src/modules/conf_colors/e_int_config_color_classes.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_paths/e_int_config_paths.c:83
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
+msgid "Modules"
+msgstr "وحدات"
+
+#: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
+msgid "Extensions"
+msgstr "الامتدادات"
+
+#: src/bin/e_container.c:113
+#, c-format
+msgid "Container %d"
+msgstr "الحاوية %d"
+
+#: src/bin/e_desklock.c:175
+msgid "Error - no PAM support"
+msgstr "خلل - لا يوجد دعم بام(PAM)"
+
+#: src/bin/e_desklock.c:176
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr "لا يوجد دعم بام(PAM) في إنجلتمنت, لذا<br>قفل القرص غير معطل."
+
+#: src/bin/e_desklock.c:240
+msgid "Lock Failed"
+msgstr "فشل القفل"
+
+#: src/bin/e_desklock.c:241
+msgid ""
+"Locking the desktop failed because some application<br>has grabbed either "
+"the keyboard or the mouse or both<br>and their grab is unable to be broken."
+msgstr ""
+"فشل قفل سطح المكتب لئن بعض البرامج<br>مسكت إما لوحة المفاتيح أو الفأرة أو "
+"كليهما<br>ولايمكن كسر مسكتهم."
+
+#: src/bin/e_desklock.c:325
+msgid "Please enter your unlock password"
+msgstr "ادخل كلمة مرور فك القفل"
+
+#: src/bin/e_desklock.c:689
+msgid "Authentication System Error"
+msgstr "فشل التوثيق من النظام"
+
+#: src/bin/e_desklock.c:690
+#, c-format
+msgid ""
+"Authentication via PAM had errors setting up the<br>authentication session. "
+"The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
+"happening. Please report this bug."
+msgstr ""
+"حصلت أخطاء أثناء التوثيق عن طريق جلسة توثيق بام(PAM). كود الخلل هو <hilight>%"
+"i</hilight>. هذا سيئ ولا يجب أن يحدث. يرجى إبلاغنا بهذه العلة."
+
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr "تفعيل نمط العرض؟"
+
+#: src/bin/e_desklock.c:1020
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr "لا, وتوقف عن السؤال"
+
+#: src/bin/e_eap_editor.c:158
+msgid "Incomplete Window Properties"
+msgstr "خيارات النافذة غير كاملة"
+
+#: src/bin/e_eap_editor.c:159
+msgid ""
+"The window you are creating an icon for<br>does not contain window name and "
+"class<br>properties, so the needed properties for<br>the icon so that it "
+"will be used for this<br>window cannot be guessed. You will need to<br>use "
+"the window title instead. This will only<br>work if the window title is the "
+"same at<br>the time the window starts up, and does not<br>change."
+msgstr ""
+"النافذة التي تحاول إنشاء أيقونه لها<br>لا تحتوي على إسم للنافذة ولا خصائص "
+"<br>التصنيف, لذلك فالخصائص المطلوبة لهذه اﻷيقونة ليتم إستخدامها<br>لهذه "
+"النافذة لا يمكن توقعها. أنت تحتاج إلى<br>إستخدام عنوان النافذة كبديل. هذا "
+"سيعمل فقط <br> في حالة أن عنوان النافذة متطابق في <br>نفس الوقت عمل النافذة "
+"الرئيسية , ولم<br>يتغير."
+
+#: src/bin/e_eap_editor.c:215
+msgid "Desktop Entry Editor"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_mime/e_int_config_mime_edit.c:145
+msgid "Icon"
+msgstr "الأيقونة"
+
+#: src/bin/e_eap_editor.c:472
+#: src/modules/conf_mime/e_int_config_mime_edit.c:136
+msgid "Basic Info"
+msgstr "المعلومات الأساسية"
+
+#: src/bin/e_eap_editor.c:473 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:911
+msgid "Name"
+msgstr "الإسم"
+
+#: src/bin/e_eap_editor.c:479
+msgid "Executable"
+msgstr "تنفيذي"
+
+#: src/bin/e_eap_editor.c:487
+msgid "Comment"
+msgstr "التعليق"
+
+#: src/bin/e_eap_editor.c:512
+msgid "General"
+msgstr "عامّ"
+
+#: src/bin/e_eap_editor.c:515
+msgid "Generic Name"
+msgstr "اسم عام"
+
+#: src/bin/e_eap_editor.c:520
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:105
+msgid "Window Class"
+msgstr "فئة النافذة"
+
+#: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
+msgid "Categories"
+msgstr "الأقسام"
+
+#: src/bin/e_eap_editor.c:528
+msgid "Mime Types"
+msgstr "أنواع الملفات"
+
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
+msgid "Options"
+msgstr "خيارات"
+
+#: src/bin/e_eap_editor.c:535
+msgid "Startup Notify"
+msgstr "ابدأ التنبيه"
+
+#: src/bin/e_eap_editor.c:537
+msgid "Run in Terminal"
+msgstr "شغل في الطَرَفية"
+
+#: src/bin/e_eap_editor.c:539
+msgid "Show in Menus"
+msgstr "اظهر في قوائم"
+
+#: src/bin/e_eap_editor.c:543
+msgid "Desktop file"
+msgstr "ملف سطح المكتب"
+
+#: src/bin/e_eap_editor.c:544
+msgid "Filename"
+msgstr "إسم الملف"
+
+#: src/bin/e_eap_editor.c:573
+msgid "Select an Icon"
+msgstr "إختر أيقونة"
+
+#: src/bin/e_eap_editor.c:642
+msgid "Select an Executable"
+msgstr "إختر ملف تنفيذي"
+
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
+#: src/modules/conf_shelves/e_int_config_shelf.c:81
+#: src/modules/ibar/e_mod_config.c:112
+msgid "Delete"
+msgstr "حذف"
+
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
+msgid "Cut"
+msgstr "قص"
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
+msgid "Copy"
+msgstr "انسخ"
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
+msgid "Paste"
+msgstr "الصق"
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr "اختر الكل"
+
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
+#: src/modules/conf_imc/e_int_config_imc.c:278
+#: src/modules/conf_imc/e_int_config_imc.c:518
+msgid "Run Error"
+msgstr "خلل في التشغيل"
+
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
+#: src/modules/conf_imc/e_int_config_imc.c:279
+#: src/modules/conf_imc/e_int_config_imc.c:519
+#, 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:356
+msgid "Application run error"
+msgstr "خلل في تشغيل البرنامج"
+
+#: src/bin/e_exec.c:358
+#, c-format
+msgid ""
+"Enlightenment was unable to run the application:<br><br>%s<br><br>The "
+"application failed to start."
+msgstr ""
+"لم يتمكن إنجلتمنت من تشغيل البرنامج:<br><br>%s<br><br>البرنامج فشل في البدء."
+
+#: src/bin/e_exec.c:454
+msgid "Application Execution Error"
+msgstr "فشل تنفيذ البرنامج"
+
+#: src/bin/e_exec.c:466
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr "%s فشل في التشغيل بشكل غير متوقع."
+
+#: src/bin/e_exec.c:472
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr "أمر خروج من %i عاد من %s."
+
+#: src/bin/e_exec.c:480
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr "%s تم إعتراضه بواسطة إشارة إعتراض."
+
+#: src/bin/e_exec.c:483
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr "%s تم إعتراضه بواسطة إشارة خروج"
+
+#: src/bin/e_exec.c:487
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr "%s تم إعتراضه بواسطة إشارة إلغاء"
+
+#: src/bin/e_exec.c:490
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr "%s تم إعتراضه بواسطة خطأ النقطة العائمة(floating point)."
+
+#: src/bin/e_exec.c:494
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr "%s تم إعتراضه بواسطة إشارة قتل."
+
+#: src/bin/e_exec.c:498
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr "%s تم إعتراضه بواسطة خطأ في الترقيم(segmentation fault)."
+
+#: src/bin/e_exec.c:502
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr "%s تم إعتراضه بسبب أنبوب مكسور (broken pipe)."
+
+#: src/bin/e_exec.c:505
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr "%s تم اﻹعتراض بسبب إشارة إنهاء"
+
+#: src/bin/e_exec.c:509
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr "%s تم اﻹعتراض بسبب خطأ في المسار"
+
+#: src/bin/e_exec.c:512
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:568
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
+msgid "Error Logs"
+msgstr "خلل في السجلات"
+
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
+msgid "There was no error message."
+msgstr "لا توجد رسالة خطأ"
+
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
+msgid "Save This Message"
+msgstr "احفظ هذه الرسالة"
+
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr "سجل الخطأ هذا سيتم حفظه في ملف باسم %s/%s.log"
+
+#: src/bin/e_exec.c:670
+msgid "Error Information"
+msgstr "خطأ في المعلومات"
+
+#: src/bin/e_exec.c:678
+msgid "Error Signal Information"
+msgstr "خلل إشارة المعلومات"
+
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
+msgid "Output Data"
+msgstr "معلومات المخرجات"
+
+#: src/bin/e_exec.c:696
+msgid "There was no output."
+msgstr "لا يوجد مخرج."
+
+#: src/bin/e_fm.c:945
+msgid "Nonexistent path"
+msgstr "مسار غير موجود"
+
+#: src/bin/e_fm.c:949
+#, c-format
+msgid "%s doesn't exist."
+msgstr "%s غير موجود."
+
+#: src/bin/e_fm.c:3017
+msgid "Mount Error"
+msgstr "خطأ عند التوصيل"
+
+#: src/bin/e_fm.c:3017
+msgid "Can't mount device"
+msgstr "لا يمكن توصيل الجهاز"
+
+#: src/bin/e_fm.c:3033
+msgid "Unmount Error"
+msgstr "خطأ في الفصْل"
+
+#: src/bin/e_fm.c:3033
+msgid "Can't unmount device"
+msgstr "لا يمكن فصل الجهاز"
+
+#: src/bin/e_fm.c:3048
+msgid "Eject Error"
+msgstr "خطأ في الإخراج"
+
+#: src/bin/e_fm.c:3048
+msgid "Can't eject device"
+msgstr "لا يمكن إخراج الجهاز"
+
+#: src/bin/e_fm.c:3685
+#, c-format
+msgid "%i Files"
+msgstr "%i ملفات"
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
+msgid "Link"
+msgstr "ارتباط"
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
+msgid "Abort"
+msgstr "إحباط"
+
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr "أسلوب العرض"
+
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
+msgid "Refresh View"
+msgstr "تحديث العرض"
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Show Hidden Files"
+msgstr "اظهر الملفات المخفية"
+
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
+msgid "Remember Ordering"
+msgstr "احفظ الترتيب"
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
+msgid "Sort Now"
+msgstr "صَنِف الآن"
+
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr "مجلد جديد"
+
+#: src/bin/e_fm.c:8051
+msgid "Rename"
+msgstr "أعِد التسمية"
+
+#: src/bin/e_fm.c:8070
+msgid "Unmount"
+msgstr "افصل"
+
+#: src/bin/e_fm.c:8075
+msgid "Mount"
+msgstr "وصل"
+
+#: src/bin/e_fm.c:8080
+msgid "Eject"
+msgstr "اخرج"
+
+#: src/bin/e_fm.c:8090
+msgid "Properties"
+msgstr "الإعدادات"
+
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
+msgid "Use default"
+msgstr "استخدم الإفتراضي"
+
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr "شيكة أيقونات"
+
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr "أيقونات مخصصة"
+
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr "قائمة"
+
+#: src/bin/e_fm.c:8392
+#, c-format
+msgid "Icon Size (%d)"
+msgstr "حجم الأيقونة (%d)"
+
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
+msgid "Set background..."
+msgstr "تعيين الخلفية..."
+
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
+msgid "Set overlay..."
+msgstr "تعيين الغطاء..."
+
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Clear"
+msgstr "مسح"
+
+#: src/bin/e_fm.c:8766
+msgid "Create a new Directory"
+msgstr "انشئ مجلد جديد"
+
+#: src/bin/e_fm.c:8767
+msgid "New Directory Name:"
+msgstr "اسم المجلد الجديد:"
+
+#: src/bin/e_fm.c:8821
+#, c-format
+msgid "Rename %s to:"
+msgstr "أعِد تسمية %s إلى:"
+
+#: src/bin/e_fm.c:8823
+msgid "Rename File"
+msgstr "غيّر اسم الملف"
+
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
+msgid "Retry"
+msgstr "أعِد المحاولة"
+
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
+msgid "Error"
+msgstr "خلل"
+
+#: src/bin/e_fm.c:8970
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: src/bin/e_fm.c:9022
+msgid "No to all"
+msgstr "لا للجميع"
+
+#: src/bin/e_fm.c:9024
+msgid "Yes to all"
+msgstr "نعم للجميع"
+
+#: src/bin/e_fm.c:9027
+msgid "Warning"
+msgstr "تحذير"
+
+#: src/bin/e_fm.c:9030
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr "الملف موجود من قبل, اكتب فوقه؟<br><hilight>%s</hilight>"
+
+#: src/bin/e_fm.c:9103
+msgid "Ignore this"
+msgstr "تجاهل هذا"
+
+#: src/bin/e_fm.c:9104
+msgid "Ignore all"
+msgstr "تجاهل الكل"
+
+#: src/bin/e_fm.c:9109
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr "حدث خلل أثناء تنفيذ عملية.<br>%s"
+
+#: src/bin/e_fm.c:9255
+msgid "Confirm Delete"
+msgstr "تأكيد الحذف"
+
+#: src/bin/e_fm.c:9260
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr "هل أنك متأكد من أنك تريد خذف<br><hilight>%s</hilight> ؟"
+
+#: src/bin/e_fm.c:9266
+#, c-format
+msgid ""
+"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
+"hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:108
+msgid "File Properties"
+msgstr "إعدادات الملف"
+
+#: src/bin/e_fm_prop.c:337
+msgid "File:"
+msgstr "الملف:"
+
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
+msgid "Size:"
+msgstr "الحجم:"
+
+#: src/bin/e_fm_prop.c:351
+msgid "Last Modified:"
+msgstr "آخر تعديل:"
+
+#: src/bin/e_fm_prop.c:358
+msgid "File Type:"
+msgstr "نوع الملف:"
+
+#: src/bin/e_fm_prop.c:365
+msgid "Permissions"
+msgstr "الصلاحيات"
+
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
+msgid "Owner:"
+msgstr "المالك:"
+
+#: src/bin/e_fm_prop.c:372
+msgid "Others can read"
+msgstr "بإمكان الآخرين القراءة"
+
+#: src/bin/e_fm_prop.c:374
+msgid "Others can write"
+msgstr "بإمكان الآخرين الكتابة"
+
+#: src/bin/e_fm_prop.c:376
+msgid "Owner can read"
+msgstr "بإمكان المالك القراءة"
+
+#: src/bin/e_fm_prop.c:378
+msgid "Owner can write"
+msgstr "بإمكان المالك الكتابة"
+
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
+#: src/modules/conf_transitions/e_int_config_transitions.c:167
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
+msgid "Preview"
+msgstr "معاينة"
+
+#: src/bin/e_fm_prop.c:431
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
+msgid "Default"
+msgstr "الافتراضي"
+
+#: src/bin/e_fm_prop.c:434
+msgid "Thumbnail"
+msgstr "صورة مصغرة"
+
+#: src/bin/e_fm_prop.c:437
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr "مخصص"
+
+#: src/bin/e_fm_prop.c:447
+msgid "Use this icon for all files of this type"
+msgstr "استخدم هذه الأيقونة لكل الملفات من هذا النوع"
+
+#: src/bin/e_fm_prop.c:455
+msgid "Link Information"
+msgstr "اربط المعلومة"
+
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr "اختر صورة"
+
+#: src/bin/e_fm_hal.c:183
+#, c-format
+msgid "%llu TiB"
+msgstr "%llu تيرا.ب."
+
+#: src/bin/e_fm_hal.c:185
+#, c-format
+msgid "%llu GiB"
+msgstr "%llu جيجا.ب."
+
+#: src/bin/e_fm_hal.c:187
+#, c-format
+msgid "%llu MiB"
+msgstr "%llu ميجا.ب."
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu KiB"
+msgstr "%llu كيلو.ب."
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu B"
+msgstr "%llu بايت"
+
+#: src/bin/e_fm_hal.c:222
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:320
+msgid "Removable Device"
+msgstr "جهاز قابل للازالة"
+
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
+msgid "Plain"
+msgstr "واضح"
+
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
+msgid "Inset"
+msgstr "داخلي"
+
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
+msgid "Appearance"
+msgstr "المظهر"
+
+#: src/bin/e_gadcon.c:1385
+msgid "Automatically scroll contents"
+msgstr "لف المحتويات تلقائياً"
+
+#: src/bin/e_gadcon.c:1392
+msgid "Able to be resized"
+msgstr "قابل للتحجيم"
+
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
+msgid "Begin move/resize this gadget"
+msgstr "إبدأ تحريك\\تحجيم هذه الاداة"
+
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
+msgid "Remove this gadget"
+msgstr "أزِل هذه الأداة"
+
+#: src/bin/e_gadcon.c:1891
+msgid "Stop move/resize this gadget"
+msgstr "أوقِف تحريك\\تحجيم هذه الأداة"
+
+#: src/bin/e_hints.c:151
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"on this screen. Aborting startup.\n"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
+msgid "Window Locks"
+msgstr "قفول النافذة"
+
+#: src/bin/e_int_border_locks.c:285
+msgid "Generic Locks"
+msgstr "القفول العامة"
+
+#: src/bin/e_int_border_locks.c:286
+msgid "Lock the Window so it does only what I tell it to"
+msgstr "أقفل النافذة فلن تفعل إلى ما أأمرها بفعله"
+
+#: src/bin/e_int_border_locks.c:288
+msgid "Protect this window from me accidentally changing it"
+msgstr "أحمي هذه النافذة من أن اغيرها بالخطأ"
+
+#: src/bin/e_int_border_locks.c:290
+msgid ""
+"Protect this window from being accidentally closed because it is important"
+msgstr "احمي هذه النافذة من أن تغلق بالخطأ لئنها مهمة"
+
+#: src/bin/e_int_border_locks.c:292
+msgid "Do not allow the border to change on this window"
+msgstr "لا تسمح للحدود بالتغير في هذه النافذة"
+
+#: src/bin/e_int_border_locks.c:295
+msgid "Remember these Locks for this window next time it appears"
+msgstr "تذكر هذه القفول لهذه النافذة ستظهر في المرة القادمة"
+
+#: src/bin/e_int_border_locks.c:308
+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:702
+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:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:637
+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:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
+msgid "Stacking"
+msgstr "ترصيص"
+
+#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
+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:720
+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:726
+msgid "Shaded state"
+msgstr "حالة تضليل"
+
+#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
+msgid "Maximized state"
+msgstr "حالة تكبير"
+
+#: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
+#: src/bin/e_int_border_remember.c:729
+msgid "Fullscreen state"
+msgstr "حالة كامل الشاشة"
+
+#: src/bin/e_int_border_locks.c:327
+msgid "Lock me from changing:"
+msgstr "أقفلني من التغيير:"
+
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
+msgid "Border style"
+msgstr "نمط الحدود"
+
+#: src/bin/e_int_border_locks.c:348
+msgid "Stop me from:"
+msgstr "أوقفني من:"
+
+#: src/bin/e_int_border_locks.c:349
+msgid "Closing the window"
+msgstr "جار يإلاق النافذة"
+
+#: src/bin/e_int_border_locks.c:351
+msgid "Exiting my login with this window open"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:355
+msgid "Remember these Locks"
+msgstr "تذكر هذه القفول"
+
+#: src/bin/e_int_border_menu.c:73
+msgid "Edit Icon"
+msgstr "عدل الأيقونة"
+
+#: src/bin/e_int_border_menu.c:78
+msgid "Add Application..."
+msgstr "أضف تطبيق..."
+
+#: src/bin/e_int_border_menu.c:89
+msgid "Create Icon"
+msgstr "انشئ أيقونة"
+
+#: src/bin/e_int_border_menu.c:99
+msgid "Send to Desktop"
+msgstr "أرسل لسطح المكتب"
+
+#: src/bin/e_int_border_menu.c:111
+msgid "Pin to Desktop"
+msgstr "الصق في سطح المكتب"
+
+#: src/bin/e_int_border_menu.c:122
+msgid "Unpin from Desktop"
+msgstr "أزل الصق من سطح المكتب"
+
+#: src/bin/e_int_border_menu.c:131
+msgid "More..."
+msgstr "أكثر..."
+
+#: src/bin/e_int_border_menu.c:171
+msgid "Iconify"
+msgstr "أَيْقَنة"
+
+#: src/bin/e_int_border_menu.c:368
+msgid "Maximize vertically"
+msgstr "كبر عمودياً"
+
+#: src/bin/e_int_border_menu.c:379
+msgid "Maximize horizontally"
+msgstr "كبِر افقياً"
+
+#: src/bin/e_int_border_menu.c:390
+msgid "Unmaximize"
+msgstr "ألغِ التكبير"
+
+#: src/bin/e_int_border_menu.c:491
+msgid "Keyboard Shortcut"
+msgstr "إختصار لوحة المفاتيح"
+
+#: src/bin/e_int_border_menu.c:497
+msgid "To Favorites Menu"
+msgstr "إلى قائمة المفضلات"
+
+#: src/bin/e_int_border_menu.c:502
+msgid "To Launcher"
+msgstr "إلى المشغل"
+
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
+msgid "Border"
+msgstr "الحدود"
+
+#: src/bin/e_int_border_menu.c:533
+msgid "Skip"
+msgstr "تخطّى"
+
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
+#: src/modules/conf_colors/e_int_config_color_classes.c:514
+msgid "State"
+msgstr "الحالة"
+
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
+msgid "Remember"
+msgstr "تذكّر"
+
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr "إعدادات النافذة"
+
+#: src/bin/e_int_border_menu.c:814
+msgid "Always On Top"
+msgstr "دائما في الأعلى"
+
+#: src/bin/e_int_border_menu.c:825
+#: 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:260
+msgid "Normal"
+msgstr "عادي"
+
+#: src/bin/e_int_border_menu.c:836
+msgid "Always Below"
+msgstr "دائماً في الأسفل"
+
+#: src/bin/e_int_border_menu.c:928
+msgid "Select Border Style"
+msgstr "إختر نمط الحدود"
+
+#: src/bin/e_int_border_menu.c:940
+msgid "Use E17 Default Icon Preference"
+msgstr "استخدم إعدادات الأيقونات الإفتراضية لإي17(E17)"
+
+#: src/bin/e_int_border_menu.c:949
+msgid "Use Application Provided Icon "
+msgstr "استخدم الأيقونة المقدمة بواسطة التطبيق "
+
+#: src/bin/e_int_border_menu.c:957
+msgid "Use User Defined Icon"
+msgstr "استخدم أيقونة المستخدم"
+
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr "مضلل"
+
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr "لاصق"
+
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
+msgid "Fullscreen"
+msgstr "كامل الشاشة"
+
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr "قائمة النوافذ"
+
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
+msgid "Pager"
+msgstr "المنادي"
+
+#: src/bin/e_int_border_menu.c:1092
+msgid "Taskbar"
+msgstr "شريط المهام"
+
+#: src/bin/e_int_border_prop.c:363
+msgid "NetWM"
+msgstr "NetWM"
+
+#: src/bin/e_int_border_prop.c:370
+msgid "ICCCM"
+msgstr "ICCCM"
+
+#: src/bin/e_int_border_prop.c:418
+msgid "ICCCM Properties"
+msgstr "خصائص ICCCM"
+
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
+msgid "Title"
+msgstr "العنوان"
+
+#: src/bin/e_int_border_prop.c:421
+msgid "Class"
+msgstr "الصف"
+
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+msgid "Icon Name"
+msgstr "اسم الأيقونة"
+
+#: src/bin/e_int_border_prop.c:423
+msgid "Machine"
+msgstr "الآلة"
+
+#: src/bin/e_int_border_prop.c:424
+msgid "Role"
+msgstr "الدّور"
+
+#: src/bin/e_int_border_prop.c:426
+msgid "Minimum Size"
+msgstr "أقل حجم"
+
+#: src/bin/e_int_border_prop.c:427
+msgid "Maximum Size"
+msgstr "أقصى حجم"
+
+#: src/bin/e_int_border_prop.c:428
+msgid "Base Size"
+msgstr "الحجم الأساسي"
+
+#: src/bin/e_int_border_prop.c:429
+msgid "Resize Steps"
+msgstr "أعِد تحجيم الخطوات"
+
+#: src/bin/e_int_border_prop.c:431
+msgid "Aspect Ratio"
+msgstr "معدل الترميز"
+
+#: src/bin/e_int_border_prop.c:432
+msgid "Initial State"
+msgstr "الأولي الحالة"
+
+#: src/bin/e_int_border_prop.c:434
+msgid "Window ID"
+msgstr "معرف النافذة"
+
+#: src/bin/e_int_border_prop.c:435
+msgid "Window Group"
+msgstr "مجموعة النوافذ"
+
+#: src/bin/e_int_border_prop.c:436
+msgid "Transient For"
+msgstr "عابر لـ"
+
+#: src/bin/e_int_border_prop.c:437
+msgid "Client Leader"
+msgstr "مدير العميل"
+
+#: src/bin/e_int_border_prop.c:438
+msgid "Gravity"
+msgstr "الجاذبيّة"
+
+#: src/bin/e_int_border_prop.c:441
+msgid "Take Focus"
+msgstr "أخذ تركيز"
+
+#: src/bin/e_int_border_prop.c:442
+msgid "Accepts Focus"
+msgstr "قبول التركيز"
+
+#: src/bin/e_int_border_prop.c:443
+msgid "Urgent"
+msgstr "عاجِل"
+
+#: src/bin/e_int_border_prop.c:444
+msgid "Request Delete"
+msgstr "اطلب حذف"
+
+#: src/bin/e_int_border_prop.c:445
+msgid "Request Position"
+msgstr "أطلب الموضع"
+
+#: src/bin/e_int_border_prop.c:466
+msgid "NetWM Properties"
+msgstr "خصائص NetWM"
+
+#: src/bin/e_int_border_prop.c:471
+msgid "Modal"
+msgstr "سائد"
+
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
+msgid "Skip Taskbar"
+msgstr "تخطى شريط المهام"
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
+msgid "Skip Pager"
+msgstr "تخطى المنادي"
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr "مخفي"
+
+#: src/bin/e_int_border_remember.c:85
+msgid "Window Remember"
+msgstr "تذكر النافذة"
+
+#: src/bin/e_int_border_remember.c:307
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:310
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window that <hilight>does not "
+"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
+"Transience, Role etc. properties<br>with more than 1 other window on the "
+"screen and remembering<br>properties for this window will apply to all other "
+"windows<br>that match these properties.<br><br>This is just a warning in "
+"case you did not intend this to happen.<br>If you did, simply press "
+"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your "
+"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
+"sure and nothing will be affected."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:515
+msgid "No match properties set"
+msgstr "لا مجموعة خيارات متطابقة"
+
+#: src/bin/e_int_border_remember.c:518
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window <hilight>without "
+"specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
+"way of remembering this window."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:614
+msgid "Nothing"
+msgstr "ﻻ شيء"
+
+#: src/bin/e_int_border_remember.c:616
+msgid "Size and Position"
+msgstr "الحجم والموضع"
+
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
+msgid "Locks"
+msgstr "القفول"
+
+#: src/bin/e_int_border_remember.c:620
+msgid "Size, Position and Locks"
+msgstr "الحجم, المكان والقفول"
+
+#: src/bin/e_int_border_remember.c:622
+msgid "Everything"
+msgstr "كل شئ"
+
+#: src/bin/e_int_border_remember.c:635
+msgid "Remember using"
+msgstr "تذكر الإستخدام"
+
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "اسم النافذة"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
+msgid "Window Role"
+msgstr "دور النافذة"
+
+#: src/bin/e_int_border_remember.c:686
+msgid "Window type"
+msgstr "نوع النافذة"
+
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
+msgid "Transience"
+msgstr "وقتية"
+
+#: src/bin/e_int_border_remember.c:701
+msgid "Properties to remember"
+msgstr "تذكر الإعدادات"
+
+#: src/bin/e_int_border_remember.c:717
+msgid "Icon Preference"
+msgstr "تفضيلات الأيقونة"
+
+#: src/bin/e_int_border_remember.c:723
+msgid "Virtual Desktop"
+msgstr "سطح مكتب إفتراضي"
+
+#: src/bin/e_int_border_remember.c:732
+msgid "Current Screen"
+msgstr "الشاشة الحالية"
+
+#: src/bin/e_int_border_remember.c:735
+msgid "Skip Window List"
+msgstr "تخطى قائمة النوافذ"
+
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "ملف البرنامج أو الاسم (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr "القائمة المتطابقة فقط"
+
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr "دائماً ركز عند البدء"
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "احتفظ بالإعدادات الحالِية"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "إبدأ هذا البرنامج عند تسجيل الدخول"
+
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
+#: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
+#: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
+#: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
+#: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1077
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+#: src/modules/wizard/page_050.c:26
+msgid "File Manager"
+msgstr "مدير الملفات"
+
+#: src/bin/e_int_config_modules.c:44
+msgid "Shelf"
+msgstr "الدرج"
+
+#: src/bin/e_int_config_modules.c:120
+msgid "Module Settings"
+msgstr "خيارات الوحدة"
+
+#: src/bin/e_int_config_modules.c:180
+msgid "Available Modules"
+msgstr "الوحدات المتاحة"
+
+#: src/bin/e_int_config_modules.c:187
+msgid "Load Module"
+msgstr "حمل وحدة"
+
+#: src/bin/e_int_config_modules.c:194
+msgid "Loaded Modules"
+msgstr "الوحدات المحملة"
+
+#: src/bin/e_int_config_modules.c:201
+msgid "Unload Module"
+msgstr "الغِ تحميل الوحدة"
+
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
+#: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
+#: src/bin/e_int_gadcon_config.c:205
+msgid "Description: Unavailable"
+msgstr "الوصف: غير متوفر"
+
+#: src/bin/e_int_gadcon_config.c:36
+msgid "Shelf Contents"
+msgstr "محتويات الدرج"
+
+#: src/bin/e_int_gadcon_config.c:42
+msgid "Toolbar Contents"
+msgstr "محتويات شريط الادواة"
+
+#: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr "الأدواة المتاحة"
+
+#: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr "إضافة أداة"
+
+#: src/bin/e_int_gadcon_config.c:133
+msgid "Selected Gadgets"
+msgstr "إختر أدوات"
+
+#: src/bin/e_int_gadcon_config.c:140
+msgid "Remove Gadget"
+msgstr "إزالة أداة"
+
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+msgid "Toolbar Settings"
+msgstr "خيارات شريط الأدواة"
+
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
+msgid "Layout"
+msgstr "المظهر"
+
+#: src/bin/e_intl.c:361
+msgid "Input Method Error"
+msgstr "طريقة المدخل خطأ"
+
+#: src/bin/e_intl.c:362
+msgid ""
+"Error starting the input method executable<br><br>please make sure that your "
+"input<br>method configuration is correct and<br>that your "
+"configuration's<br>executable is in your PATH<br>"
+msgstr ""
+
+#: src/bin/e_int_menus.c:89
+msgid "Main"
+msgstr "رئيسي"
+
+#: src/bin/e_int_menus.c:106
+msgid "Favorite Applications"
+msgstr "البرامج المفضلة"
+
+#: src/bin/e_int_menus.c:117
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
+msgid "Applications"
+msgstr "التطبيقات"
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
+#: 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 "النوافذ"
+
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
+msgid "Lost Windows"
+msgstr "النوافذ المفقودة"
+
+#: src/bin/e_int_menus.c:170
+msgid "About"
+msgstr "عن"
+
+#: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
+#: src/modules/conf_theme/e_mod_main.c:40
+#: src/modules/conf_theme/e_mod_main.c:84
+msgid "Theme"
+msgstr "السمة"
+
+#: src/bin/e_int_menus.c:262
+msgid "Virtual"
+msgstr "وهمي"
+
+#: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
+#: src/modules/conf_shelves/e_mod_main.c:41
+#: src/modules/conf_shelves/e_mod_main.c:85
+msgid "Shelves"
+msgstr "الأدرج"
+
+#: src/bin/e_int_menus.c:278
+msgid "Show/Hide All Windows"
+msgstr "أظهر\\أخفي"
+
+#: src/bin/e_int_menus.c:575
+msgid "(No Applications)"
+msgstr "(لا برامج)"
+
+#: src/bin/e_int_menus.c:709
+msgid "Set Virtual Desktops"
+msgstr "عين أسطح مكتب إفتراضية"
+
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
+msgid "(No Windows)"
+msgstr "( لا نوافذ )"
+
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
+msgid "No name!!"
+msgstr "لا اسم!!"
+
+#: src/bin/e_int_menus.c:1362
+msgid "(No Shelves)"
+msgstr "( لا أدرج )"
+
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr "الدرج #"
+
+#: src/bin/e_int_menus.c:1427
+msgid "Add A Shelf"
+msgstr "أضِف درج"
+
+#: src/bin/e_int_menus.c:1434
+msgid "Delete A Shelf"
+msgstr "احذف درج"
+
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr "إعدادات الدرج"
+
+#: src/bin/e_int_shelf_config.c:601
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr "صغير جداَ"
+
+#: src/bin/e_int_shelf_config.c:603
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
+msgid "Small"
+msgstr "صغير"
+
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr "متوسط"
+
+#: src/bin/e_int_shelf_config.c:607
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr "كبير"
+
+#: src/bin/e_int_shelf_config.c:609
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr "ضخم"
+
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
+msgid "Set Contents..."
+msgstr "عين المحتويات..."
+
+#: src/bin/e_int_shelf_config.c:641
+msgid "Above Everything"
+msgstr "فوق كل شيئ"
+
+#: src/bin/e_int_shelf_config.c:643
+msgid "Below Windows"
+msgstr "تحت النوافذ"
+
+#: src/bin/e_int_shelf_config.c:645
+msgid "Below Everything"
+msgstr "تحت كل شيئ"
+
+#: src/bin/e_int_shelf_config.c:647
+msgid "Allow windows to overlap the shelf"
+msgstr "اسمح للنوافذ بالتداخل مع الدرج"
+
+#: src/bin/e_int_shelf_config.c:694
+msgid "Shrink to Content Size"
+msgstr "اكمش لحجم المحتوى"
+
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
+msgid "%3.0f pixels"
+msgstr "%3.0f بكسل"
+
+#: src/bin/e_int_shelf_config.c:710
+msgid "Styles"
+msgstr "أنماط"
+
+#: src/bin/e_int_shelf_config.c:750
+msgid "Auto Hide"
+msgstr "إخفاء تلقائي"
+
+#: src/bin/e_int_shelf_config.c:751
+msgid "Auto-hide the shelf"
+msgstr "إخفاء تلقائي للدرج"
+
+#: src/bin/e_int_shelf_config.c:755
+msgid "Show on mouse in"
+msgstr "أظهر عند دخول الفأرة"
+
+#: src/bin/e_int_shelf_config.c:759
+msgid "Show on mouse click"
+msgstr "أظهر عند الضغط بالفأرة"
+
+#: src/bin/e_int_shelf_config.c:763
+msgid "Hide timeout"
+msgstr "أخف المهلة"
+
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
+msgid "%.1f seconds"
+msgstr "%.1f ثواني"
+
+#: src/bin/e_int_shelf_config.c:772
+msgid "Hide duration"
+msgstr "إخفاء الوقت"
+
+#: src/bin/e_int_shelf_config.c:788
+msgid "Show on all Desktops"
+msgstr "أظهر في كل أسطح المكتب"
+
+#: src/bin/e_int_shelf_config.c:790
+msgid "Show on specified Desktops"
+msgstr "أظهر في أسطح مكتب محددة"
+
+#: src/bin/e_ipc.c:47
+#, c-format
+msgid ""
+"Possible IPC Hack Attempt. The IPC socket\n"
+"directory already exists BUT has permissions\n"
+"that are too leanient (must only be readable\n"
+"and writable by the owner, and nobody else)\n"
+"or is not owned by you. Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_ipc.c:57
+#, c-format
+msgid ""
+"The IPC socket directory cannot be created or\n"
+"examined.\n"
+"Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_main.c:323
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:385
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:411
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:424
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:430
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:442
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:450
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:473
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:481
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:490
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:509
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:515
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software X11\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software X11 rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:522
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software Buffer rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:538 src/bin/e_main.c:545
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:559
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+
+#: src/bin/e_main.c:569
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:578
+msgid "Enlightenment cannot set up its config system."
+msgstr "إنجلتمنت غير قادر على بدء نظام الإعداد."
+
+#: src/bin/e_main.c:592
+msgid "Enlightenment cannot set up its scale system."
+msgstr "إنجلتمنت غير قادر على بدء نظام المسطرة."
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot set up the pointer system."
+msgstr "إنجلتمنت غير قادر على بدء نظام المؤشر."
+
+#: src/bin/e_main.c:609
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:627
+msgid "Enlightenment cannot set up its font system."
+msgstr "إنجلتمنت غير قادر على بدء نظام الخطوط."
+
+#: src/bin/e_main.c:638
+msgid "Enlightenment cannot set up its theme system."
+msgstr "إنجلتمنت غير قادر على بدء نظام السمات."
+
+#: src/bin/e_main.c:643
+msgid "Starting International Support"
+msgstr "جاري بدء الدعم الدولي"
+
+#: src/bin/e_main.c:648
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:664
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:676
+msgid "Testing Format Support"
+msgstr "جاري فحص دعم الصيغة"
+
+#: src/bin/e_main.c:687
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:698
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:707
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:716
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:727
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:737
+msgid "Setup Screens"
+msgstr "بدء الشاشات"
+
+#: src/bin/e_main.c:742
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+
+#: src/bin/e_main.c:748
+msgid "Setup Screensaver"
+msgstr "بدء حافظة الشاشة"
+
+#: src/bin/e_main.c:753
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:757
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:762
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:775
+msgid "Setting up Paths"
+msgstr "بدء المسارات"
+
+#: src/bin/e_main.c:792
+msgid "Setup System Controls"
+msgstr "إعداد متحكمات النظام"
+
+#: src/bin/e_main.c:797
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:802
+msgid "Setup Actions"
+msgstr "أفعال الإعداد"
+
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:811
+msgid "Setup Execution System"
+msgstr "إعداد نظام الإعدام"
+
+#: src/bin/e_main.c:816
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:824
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:829
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
+msgstr "إعداد نظام الرسائل"
+
+#: src/bin/e_main.c:849
+msgid "Enlightenment cannot set up its msg system."
+msgstr "إنجلتمنت غير قادر على بدء نظام الرسائل."
+
+#: src/bin/e_main.c:854
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:864
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:869
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:874
+msgid "Setup Modules"
+msgstr "بدء الوحدات"
+
+#: src/bin/e_main.c:879
+msgid "Enlightenment cannot set up its module system."
+msgstr "أنجلتمنت غيرقادر على بدء نظام الوحدات."
+
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Color Classes"
+msgstr "إعداد أسناف الألوان"
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its color class system."
+msgstr "أنجلتمنت غير قادر على بدء نظام الألوان."
+
+#: src/bin/e_main.c:904
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:923
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Wallpaper"
+msgstr "تعيين خلفية"
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Mouse"
+msgstr "تعيين فأرة"
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr "إنجلتمنت غير قادر على إعدادات خيارات الفأرة"
+
+#: src/bin/e_main.c:952
+msgid "Setup Bindings"
+msgstr "إعداد الأغلفة"
+
+#: src/bin/e_main.c:957
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:962
+msgid "Setup Popups"
+msgstr "إعداد النوافذ المنبثقة"
+
+#: src/bin/e_main.c:967
+msgid "Enlightenment cannot set up its popup system."
+msgstr "إننجلتمنت غير قادر على بدء نظام النوافذ المنبثقة"
+
+#: src/bin/e_main.c:972
+msgid "Setup Shelves"
+msgstr "إعداد الأدرج"
+
+#: src/bin/e_main.c:977
+msgid "Enlightenment cannot set up its shelf system."
+msgstr "إنجلتمنت غير قادر على بدء نظام الأدرج"
+
+#: src/bin/e_main.c:982
+msgid "Setup Thumbnailer"
+msgstr "إعداد مصغر الصور"
+
+#: src/bin/e_main.c:987
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr "أنجلتمنت غير قادر على بدء نظام تشغير الصور\n"
+
+#: src/bin/e_main.c:992
+msgid "Set Up File Ordering"
+msgstr "إعداد ترتيب الملفات"
+
+#: src/bin/e_main.c:996
+msgid "Enlightenment cannot set up its order file system."
+msgstr "إننجلتمنت غير قادر على بدء نظام ترتيب الملفات."
+
+#: src/bin/e_main.c:1031
+msgid "Load Modules"
+msgstr "تحميل الوحدات"
+
+#: src/bin/e_main.c:1039
+msgid ""
+"Enlightenment crashed early on start and has<br>been restarted. All modules "
+"have been disabled<br>and will not be loaded to help remove any "
+"problem<br>modules from your configuration. The module<br>configuration "
+"dialog should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1046
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1047
+msgid ""
+"Enlightenment crashed early on start and has been restarted.<br>All modules "
+"have been disabled and will not be loaded to help<br>remove any problem "
+"modules from your configuration.<br><br>The module configuration dialog "
+"should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1055
+msgid "Configure Shelves"
+msgstr "التحكم في الأدرج"
+
+#: src/bin/e_main.c:1066
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:126
+#, 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:130 src/bin/e_module.c:143 src/bin/e_module.c:160
+msgid "Error loading Module"
+msgstr "خلل في تحميل الوحدة"
+
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
+#, 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:159
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:173
+#, c-format
+msgid ""
+"Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
+"module API version of: %i.<br>The module API advertized by Enlightenment is: "
+"%i.<br>"
+msgstr ""
+
+#: src/bin/e_module.c:178
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr "وحدة إنجلتمنت %s"
+
+#: src/bin/e_module.c:501
+msgid "Would you like to unload this module?<br>"
+msgstr "هل ترغب في إلغاء تحميل هذه الوحدة؟<br>"
+
+#: src/bin/e_screensaver.c:99
+msgid ""
+"You disabled screensaver too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
+msgid "Are you sure you want to delete this shelf?"
+msgstr "هل أنت متأكد أنك تريد حذف هذا الدرج؟"
+
+#: src/bin/e_shelf.c:1297
+msgid ""
+"You requested to delete this shelf.<br><br>Are you sure you want to delete "
+"it?"
+msgstr "لقد طلبت حذف هذا الدرج.<br><br>هل أنت متاكد أنك تريد حذفه؟"
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
+msgid "Stop Moving/Resizing Items"
+msgstr "أوقف تحريك\\تحجيم العناصر"
+
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr "إبدء تحريك\\تحجيم العناصر"
+
+#: src/bin/e_shelf.c:1705
+msgid "Set Shelf Contents"
+msgstr "عين محتويات للدرج"
+
+#: src/bin/e_shelf.c:1710
+msgid "Delete this Shelf"
+msgstr "احذف هذا الدرج"
+
+#: src/bin/e_startup.c:66
+msgid "Starting"
+msgstr "جاري البدء"
+
+#: src/bin/e_sys.c:170
+msgid "Checking System Permissions"
+msgstr "فحص صلاحيات النظام"
+
+#: src/bin/e_sys.c:208 src/bin/e_sys.c:219 src/bin/e_sys.c:228
+#: src/bin/e_sys.c:237
+msgid "System Check Done"
+msgstr "تم فحص النظام"
+
+#: src/bin/e_sys.c:312
+msgid "Logout problems"
+msgstr "أخطاء في تسجيل الخروج"
+
+#: src/bin/e_sys.c:315
+msgid ""
+"Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
+"want to finish the logout<br>anyway without closing these<br>applications "
+"first?"
+msgstr ""
+"تسجيل الخروج يستغرق الكثير من الوقت, بعض<br>البرامج يرفضون الإغلاق.<br>هل "
+"ترغب في إنهاء تسجيل الخروج<br>بأي حال دون إغلاق هذه<br>البرامج أولاً؟"
+
+#: src/bin/e_sys.c:321
+msgid "Logout now"
+msgstr "تسجيل الخروج الآن"
+
+#: src/bin/e_sys.c:322
+msgid "Wait longer"
+msgstr "أنتظر أكثر"
+
+#: src/bin/e_sys.c:323
+msgid "Cancel Logout"
+msgstr "إلغاء تسجيل الخروج"
+
+#: src/bin/e_sys.c:362
+msgid "Logout in progress"
+msgstr "جاري تسجيل الخروج"
+
+#: src/bin/e_sys.c:365
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr "جاري تسجيل الخروج.<br><hilight>يرجى الإنتضار.</hilight>"
+
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
+msgid "Enlightenment is busy with another request"
+msgstr "إنجلتمنت مشغول بطلب آخر"
+
+#: src/bin/e_sys.c:397
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+"جاري تسجيل الخروج.<br>لا يمكنك تطبيق أعمال أخرة<br>فور بدء تسجيل الخروج."
+
+#: src/bin/e_sys.c:405
+msgid ""
+"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
+"has been started."
+msgstr "جاري الإطفاء.<br>لا بمكنك إجارء أي عمل في النظام<br>فور بدء الإطفاء."
+
+#: src/bin/e_sys.c:412
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+"جاري إعادة التشغيل.<br>لا يمكنك إجراء أي عملية في النظام<br>فور بدء إعادة "
+"التشغيل."
+
+#: src/bin/e_sys.c:419
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+"جاري التعليق.<br>لا يمكنك إجراء أي عمل في النظام<br>قبل إكتمال التعليق."
+
+#: src/bin/e_sys.c:426
+msgid ""
+"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"complete."
+msgstr ""
+"جاري التنويم.<br>لا يمكنك إجراء أي عملية في النظام<br>قبل إكتمال هذه العملية."
+
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
+msgid "EEK! This should not happen"
+msgstr "أووبس! iهذا لا يجب أن يحدث"
+
+#: src/bin/e_sys.c:459
+msgid "Power off failed."
+msgstr "فشل إطفاء الحاسوب."
+
+#: src/bin/e_sys.c:464
+msgid "Reset failed."
+msgstr "فشلت الإعادة."
+
+#: src/bin/e_sys.c:469
+msgid "Suspend failed."
+msgstr "فشل التعليق."
+
+#: src/bin/e_sys.c:474
+msgid "Hibernate failed."
+msgstr "فشل التنويم."
+
+#: src/bin/e_sys.c:531
+msgid "Power off"
+msgstr "إطفاء"
+
+#: src/bin/e_sys.c:534
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr "جاري الإطفاء.<br><hilight>يرجى الإنتضار.</hilight>"
+
+#: src/bin/e_sys.c:558
+msgid "Resetting"
+msgstr "جاري الإعادة"
+
+#: src/bin/e_sys.c:561
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr "جاري الإعادة.<br><hilight>يرجى الإنتضار.</hilight>"
+
+#: src/bin/e_sys.c:584
+msgid "Suspending"
+msgstr "التعليق"
+
+#: src/bin/e_sys.c:587
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr "جاري التعليق.<br><hilight>يرجى الإنتضار.</hilight>"
+
+#: src/bin/e_sys.c:610
+msgid "Hibernating"
+msgstr "جاري التنويم"
+
+#: src/bin/e_sys.c:613
+msgid "Hibernating.<br><hilight>Please wait.</hilight>"
+msgstr "جاري التنويم.<br><hilight>يرجى الإنتضار.</hilight>"
+
+#: src/bin/e_theme_about.c:17
+msgid "About Theme"
+msgstr "عن السمة"
+
+#: src/bin/e_theme.c:42
+msgid "Set As Theme"
+msgstr "استخدمه كسمة"
+
+#: src/bin/e_toolbar.c:340
+msgid "Set Toolbar Contents"
+msgstr "تعيين محتويات شريط الأدوات"
+
+#: src/bin/e_utils.c:245
+msgid "Cannot exit - immortal windows."
+msgstr "لا يمكن الخروج - نوافذ خالدة."
+
+#: src/bin/e_utils.c:246
+msgid ""
+"Some windows are left still around with the Lifespan lock enabled. This "
+"means<br>that Enlightenment will not allow itself to exit until these "
+"windows have<br>been closed or have the lifespan lock removed.<br>"
+msgstr ""
+
+#: src/bin/e_utils.c:804
+#, c-format
+msgid "%'.0f Bytes"
+msgstr "%'.0f بايتات"
+
+#: src/bin/e_utils.c:808
+#, c-format
+msgid "%'.0f KB"
+msgstr "%'.0f ك.ب."
+
+#: src/bin/e_utils.c:812
+#, c-format
+msgid "%'.0f MB"
+msgstr "%'.0f م.ب."
+
+#: src/bin/e_utils.c:816
+#, c-format
+msgid "%'.1f GB"
+msgstr "%'.1f جيجابايت"
+
+#: src/bin/e_utils.c:836
+#, c-format
+msgid "In the Future"
+msgstr "في المستقبل"
+
+#: src/bin/e_utils.c:841
+#, c-format
+msgid "In the last Minute"
+msgstr "في الدقيقة الأخيرة"
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "%li Years ago"
+msgstr "قبل %li سنة\\سنوات"
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Months ago"
+msgstr "قبل %li شهر\\أشهر"
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Weeks ago"
+msgstr "قبل %li اسبوع\\اسابيع"
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Days ago"
+msgstr "قبل %li يوم\\أيام"
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Hours ago"
+msgstr "قبل %li ساعة\\ساعات"
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Minutes ago"
+msgstr "قبل %li دقيقة\\دقائق"
+
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
+msgid "Unknown"
+msgstr "غير معروف"
+
+#: src/bin/e_widget_config_list.c:63
+#: src/modules/conf_applications/e_int_config_apps.c:243
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
+#: src/modules/conf_shelves/e_int_config_shelf.c:79
+#: src/modules/ibar/e_mod_config.c:110
+msgid "Add"
+msgstr "إضافة"
+
+#: src/bin/e_widget_config_list.c:69
+msgid "Remove"
+msgstr "حذف"
+
+#: src/bin/e_widget_config_list.c:83
+#: src/modules/conf_applications/e_int_config_apps.c:258
+msgid "Up"
+msgstr "أعلى"
+
+#: src/bin/e_widget_config_list.c:89
+#: src/modules/conf_applications/e_int_config_apps.c:263
+msgid "Down"
+msgstr "أسفل"
+
+#: src/bin/e_widget_fsel.c:292
+msgid "Add to Favorites"
+msgstr "أضف إلى المفضلات"
+
+#: src/bin/e_widget_fsel.c:298
+#: src/modules/conf_desklock/e_int_config_desklock.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:834
+#: src/modules/conf_startup/e_int_config_startup.c:275
+#: src/modules/conf_theme/e_int_config_theme.c:405
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr "أذهب أعلى مجلد"
+
+#: src/bin/e_widget_fsel.c:359
+msgid "Permissions:"
+msgstr "الصلاحيات:"
+
+#: src/bin/e_widget_fsel.c:375
+msgid "Modified:"
+msgstr "عُدّل:"
+
+#: src/bin/e_widget_fsel.c:614
+#, c-format
+msgid "You"
+msgstr "أنت"
+
+#: src/bin/e_widget_fsel.c:663
+#, c-format
+msgid "Protected"
+msgstr "محمي"
+
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
+#, c-format
+msgid "Read Only"
+msgstr "للقراءة فقط"
+
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
+#, c-format
+msgid "Forbidden"
+msgstr "ممنوع"
+
+#: src/bin/e_widget_fsel.c:690
+msgid "Read-Write"
+msgstr "قراءة-كتابة"
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr "إعدادات مرقب البطارية"
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Basic Settings"
+msgstr "إعدادات أساسية"
+
+#: src/modules/battery/e_mod_config.c:94
+msgid "Show alert when battery is low"
+msgstr "أظهر تنبيه عندما تكون البطارية ضعيفة"
+
+#: src/modules/battery/e_mod_config.c:138
+msgid "Check every:"
+msgstr "افحص كل:"
+
+#: src/modules/battery/e_mod_config.c:140
+#: src/modules/conf_performance/e_int_config_performance.c:149
+#: src/modules/temperature/e_mod_config.c:379
+#, c-format
+msgid "%1.0f ticks"
+msgstr "%1.0f لحضات"
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Polling"
+msgstr "الاقتراع"
+
+#: src/modules/battery/e_mod_config.c:147
+msgid "Show alert on low battery"
+msgstr "اظهر تنبيه على البطارية الضعيفة"
+
+#: src/modules/battery/e_mod_config.c:150
+msgid "Alert when at:"
+msgstr "تنبيه عندما على:"
+
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
+msgid "%1.0f min"
+msgstr "%1.0f دقيقة"
+
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
+msgid "%1.0f %%"
+msgstr "%1.0f %%"
+
+#: src/modules/battery/e_mod_config.c:158
+msgid "Auto dismiss in..."
+msgstr "طرد تلقائي خلال..."
+
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
+msgid "%1.0f sec"
+msgstr "%1.0f ثانية"
+
+#: src/modules/battery/e_mod_config.c:164
+msgid "Alert"
+msgstr "تنبيه"
+
+#: src/modules/battery/e_mod_config.c:170
+msgid "Auto Detect"
+msgstr "اكتشاف تلقائى"
+
+#: src/modules/battery/e_mod_config.c:172
+#: 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
+msgid "Internal"
+msgstr "داخلي"
+
+#: src/modules/battery/e_mod_config.c:174
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr "\"هال\""
+
+#: src/modules/battery/e_mod_config.c:177
+msgid "Hardware"
+msgstr "العتاد"
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr "البطارية"
+
+#: src/modules/battery/e_mod_main.c:847
+msgid "Your battery is low!"
+msgstr "بطاريتك ضعيفة!"
+
+#: src/modules/battery/e_mod_main.c:849
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:924
+msgid "N/A"
+msgstr "غير موجود"
+
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
+msgid "ERROR"
+msgstr "خطأ"
+
+#: src/modules/battery/e_mod_main.c:1096
+msgid "Battery Meter"
+msgstr "مقياس البطارية"
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr "الساعة"
+
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:244
+msgid "Presentation"
+msgstr "عرض تقديمي"
+
+#: src/modules/conf/e_mod_main.c:251
+msgid "Offline"
+msgstr "دون اتصال"
+
+#: src/modules/conf/e_mod_main.c:279
+msgid "Modes"
+msgstr "الأوضاع"
+
+#: src/modules/conf_applications/e_int_config_apps.c:50
+#: src/modules/conf_applications/e_mod_main.c:42
+msgid "Favorites Menu"
+msgstr "قائمة المفضلة"
+
+#: src/modules/conf_applications/e_int_config_apps.c:104
+#: src/modules/conf_applications/e_int_config_apps.c:119
+#: src/modules/conf_applications/e_mod_main.c:36
+msgid "IBar Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:135
+#: src/modules/conf_applications/e_mod_main.c:38
+msgid "Startup Applications"
+msgstr "تطبيقات بدء التشغيل"
+
+#: src/modules/conf_applications/e_int_config_apps.c:151
+#: src/modules/conf_applications/e_mod_main.c:37
+msgid "Restart Applications"
+msgstr "أعِد تشغيل البرامج"
+
+#: src/modules/conf_applications/e_int_config_apps.c:236
+#: src/modules/fileman/e_fwin.c:1869
+msgid "All Applications"
+msgstr "كل التطبيقات"
+
+#: src/modules/conf_applications/e_int_config_apps.c:250
+msgid "Selected Applications"
+msgstr "البرامج المحددة"
+
+#: src/modules/conf_applications/e_mod_main.c:34
+msgid "Apps"
+msgstr "تطبيقات"
+
+#: src/modules/conf_applications/e_mod_main.c:35
+msgid "New Application"
+msgstr "تطبيق جديد"
+
+#: src/modules/conf_applications/e_mod_main.c:40
+msgid "IBar Other"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_clientlist/e_mod_main.c:34
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
+msgid "Menus"
+msgstr "القوائم"
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:202
+msgid "Default Border Style"
+msgstr "نمط الحدود الإفتراضي"
+
+#: src/modules/conf_borders/e_int_config_borders.c:50
+msgid "Window Border Selection"
+msgstr "تحديد حدود النافذة"
+
+#: src/modules/conf_borders/e_int_config_borders.c:247
+msgid "Remember this Border for this window next time it appears"
+msgstr "تذكر هذا الإيطار لهذه النافذة عند ضهورها في المرة القادمة"
+
+#: 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
+#: src/modules/conf_icon_theme/e_mod_main.c:21
+#: src/modules/conf_mouse_cursor/e_mod_main.c:34
+#: src/modules/conf_scale/e_mod_main.c:34
+#: src/modules/conf_startup/e_mod_main.c:34
+#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_transitions/e_mod_main.c:34
+#: src/modules/conf_wallpaper/e_mod_main.c:28
+#: src/modules/dropshadow/e_mod_main.c:89
+msgid "Look"
+msgstr "المظهر"
+
+#: src/modules/conf_borders/e_mod_main.c:35
+msgid "Borders"
+msgstr "الحدود"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:40
+msgid "Client List Settings"
+msgstr "إعدادات قائمة العملاء"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:99
+msgid "Group By"
+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:664
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
+#: src/modules/conf_transitions/e_int_config_transitions.c:152
+#: src/modules/conf_transitions/e_int_config_transitions.c:204
+#: src/modules/conf_transitions/e_int_config_transitions.c:236
+msgid "None"
+msgstr "لا شيء"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:107
+msgid "Include windows from other screens"
+msgstr "تضمن نوافذ من شاشات أخرى"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:111
+msgid "Separate Groups By"
+msgstr "افصل المجموعات حسب"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:116
+msgid "Using separator bars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:118
+msgid "Using menus"
+msgstr "استخدام القوائم"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:122
+msgid "Client Sort Order"
+msgstr "ترتيب نوع العميل"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:126
+msgid "Alphabetical"
+msgstr "أبجدي"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:128
+msgid "Window stacking layer"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:130
+msgid "Most recently used"
+msgstr "الاكثر استخداماً مؤخراً"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:134
+msgid "Iconified Windows"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:136
+msgid "Group with owning desktop"
+msgstr "رتب حسب سطح المكتب المالك"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:138
+msgid "Group with current desktop"
+msgstr "رتب بسطح المكتب الحالي"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:140
+msgid "Separate group"
+msgstr "افصل المجموعة"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:142
+msgid "Warp to owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:146
+msgid "Menu Item Captions"
+msgstr "تعليقات عناصر القوائم"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:147
+msgid "Limit caption length"
+msgstr "تحديد طول التعليق"
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:149
+#, c-format
+msgid "%1.0f Chars"
+msgstr "%1.0f حروف"
+
+#: src/modules/conf_clientlist/e_mod_main.c:35
+msgid "Client List Menu"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:47
+msgid "Window Manager"
+msgstr "مدير النوافذ"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:48
+msgid "About Dialog Title"
+msgstr "عن عنوان الحوار"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:49
+msgid "About Dialog Version"
+msgstr "عن نسخة الحوار"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:50
+msgid "Border Title"
+msgstr "عنوان الحدود"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:51
+msgid "Settings Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:52
+msgid "Error Text"
+msgstr "نص الخطأ"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:53
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
+msgid "Menu Title"
+msgstr "عنوان القائمة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:54
+msgid "Menu Title Active"
+msgstr "عنوان القائمة مفعل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:55
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
+msgid "Menu Item"
+msgstr "عنصر قائمة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:56
+msgid "Menu Item Active"
+msgstr "عنصر القائمة مفعل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:57
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
+msgid "Move Text"
+msgstr "تحريك النص"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
+msgid "Resize Text"
+msgstr "تحجيم النص"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:59
+msgid "Winlist Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:60
+msgid "Winlist Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
+msgid "Winlist Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
+msgid "Widgets"
+msgstr "الأدوات"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:68
+msgid "Button Text"
+msgstr "نصّ الزر"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:69
+msgid "Button Text Disabled"
+msgstr "نص الزِر معطل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:70
+msgid "Check Text"
+msgstr "افحص النص"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:71
+msgid "Check Text Disabled"
+msgstr "فحص النص معطل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:72
+msgid "Entry Text"
+msgstr "نص المدخلة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:73
+msgid "Label Text"
+msgstr "نص العلامة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:74
+msgid "List Item Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:75
+msgid "List Item Odd Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
+msgid "List Header"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:77
+msgid "Radio Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:78
+msgid "Radio Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:79
+msgid "Slider Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:80
+msgid "Slider Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:87
+msgid "Module Label"
+msgstr "اسم تعليم الوحدة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:130
+#: src/modules/conf_colors/e_mod_main.c:35
+msgid "Colors"
+msgstr "الألوان"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:251
+msgid "Other"
+msgstr "أخرى"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:435
+msgid "Window Manager Colors"
+msgstr "ألوان مدير النوافذ"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:437
+#: src/modules/conf_colors/e_int_config_color_classes.c:445
+#: src/modules/conf_colors/e_int_config_color_classes.c:453
+#: src/modules/conf_colors/e_int_config_color_classes.c:517
+msgid "Enabled"
+msgstr "مفعل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:439
+#: src/modules/conf_colors/e_int_config_color_classes.c:447
+#: src/modules/conf_colors/e_int_config_color_classes.c:455
+#: src/modules/conf_colors/e_int_config_color_classes.c:522
+msgid "Disabled"
+msgstr "معطل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:443
+msgid "Widget Colors"
+msgstr "ألوان الأداة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:451
+msgid "Module Colors"
+msgstr "ألوان الوحدة"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:501
+msgid "Color Classes"
+msgstr "أصناف الألوان"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:529
+msgid "Object Color"
+msgstr "لون الكائن"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:538
+msgid "Outline Color"
+msgstr "لون الخط الخارجي"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:547
+msgid "Shadow Color"
+msgstr "لون الظل"
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:556
+msgid "Defaults"
+msgstr "الإفتراضيّات"
+
+#: src/modules/conf_desk/e_int_config_desk.c:52
+msgid "Desk Settings"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:149
+msgid "Desktop Name"
+msgstr "اسم سطح المكتب"
+
+#: src/modules/conf_desk/e_int_config_desk.c:150
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
+msgid "Name:"
+msgstr "الإسم:"
+
+#: src/modules/conf_desk/e_int_config_desk.c:156
+msgid "Desktop Wallpaper"
+msgstr "خلفية سطح المكتب"
+
+#: src/modules/conf_desk/e_int_config_desk.c:162
+#: src/modules/conf_mime/e_int_config_mime.c:193
+msgid "Set"
+msgstr "ضبط"
+
+#: src/modules/conf_desk/e_mod_main.c:35
+msgid "Desk"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
+msgid "Screen Lock Settings"
+msgstr "إعدادات قفل الشاشة"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
+msgid "Automatic Locking"
+msgstr "القفل التلقائي"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
+msgid "Lock when Enlightenment starts"
+msgstr "اقفل بعد بدء إنجلتمنت"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
+msgid "Lock when X screensaver activates"
+msgstr "اقفل عند تفعيل حافظة الشاشة أكس"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr "بعد مدة من تفعيل حافظة الشاشة"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:213
+#: src/modules/conf_desklock/e_int_config_desklock.c:443
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:189
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:207
+#, c-format
+msgid "%1.0f seconds"
+msgstr "%1.0f ثواني"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
+msgid "Lock when idle time exceeded"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
+msgid "Idle time to exceed"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:225
+#: src/modules/conf_dpms/e_int_config_dpms.c:208
+#: src/modules/conf_dpms/e_int_config_dpms.c:220
+#: src/modules/conf_dpms/e_int_config_dpms.c:232
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:143
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:181
+#, c-format
+msgid "%1.0f minutes"
+msgstr "%1.0f دقائق"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:298
+#: src/modules/conf_imc/e_int_config_imc.c:822
+#: src/modules/conf_startup/e_int_config_startup.c:262
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
+#: src/modules/gadman/e_mod_config.c:186
+msgid "Personal"
+msgstr "شخصي"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
+msgid "Login Box Settings"
+msgstr "إعدادات صندوق تسجيل الدخول"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
+msgid "Show on all screen zones"
+msgstr "اعرض في كل مناطق الشاشة"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
+msgid "Show on current screen zone"
+msgstr "اعرض في منطقة الشاشة الحالية"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
+msgid "Show on screen zone #:"
+msgstr "أعرض على منطقة الشاشة #:"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:406
+#: src/modules/conf_desks/e_int_config_desks.c:247
+#: src/modules/conf_desks/e_int_config_desks.c:251
+#: src/modules/conf_desks/e_int_config_desks.c:284
+#: src/modules/conf_desks/e_int_config_desks.c:288
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:117
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:121
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:125
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:170
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:174
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:178
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
+#: src/modules/fileman/e_mod_config.c:229
+#, c-format
+msgid "%1.0f"
+msgstr "%1.0f"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
+msgid "Wallpaper Mode"
+msgstr "نمط الخلفية"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
+#: src/modules/gadman/e_mod_config.c:149
+msgid "Theme Defined"
+msgstr "عُينَت السمة"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
+msgid "Theme Wallpaper"
+msgstr "خلفية السمة"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr "خلفية المستخدم"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:433
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+msgid "Enter Presentation Mode"
+msgstr "ادخل نمط العرض"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:435
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:197
+msgid "Suggest entering presentation mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:439
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:202
+msgid "If deactivated before"
+msgstr "إذ ألغي التفعيل من قبل"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
+msgid "Custom Screenlock"
+msgstr "قفل شاشة مخصص"
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
+msgid "Use custom screenlock"
+msgstr "استخدم قفل شاشة مخصص"
+
+#: src/modules/conf_desklock/e_mod_main.c:35
+msgid "Screen Lock"
+msgstr "قفل الشاشة"
+
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:822
+msgid "Virtual Desktops Settings"
+msgstr "إعدادات أسطح المكتب الإفتراضية"
+
+#: src/modules/conf_desks/e_int_config_desks.c:239
+msgid "Number of Desktops"
+msgstr "عدد أسطح المكتب"
+
+#: src/modules/conf_desks/e_int_config_desks.c:258
+#: src/modules/conf_desks/e_int_config_desks.c:295
+msgid "Desktop Mouse Flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:259
+msgid "Animated flip"
+msgstr "قلب متحرك"
+
+#: src/modules/conf_desks/e_int_config_desks.c:277
+msgid "Desktops"
+msgstr "أسطح المكتب"
+
+#: src/modules/conf_desks/e_int_config_desks.c:296
+msgid "Flip when dragging objects to the screen edge"
+msgstr "قلب عند تحريك عناصر إلى حدود الشاشة"
+
+#: src/modules/conf_desks/e_int_config_desks.c:298
+msgid "Wrap desktops around when flipping"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:302
+msgid "Flip Animation"
+msgstr "حركة القلب"
+
+#: src/modules/conf_desks/e_int_config_desks.c:304
+msgid "Off"
+msgstr "لا يعمل"
+
+#: src/modules/conf_desks/e_int_config_desks.c:307
+msgid "Pane"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:310
+msgid "Zoom"
+msgstr "تكبير"
+
+#: src/modules/conf_desks/e_int_config_desks.c:313
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:146
+#, c-format
+msgid "%1.1f sec"
+msgstr "%1.1f ثواني"
+
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_mod_main.c:35
+msgid "Virtual Desktops"
+msgstr "أسطح المكتب الإفتراضية"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
+msgid "Dialog Settings"
+msgstr "إعدادات الحوار"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
+#: src/modules/conf_engine/e_int_config_engine.c:94
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:114
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
+#: src/modules/conf_performance/e_int_config_performance.c:94
+#: src/modules/conf_performance/e_int_config_performance.c:134
+#: src/modules/conf_winlist/e_int_config_winlist.c:144
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
+#: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
+#: src/modules/mixer/conf_module.c:96
+msgid "General Settings"
+msgstr "الإعدادات العامة"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+msgid "Normal Windows"
+msgstr "النوافذ العادية"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
+msgid "Default Settings Dialogs Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
+msgid "Basic Mode"
+msgstr "النمط الأساسي"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
+msgid "Advanced Mode"
+msgstr "النمط المتقدم"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
+msgid "Default Dialog Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_mod_main.c:35
+msgid "Dialogs"
+msgstr "الحوارات"
+
+#: src/modules/conf_display/e_int_config_display.c:129
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:136
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:146
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:153
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:190
+msgid "Resolution change"
+msgstr "تغيير الدقة"
+
+#: src/modules/conf_display/e_int_config_display.c:194
+msgid "Save"
+msgstr "حفظ"
+
+#: src/modules/conf_display/e_int_config_display.c:195
+msgid "Restore"
+msgstr "إسترجاع"
+
+#: src/modules/conf_display/e_int_config_display.c:228
+msgid "Screen Resolution Settings"
+msgstr "إعدادات دقة الشاشة"
+
+#: src/modules/conf_display/e_int_config_display.c:404
+msgid "Resolution"
+msgstr "الدقة"
+
+#: src/modules/conf_display/e_int_config_display.c:411
+msgid "Restore on login"
+msgstr "استعد قبل تسجيل الدخول"
+
+#: src/modules/conf_display/e_int_config_display.c:415
+msgid "Refresh"
+msgstr "تحديث"
+
+#: src/modules/conf_display/e_int_config_display.c:474
+msgid "Rotation"
+msgstr "الدوران"
+
+#: src/modules/conf_display/e_int_config_display.c:493
+msgid "Mirroring"
+msgstr "الإنعكاس"
+
+#: src/modules/conf_display/e_int_config_display.c:640
+msgid "Missing Features"
+msgstr "مميزات مفقودة"
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid ""
+"Your X Display Server is missing support for<br>the <hilight>XRandR</"
+"hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
+"resolutions without<br>the support of this extension. It could also "
+"be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
+"XRandR support detected."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:653
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:654
+msgid ""
+"No refresh rates were reported by your X Display Server.<br>If you are "
+"running a nested X Display Server, then<br>this is to be expected. However, "
+"if you are not, then<br>the current refresh rate will be used when "
+"setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
+"screen."
+msgstr ""
+
+#: src/modules/conf_display/e_mod_main.c:35
+msgid "Screen Resolution"
+msgstr "دقة الشاشة"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:60
+#: src/modules/conf_dpms/e_int_config_dpms.c:81
+msgid "Display Power Management Signaling"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:61
+msgid "The current display server is not <br>DPMS capable."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:82
+msgid "The current display server does not <br>have the DPMS extension."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:112
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
+msgid "Enable Display Power Management"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
+msgid "Timers"
+msgstr "المؤقتات"
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
+msgid "Standby time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
+msgid "Suspend time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
+msgid "Off time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_mod_main.c:35
+msgid "Power Management"
+msgstr "إدارة الطاقة"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
+#: 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 "<دون>"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+msgid ""
+"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+msgid "Add Edge"
+msgstr "أضف الحافة"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
+msgid "Delete Edge"
+msgstr "احذف الحافة"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
+msgid "Modify Edge"
+msgstr "عدّل الحافة"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
+msgid "Delete All"
+msgstr "حذف الكل"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:243
+msgid "Restore Default Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:248
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
+msgid "Action"
+msgstr "الإجراء"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
+msgid "Action Params"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
+msgid "General Options"
+msgstr "الخيارات العامة"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
+msgid "%.2f seconds"
+msgstr "%.2f ثواني"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
+msgid ""
+"The binding key sequence, that you choose, is already used by <br><hilight>%"
+"s</hilight> action.<br>Please choose another binding edge sequence."
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:811
+msgid "CTRL"
+msgstr "كنترول"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:816
+msgid "ALT"
+msgstr "ألت"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:822
+msgid "SHIFT"
+msgstr "شفت"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:828
+msgid "WIN"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
+#: src/modules/conf_keybindings/e_mod_main.c:34
+#: src/modules/conf_mousebindings/e_mod_main.c:34
+#: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
+#: src/modules/mixer/app_mixer.c:301
+msgid "Input"
+msgstr "الدخْل"
+
+#: src/modules/conf_engine/e_int_config_engine.c:38
+msgid "Engine Settings"
+msgstr "إعدادات المحرك"
+
+#: src/modules/conf_engine/e_int_config_engine.c:95
+msgid "Enable Composite"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:102
+msgid "Default Engine"
+msgstr "المحرك الإفتراضي"
+
+#: src/modules/conf_engine/e_int_config_engine.c:131
+msgid "Enable Composite Support ?"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:133
+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 ""
+
+#: src/modules/conf_engine/e_mod_main.c:35
+msgid "Engine"
+msgstr "المحرك"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:49
+msgid "Run Command Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:115
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:168
+msgid "Maximum Number of Matched Apps to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:119
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:172
+msgid "Maximum Number of Matched Exes to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:123
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:176
+msgid "Maximum History to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:129
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:182
+#: src/modules/conf_winlist/e_int_config_winlist.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:269
+msgid "Scroll Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:130
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:184
+#: src/modules/conf_winlist/e_int_config_winlist.c:270
+msgid "Scroll Animate"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:185
+#: src/modules/conf_winlist/e_int_config_winlist.c:272
+msgid "Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:189
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:228
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:232
+#: src/modules/conf_winlist/e_int_config_winlist.c:261
+#: src/modules/conf_winlist/e_int_config_winlist.c:276
+#: src/modules/conf_winlist/e_int_config_winlist.c:287
+#: src/modules/conf_winlist/e_int_config_winlist.c:291
+#, c-format
+msgid "%1.2f"
+msgstr "%1.2f"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:197
+msgid "Terminal Settings"
+msgstr "خيارات الطرفية"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:198
+msgid "Terminal Command (CTRL+RETURN to utilize)"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:206
+#: src/modules/conf_winlist/e_int_config_winlist.c:295
+msgid "Size Settings"
+msgstr "اعدادات الحجم"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:207
+#: src/modules/conf_winlist/e_int_config_winlist.c:296
+msgid "Minimum Width"
+msgstr "أدنى عرض"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:209
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:213
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:217
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:221
+#: src/modules/conf_winlist/e_int_config_winlist.c:298
+#: src/modules/conf_winlist/e_int_config_winlist.c:302
+#: src/modules/conf_winlist/e_int_config_winlist.c:306
+#: src/modules/conf_winlist/e_int_config_winlist.c:310
+#, c-format
+msgid "%4.0f"
+msgstr "%4.0f"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:211
+#: src/modules/conf_winlist/e_int_config_winlist.c:300
+msgid "Minimum Height"
+msgstr "أدنى طول"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:215
+#: src/modules/conf_winlist/e_int_config_winlist.c:304
+msgid "Maximum Width"
+msgstr "أقصى عرض"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:219
+#: src/modules/conf_winlist/e_int_config_winlist.c:308
+msgid "Maximum Height"
+msgstr "أقصى طول"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:225
+#: src/modules/conf_winlist/e_int_config_winlist.c:284
+msgid "Position Settings"
+msgstr "إعدادات الموضع"
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:226
+#: src/modules/conf_winlist/e_int_config_winlist.c:285
+msgid "X-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:230
+#: src/modules/conf_winlist/e_int_config_winlist.c:289
+msgid "Y-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
+#: src/modules/exebuf/e_mod_main.c:129
+msgid "Run Command"
+msgstr "نفّذ الأمر"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
+msgid "Core"
+msgstr "اللبّ"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
+msgid "Title Bar"
+msgstr "شريط العنوان"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
+msgid "Textblock Plain"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
+msgid "Textblock Light"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
+msgid "Textblock Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
+msgid "Settings Heading"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
+msgid "About Title"
+msgstr "عن العنوان"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
+msgid "About Version"
+msgstr "عن النسخة"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
+msgid "About Text"
+msgstr "عن النص"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
+msgid "Desklock Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
+msgid "Desklock Password"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
+msgid "Dialog Error"
+msgstr "خلل في صندوق الحوار"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
+msgid "Exebuf Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
+msgid "Splash Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
+msgid "Splash Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
+msgid "Splash Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
+msgid "Entry"
+msgstr "الإدخال"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
+msgid "Frame"
+msgstr "الإطار"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
+msgid "Label"
+msgstr "التسمية"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
+msgid "Buttons"
+msgstr "الأزرار"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
+msgid "Slider"
+msgstr "شريط التمرير"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
+msgid "Radio Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
+msgid "Check Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
+msgid "Text List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
+msgid "List Item"
+msgstr "عنصر قائمة"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
+msgid "Filemanager"
+msgstr "مدير الملفات"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
+msgid "Typebuf"
+msgstr ""
+
+#: 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:104
+msgid "Normal Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
+msgid "Large Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
+msgid "Font Settings"
+msgstr "إعدادات الخط"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
+msgid "Big"
+msgstr "كبير"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
+msgid "Really Big"
+msgstr "كبير جداً"
+
+#: 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:427
+msgid "Enable Custom Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
+#: 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:451
+msgid "Basic preview text: 123: 我的天空!"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:604
+msgid "Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
+msgid "Hinting"
+msgstr "التلميح"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
+#: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
+msgid "Automatic"
+msgstr "تلقائي"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
+msgid "Icon Theme Settings"
+msgstr "إعدادات سمة الأيقونات"
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
+msgid "Icon Themes"
+msgstr "سمات الأيقونات"
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
+msgid "Icon theme overrides general theme"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_mod_main.c:22
+msgid "Icon Theme"
+msgstr "سِمة الأيقونات"
+
+#: src/modules/conf_imc/e_int_config_imc.c:109
+#: src/modules/conf_imc/e_mod_main.c:35
+msgid "Input Method Settings"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:297
+msgid "Input Method Selector"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:300
+#: src/modules/conf_imc/e_int_config_imc.c:894
+msgid "Use No Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:961
+msgid "Setup Selected Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:901
+msgid "New"
+msgstr "جديد"
+
+#: src/modules/conf_imc/e_int_config_imc.c:903
+msgid "Import..."
+msgstr "استيراد..."
+
+#: src/modules/conf_imc/e_int_config_imc.c:908
+msgid "Input Method Parameters"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:918
+msgid "Execute Command"
+msgstr "نفذ الأمر"
+
+#: src/modules/conf_imc/e_int_config_imc.c:925
+msgid "Setup Command"
+msgstr "إعداد أمر"
+
+#: src/modules/conf_imc/e_int_config_imc.c:934
+msgid "Exported Environment Variables"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:66
+msgid "Select an Input Method Settings..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:281
+#: src/modules/conf_imc/e_int_config_imc_import.c:296
+msgid "Input Method Config Import Error"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:282
+msgid ""
+"Enlightenment was unable to import the configuration.<br><br>Are you sure "
+"this is really a valid configuration?"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:297
+msgid ""
+"Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
+#: src/modules/wizard/page_010.c:142
+msgid "Language"
+msgstr "اللغة"
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:37
+msgid "Interaction Settings"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:94
+msgid "Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:96
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:100
+msgid "Threshold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:103
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:107
+msgid "Threshold for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:110
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:114
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:117
+#, 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:583
+#: src/modules/conf_intl/e_mod_main.c:35
+msgid "Language Settings"
+msgstr "إعدادات اللغة"
+
+#: src/modules/conf_intl/e_int_config_intl.c:900
+#: src/modules/conf_intl/e_int_config_intl.c:977
+msgid "Language Selector"
+msgstr "إختيار اللغة"
+
+#: src/modules/conf_intl/e_int_config_intl.c:950
+#: src/modules/conf_intl/e_int_config_intl.c:1028
+msgid "Locale Selected"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:951
+#: src/modules/conf_intl/e_int_config_intl.c:1029
+msgid "Locale"
+msgstr "المحليات"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
+msgid ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:92
+msgid "Key Binding Settings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:223
+#: src/modules/conf_keybindings/e_mod_main.c:35
+msgid "Key Bindings"
+msgstr "ربط المفاتيح"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:228
+msgid "Add Key"
+msgstr "أضِف مفتَاح"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:231
+msgid "Delete Key"
+msgstr "مذف مفتاح"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:235
+msgid "Modify Key"
+msgstr "تعدل مفتاح"
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:918
+msgid "Key Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
+msgid "Binding Key Error"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1130
+#, 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:44
+#: src/modules/conf_menus/e_int_config_menus.c:110
+#: src/modules/conf_menus/e_int_config_menus.c:169
+#: src/modules/conf_menus/e_mod_main.c:35
+msgid "Menu Settings"
+msgstr "إعدادات القائمة"
+
+#: src/modules/conf_menus/e_int_config_menus.c:101
+#: src/modules/conf_menus/e_int_config_menus.c:160
+msgid "Main Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:102
+#: src/modules/conf_menus/e_int_config_menus.c:161
+msgid "Show Favorites In Main Menu"
+msgstr "أعرض المفضلات في القائمة الرئيسية"
+
+#: src/modules/conf_menus/e_int_config_menus.c:105
+#: src/modules/conf_menus/e_int_config_menus.c:164
+msgid "Show Applications In Main Menu"
+msgstr "أعرض التطبيقات في القائمة الرئيسية"
+
+#: 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 "أعرض الاسم في القائمة"
+
+#: src/modules/conf_menus/e_int_config_menus.c:114
+#: src/modules/conf_menus/e_int_config_menus.c:173
+msgid "Show Generic In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:117
+#: src/modules/conf_menus/e_int_config_menus.c:176
+msgid "Show Comment In Menu"
+msgstr "أعرض التعليقات في القائمة"
+
+#: src/modules/conf_menus/e_int_config_menus.c:181
+msgid "Autoscroll Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:182
+msgid "Autoscroll Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:184
+#: src/modules/conf_menus/e_int_config_menus.c:189
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:136
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:144
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:152
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
+#, c-format
+msgid "%2.0f pixels"
+msgstr "%2.0f بكسل"
+
+#: src/modules/conf_menus/e_int_config_menus.c:187
+msgid "Autoscroll Cursor Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:194
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
+msgid "Miscellaneous Options"
+msgstr "خيارات متنوعة"
+
+#: src/modules/conf_menus/e_int_config_menus.c:195
+msgid "Menu Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:197
+#, c-format
+msgid "%5.0f pixels/sec"
+msgstr "%5.0f بسكل\\ثانية"
+
+#: src/modules/conf_menus/e_int_config_menus.c:200
+msgid "Fast Mouse Move Threshhold"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:202
+#: src/modules/conf_window_display/e_int_config_window_display.c:229
+#, c-format
+msgid "%4.0f pixels/sec"
+msgstr "%4.0f بكسل ثانية"
+
+#: src/modules/conf_menus/e_int_config_menus.c:206
+msgid "Click Drag Timeout"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:208
+#, c-format
+msgid "%2.2f seconds"
+msgstr "%2.2f ثواني"
+
+#: src/modules/conf_mime/e_int_config_mime.c:64
+#: src/modules/conf_mime/e_mod_main.c:35
+msgid "File Icons"
+msgstr "أيقونات الملف"
+
+#: src/modules/conf_mime/e_int_config_mime.c:186
+msgid "File Types"
+msgstr "أنواع الملفات"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:69
+msgid "File Icon"
+msgstr "أيقونة الملف"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:137
+msgid "Mime:"
+msgstr "النوع:"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:147
+msgid "Use Generated Thumbnail"
+msgstr "استخدم الصورة المصغرة المكونة"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:150
+msgid "Use Theme Icon"
+msgstr "استخدم سمة أيقونات"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:153
+msgid "Use Edje File"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:156
+msgid "Use Image"
+msgstr "استخدم صورة"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:159
+msgid "Use Default"
+msgstr "استخدم الافتراضي"
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:270
+msgid "Select an Edj File"
+msgstr ""
+
+#: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
+msgid "Files"
+msgstr "الملفات"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
+msgid ""
+"Please hold any modifier you want<br>and press any button on your mouse,<br> "
+"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
+"highlight> to abort."
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
+msgid "Mouse Binding Settings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
+#: src/modules/conf_mousebindings/e_mod_main.c:35
+msgid "Mouse Bindings"
+msgstr "خيارات الفأرة"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
+msgid "Add Binding"
+msgstr "إضافة ربط"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
+msgid "Delete Binding"
+msgstr "حذف الربط"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
+msgid "Modify Binding"
+msgstr "تعديل الربط"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
+msgid "Restore Mouse and Wheel Binding Defaults"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
+msgid "Action Context"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
+msgid "Any"
+msgstr "أيّ"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
+msgid "Win List"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
+msgid "Popup"
+msgstr "نافذة منبثقة"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
+msgid "Zone"
+msgstr "منطقة"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
+msgid "Container"
+msgstr "حاوي"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
+msgid "Manager"
+msgstr "المدير"
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
+msgid "Mouse Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
+msgid "Cursor Settings"
+msgstr "خيارات المؤشر"
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
+msgid "Show Cursor"
+msgstr "اظهر المؤشر"
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
+msgid "Idle Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
+msgid "Use Enlightenment Cursor"
+msgstr "استخدم مؤشر أنجلتمنت"
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
+msgid "Use X Cursor"
+msgstr "استخدم مؤشر أكس"
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
+msgid "Cursor Size"
+msgstr "حجم المؤشر"
+
+#: src/modules/conf_mouse_cursor/e_mod_main.c:35
+msgid "Mouse Cursor"
+msgstr "مؤشر الفأرة"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr "إعدادات الفأرة"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
+msgid "Mouse Hand"
+msgstr "يد الفأرة"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
+msgid "Mouse Acceleration"
+msgstr "سرعة الفأرة"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+msgid "Acceleration"
+msgstr "السرعة"
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
+msgid "Threshold"
+msgstr "العتبة"
+
+#: src/modules/conf_paths/e_int_config_paths.c:62
+msgid "Search Path Settings"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:73
+msgid "Data"
+msgstr "بيانات"
+
+#: src/modules/conf_paths/e_int_config_paths.c:75
+msgid "Images"
+msgstr "الصور"
+
+#: src/modules/conf_paths/e_int_config_paths.c:79
+#: src/modules/conf_theme/e_int_config_theme.c:1010
+msgid "Themes"
+msgstr "السِمات"
+
+#: src/modules/conf_paths/e_int_config_paths.c:81
+msgid "Icons"
+msgstr "الأيقونات"
+
+#: src/modules/conf_paths/e_int_config_paths.c:85
+msgid "Backgrounds"
+msgstr "الخلفيات"
+
+#: src/modules/conf_paths/e_int_config_paths.c:87
+msgid "Messages"
+msgstr "الرسائل"
+
+#: src/modules/conf_paths/e_int_config_paths.c:168
+msgid "E Paths"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:199
+msgid "Default Directories"
+msgstr "المجلدات الإفتراضية"
+
+#: src/modules/conf_paths/e_int_config_paths.c:206
+msgid "User Defined Directories"
+msgstr "استخدام مجلدات معينة"
+
+#: src/modules/conf_paths/e_mod_main.c:35
+msgid "Search Directories"
+msgstr "ابحث في المجلدات"
+
+#: src/modules/conf_performance/e_int_config_performance.c:40
+msgid "Performance Settings"
+msgstr "خيارات الآداء"
+
+#: src/modules/conf_performance/e_int_config_performance.c:95
+#: src/modules/conf_performance/e_int_config_performance.c:135
+msgid "Framerate"
+msgstr "معدل الإطار"
+
+#: src/modules/conf_performance/e_int_config_performance.c:97
+#: src/modules/conf_performance/e_int_config_performance.c:137
+#, c-format
+msgid "%1.0f fps"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:100
+#: src/modules/conf_performance/e_int_config_performance.c:140
+msgid "Application Priority"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:146
+msgid "Cache Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:147
+msgid "Cache Flush Interval"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:152
+msgid "Size Of Font Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:154
+#, c-format
+msgid "%1.1f MB"
+msgstr "%1.1f م.ب."
+
+#: src/modules/conf_performance/e_int_config_performance.c:157
+msgid "Size Of Image Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:159
+#, c-format
+msgid "%1.0f MB"
+msgstr "%1.0f م.ب."
+
+#: src/modules/conf_performance/e_int_config_performance.c:162
+msgid "Number Of Edje Files To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:164
+#, c-format
+msgid "%1.0f files"
+msgstr "%1.0f ملفات"
+
+#: src/modules/conf_performance/e_int_config_performance.c:167
+msgid "Number Of Edje Collections To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:169
+#, c-format
+msgid "%1.0f collections"
+msgstr ""
+
+#: src/modules/conf_performance/e_mod_main.c:35
+msgid "Performance"
+msgstr "الآداء"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
+msgid "Reset"
+msgstr "أعد الضبط"
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
+msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
+msgid "Add New Profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_mod_main.c:22
+msgid "Profiles"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:61
+msgid "Scaling Settings"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:140
+msgid "Scale with DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:144
+msgid "Relative"
+msgstr "نسبي"
+
+#: src/modules/conf_scale/e_int_config_scale.c:145
+msgid "Base DPI to scale relative to"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:148
+#: src/modules/conf_scale/e_int_config_scale.c:259
+#, c-format
+msgid "%1.0f DPI"
+msgstr "%1.0f DPI"
+
+#: src/modules/conf_scale/e_int_config_scale.c:151
+#, c-format
+msgid "Currently %i DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:245
+msgid "Policy"
+msgstr "السياسة"
+
+#: src/modules/conf_scale/e_int_config_scale.c:248
+msgid "Don't Scale"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:252
+msgid "Scale relative to screen DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:255
+#, c-format
+msgid "Base DPI (Currently %i DPI)"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:263
+msgid "Custom scaling factor"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:266
+#: src/modules/conf_scale/e_int_config_scale.c:276
+#: src/modules/conf_scale/e_int_config_scale.c:282
+#, c-format
+msgid "%1.2f times"
+msgstr "%1.2f مرات"
+
+#: src/modules/conf_scale/e_int_config_scale.c:272
+msgid "Constraints"
+msgstr "القيود"
+
+#: src/modules/conf_scale/e_int_config_scale.c:273
+msgid "Minimum"
+msgstr "الأدنى"
+
+#: src/modules/conf_scale/e_int_config_scale.c:279
+msgid "Maximum"
+msgstr "الأقصى"
+
+#: src/modules/conf_scale/e_mod_main.c:35
+msgid "Scaling"
+msgstr "تحجيم"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
+msgid "Screen Saver Settings"
+msgstr "إعدادات حافظة الشاشة"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:135
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:173
+msgid "Enable X screensaver"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:138
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:176
+msgid "Screensaver Timer(s)"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:140
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:178
+msgid "Time until X screensaver starts"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
+msgid "Time until X screensaver alternates"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
+msgid "Blanking"
+msgstr "إفراغ"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
+msgid "Preferred"
+msgstr "مفضلة"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
+msgid "Not Preferred"
+msgstr "غير مفضلة"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
+msgid "Exposure Events"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
+msgid "Allow"
+msgstr "اسمح"
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
+msgid "Don't Allow"
+msgstr "لا تسمح"
+
+#: src/modules/conf_screensaver/e_mod_main.c:35
+msgid "Screen Saver"
+msgstr "حافظة الشاشة"
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:71
+msgid "Configured Shelves"
+msgstr "الأدرج المعدلة"
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_config.c:114
+msgid "Setup"
+msgstr "إعداد"
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:277
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"shelf?"
+msgstr "لقد طلبت حذف \"%s\".<br><br>هل أنت متأكد من رغبتك في حذف هذا الدرج؟"
+
+#: src/modules/conf_startup/e_int_config_startup.c:39
+msgid "Startup Settings"
+msgstr "إعدادات بدء التشغيل"
+
+#: src/modules/conf_startup/e_int_config_startup.c:328
+msgid "Show Splash Screen on Login"
+msgstr ""
+
+#: src/modules/conf_startup/e_mod_main.c:35
+#: src/modules/conf_transitions/e_int_config_transitions.c:134
+msgid "Startup"
+msgstr "بدء التشغيل"
+
+#: src/modules/conf_theme/e_int_config_theme.c:90
+msgid "Theme Selector"
+msgstr "محدد السمات"
+
+#: src/modules/conf_theme/e_int_config_theme.c:434
+msgid " Import..."
+msgstr " استيراد..."
+
+#: src/modules/conf_theme/e_int_config_theme.c:438
+msgid " Online..."
+msgstr " متصل..."
+
+#: src/modules/conf_theme/e_int_config_theme.c:1001
+msgid "Theme Categories"
+msgstr "أقسام السِمَات"
+
+#: src/modules/conf_theme/e_int_config_theme.c:1019
+msgid "Assign"
+msgstr "تعيينن"
+
+#: src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear All"
+msgstr "تفريغ الكل"
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:67
+msgid "Select a Theme..."
+msgstr "اختر أيقونة"
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:274
+#: src/modules/conf_theme/e_int_config_theme_import.c:283
+msgid "Theme Import Error"
+msgstr "حلل في استيراد السمة"
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:275
+msgid ""
+"Enlightenment was unable to import the theme.<br><br>Are you sure this is "
+"really a valid theme?"
+msgstr ""
+"إنجلتمنت لم يكن قادر على استيراد السمة.<br><br>هل أنت متاكد من أن هذه السِمَة "
+"صحيح؟"
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:284
+msgid "Enlightenment was unable to import the theme<br>due to a copy error."
+msgstr "إنجلتمنت لم يكن قادراً على استيراد السمة<br>جرَاء خلل في النَسخ."
+
+#: src/modules/conf_theme/e_int_config_theme_web.c:127
+msgid "Exchange themes"
+msgstr "تبادل السِمَات"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:44
+msgid "Transition Settings"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:126
+msgid "Events"
+msgstr "الأحداث"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:135
+msgid "Desk Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:136
+msgid "Background Change"
+msgstr "تغيير الخلفية"
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:144
+#: src/modules/conf_transitions/e_mod_main.c:35
+msgid "Transitions"
+msgstr "الانتقالات"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
+msgid "Wallpaper Settings"
+msgstr "خيارات الخلفية"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
+msgid "Use Theme Wallpaper"
+msgstr "استخدم خلفية السِمَة"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
+msgid "Picture..."
+msgstr "الصورة..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
+msgid "Gradient..."
+msgstr "تدرج..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
+msgid "Online..."
+msgstr "متصل..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "All Desktops"
+msgstr "كلّ أسطح المكتب"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+msgid "This Desktop"
+msgstr "سطح المكتب هذا"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
+msgid "This Screen"
+msgstr "هذه الشاشة"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
+msgid "Create a gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
+msgid "Color 1:"
+msgstr "اللون 1:"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
+msgid "Color 2:"
+msgstr "اللون 2:"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
+msgid "Fill Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
+msgid "Horizontal"
+msgstr "أفُقي"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
+msgid "Vertical"
+msgstr "عمودي"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
+msgid "Diagonal Up"
+msgstr "قطري لأعلى"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
+msgid "Diagonal Down"
+msgstr "قطري لأسفل"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
+msgid "Radial"
+msgstr "شعاعي"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
+msgid "Gradient Creation Error"
+msgstr "خلل في إنشاء التدرج"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
+msgid "For some reason, Enlightenment was unable to create a gradient."
+msgstr "لبعض الأسباب, إنجلتمنت لم يكن قادراً على إنشاء تدرج."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
+msgid "Wallpaper settings..."
+msgstr "خيارات الخلفية..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
+msgid "Fill and Stretch Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
+msgid "Stretch"
+msgstr "تمدّد"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
+msgid "Center"
+msgstr "وسَط"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
+msgid "Tile"
+msgstr "بلاط"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
+msgid "Within"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
+msgid "Fill"
+msgstr "ملﺀ"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
+msgid "File Quality"
+msgstr "جودة الملف"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
+msgid "Use original file"
+msgstr "استخدم الملف الأصلي"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
+#, c-format
+msgid "%3.0f%%"
+msgstr "%3.0f%%"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
+msgid "Select a Picture..."
+msgstr "اختر صورة..."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
+msgid "Picture Import Error"
+msgstr "خلل في استيراد الصورة"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
+msgid ""
+"Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
+msgid "Wallpaper Import Error"
+msgstr "خلل في استيراد الخلفية"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
+msgid ""
+"Enlightenment was unable to import the wallpaper<br>due to a copy error."
+msgstr "إنجلتمنت لم يكن قادراً على استيراد الخلفية<br>جرَاء خلل في النسخ."
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
+msgid ""
+"Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
+"is a valid wallpaper?"
+msgstr ""
+"إنجلتمنت لم يكن قادراً على استيراد الخلفية.<br><br>هل أنت متأكد من أن الخلفية "
+"صحيحة؟"
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
+msgid "Exchange wallpapers"
+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:32
+#: src/modules/conf_wallpaper/e_mod_main.c:96
+msgid "Wallpaper"
+msgstr "الخلفية"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:58
+#: src/modules/conf_window_display/e_mod_main.c:35
+msgid "Window Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:167
+msgid "Display"
+msgstr "العرض"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:168
+msgid "Show window geometry information when moving or resizing"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:170
+#: src/modules/conf_window_display/e_int_config_window_display.c:227
+msgid "Animate the shading and unshading of windows"
+msgstr "تحريك الضل وغير الضل للنوافذ"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:174
+#: src/modules/conf_window_display/e_int_config_window_display.c:254
+msgid "Automatic New Window Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:176
+#: src/modules/conf_window_display/e_int_config_window_display.c:257
+msgid "Smart Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:178
+#: src/modules/conf_window_display/e_int_config_window_display.c:259
+msgid "Don't hide Gadgets"
+msgstr "لا تخفي الأدواة"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:180
+#: src/modules/conf_window_display/e_int_config_window_display.c:261
+msgid "Place at mouse pointer"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:182
+#: src/modules/conf_window_display/e_int_config_window_display.c:263
+msgid "Place manually with the mouse"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:184
+#: src/modules/conf_window_display/e_int_config_window_display.c:265
+msgid "Automatically switch to desktop of new window"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:203
+msgid "Window Move Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:205
+#: src/modules/conf_window_display/e_int_config_window_display.c:216
+msgid "Display information"
+msgstr "معلومات العَرض"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:207
+msgid "Follow the window as it moves"
+msgstr "تتبع النافذة كل ما تحركت"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:214
+msgid "Window Resize Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:218
+msgid "Follow the window as it resizes"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:225
+msgid "Window Shading"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:234
+msgid "Linear"
+msgstr "خطّي"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:238
+msgid "Smooth accelerate and decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:242
+msgid "Accelerate"
+msgstr "عجّل"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:246
+msgid "Decelerate"
+msgstr "تباطأ"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:269
+msgid "Window Border"
+msgstr "حدود النافذة"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:272
+msgid "Prefer user defined icon"
+msgstr "فضل أيقونة المستخدم المفضلة"
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:274
+msgid "Prefer application provided icon"
+msgstr "فضل أيقونة المقدمة من التطبيق"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:50
+msgid "Focus Settings"
+msgstr "خيارات البؤرة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:165
+msgid "Click Window to Focus"
+msgstr "اضغط على النافذة للتريكز"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:167
+msgid "Window under the Mouse"
+msgstr "النافذة تحت الفأرة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:169
+msgid "Most recent Window under the Mouse"
+msgstr "أحدث نافذة تحت الفأرة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:183
+msgid "Focus"
+msgstr "البؤرة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:185
+msgid "Click to focus"
+msgstr "انقر للتركيز"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:187
+msgid "Pointer focus"
+msgstr "تركيز المؤشر"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:189
+msgid "Sloppy focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:193
+msgid "New Window Focus"
+msgstr "تركيز على النافذة الجديدة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:195
+msgid "No new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:197
+msgid "All new windows get focus"
+msgstr "التركيز على كل النوافذ الجديدة"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:199
+msgid "Only new dialogs get focus"
+msgstr "يتم التركيز على صناديق الحوار الجديدة فقط"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:201
+msgid "Only new dialogs get focus if the parent has focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:205
+msgid "Other Settings"
+msgstr "إعدادات أخرى"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:206
+msgid "Always pass on caught click events to programs"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:208
+msgid "A click on a window always raises it"
+msgstr "الضغط على نافذة يرفعها دائماً"
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:210
+msgid "A click in a window always focuses it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:212
+msgid "Refocus last focused window on desktop switch"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:214
+msgid "Revert focus when hiding or closing a window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:216
+msgid "Slide pointer to a new focused window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_mod_main.c:35
+#: src/modules/wizard/page_060.c:26
+msgid "Window Focus"
+msgstr "التركيز على النافذة"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
+#: src/modules/conf_window_manipulation/e_mod_main.c:35
+msgid "Window Geometry"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
+msgid "Resistance"
+msgstr "المقاومة"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
+msgid "Resist moving or resizing a window over an obstacle"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
+msgid "Resistance between windows:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
+msgid "Resistance at the edge of the screen:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
+msgid "Resistance to desktop gadgets:"
+msgstr "المقاومة لأدواة سطح المكتب:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
+msgid "Keyboard move and resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
+msgid "Automatically accept changes after:"
+msgstr "اقبل التغييرات تلقائياً بعد:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
+msgid "Move by:"
+msgstr "حرك بواسطة:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
+msgid "Resize by:"
+msgstr "حجِم بواسطة:"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
+#: src/modules/conf_window_manipulation/e_mod_main.c:37
+msgid "Window Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
+msgid "Smart expansion"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
+msgid "Fill available space"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
+msgid "Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
+msgid "Both"
+msgstr "كلاهما"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
+msgid "Automatically move/resize windows on shelf autohide"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
+#: src/modules/conf_window_manipulation/e_mod_main.c:36
+msgid "Window Stacking"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
+msgid "Automatically raise windows on mouse over"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
+msgid "Allow windows to be above fullscreen window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
+msgid "Autoraise"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
+msgid "Delay before raising:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
+msgid "Raise Window"
+msgstr "ارفع النافذة"
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
+msgid "Raise when starting to move or resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
+msgid "Raise when clicking to focus"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
+msgid "Details"
+msgstr "التفاصيل"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
+msgid "<No Name>"
+msgstr "<لا اسم>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
+msgid "Class:"
+msgstr "الصنف:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
+msgid "<No Class>"
+msgstr "<لا صنف>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
+msgid "Title:"
+msgstr "العنوان:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
+msgid "<No Title>"
+msgstr "<لا عنوان>"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
+msgid "Role:"
+msgstr "دور:"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
+msgid "<No Role>"
+msgstr "<لا تدوير>"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:62
+msgid "Window List Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:145
+msgid "Show iconified windows"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:147
+msgid "Show iconified windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:151
+msgid "Show iconified windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:157
+msgid "Show windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:159
+msgid "Show windows from other screens"
+msgstr "اعرض نوافذ من شاشات أخرى"
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:163
+#: src/modules/conf_winlist/e_int_config_winlist.c:241
+msgid "Selection Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:164
+#: src/modules/conf_winlist/e_int_config_winlist.c:242
+msgid "Focus window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:166
+#: src/modules/conf_winlist/e_int_config_winlist.c:244
+msgid "Raise window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:168
+#: src/modules/conf_winlist/e_int_config_winlist.c:246
+msgid "Warp mouse to window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:170
+#: src/modules/conf_winlist/e_int_config_winlist.c:248
+msgid "Uncover windows while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:172
+#: src/modules/conf_winlist/e_int_config_winlist.c:250
+msgid "Jump to desk while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:176
+#: src/modules/conf_winlist/e_int_config_winlist.c:254
+msgid "Warp Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:177
+#: src/modules/conf_winlist/e_int_config_winlist.c:255
+msgid "Warp At End"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:257
+msgid "Warp Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:135
+msgid "Cpufreq"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:182
+msgid "Fast (4 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:189
+msgid "Medium (8 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:196
+msgid "Normal (32 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:203
+msgid "Slow (64 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:210
+msgid "Very Slow (256 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:225
+msgid "Manual"
+msgstr "يدوي"
+
+#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
+msgid "Lower Power Automatic"
+msgstr "تخفيف الطاقة تلقائياً"
+
+#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
+msgid "Minimum Speed"
+msgstr "أدنى سرعة"
+
+#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
+msgid "Maximum Speed"
+msgstr "أقصى سرعة"
+
+#: src/modules/cpufreq/e_mod_main.c:244
+msgid "Restore CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:252
+msgid "Powersaving policy"
+msgstr "سياسة الحفاض على الطاقة"
+
+#: src/modules/cpufreq/e_mod_main.c:280
+msgid "Automatic powersaving"
+msgstr "الحفاض على الطاقة تلقائياً"
+
+#: src/modules/cpufreq/e_mod_main.c:299
+#, c-format
+msgid "%i MHz"
+msgstr "%i ميجا هيرتز"
+
+#: src/modules/cpufreq/e_mod_main.c:301
+#, c-format
+msgid "%i.%i GHz"
+msgstr "%i.%i جيجا هيرتز"
+
+#: src/modules/cpufreq/e_mod_main.c:318
+msgid "Time Between Updates"
+msgstr "الوقت بين التحديثات"
+
+#: src/modules/cpufreq/e_mod_main.c:324
+msgid "Set CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:331
+msgid "Set CPU Speed"
+msgstr "حدد سرعة المعالج"
+
+#: src/modules/cpufreq/e_mod_main.c:337
+msgid "Powersaving behavior"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:386
+msgid ""
+"There was an error trying to set the<br>cpu frequency governor via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:412
+msgid ""
+"Your kernel does not support setting the<br>CPU frequency at all. You may be "
+"missing<br>Kernel modules or features, or your CPU<br>simply does not "
+"support this feature."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:432
+msgid ""
+"There was an error trying to set the<br>cpu frequency setting via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:40
+msgid "Dropshadow Settings"
+msgstr "إعدادات الضل الساقط"
+
+#: src/modules/dropshadow/e_mod_config.c:108
+msgid "Quality"
+msgstr "الجودة"
+
+#: src/modules/dropshadow/e_mod_config.c:111
+msgid "High Quality"
+msgstr "جودة عالية"
+
+#: src/modules/dropshadow/e_mod_config.c:113
+msgid "Medium Quality"
+msgstr "جودة متوسطة"
+
+#: src/modules/dropshadow/e_mod_config.c:115
+msgid "Low Quality"
+msgstr "جودة منخفضة"
+
+#: src/modules/dropshadow/e_mod_config.c:119
+msgid "Blur Type"
+msgstr "نوع الغشاوة"
+
+#: src/modules/dropshadow/e_mod_config.c:122
+msgid "Very Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:124
+msgid "Fuzzy"
+msgstr "مبهم"
+
+#: src/modules/dropshadow/e_mod_config.c:128
+msgid "Sharp"
+msgstr "حاد"
+
+#: src/modules/dropshadow/e_mod_config.c:130
+msgid "Very Sharp"
+msgstr "حاد جداً"
+
+#: src/modules/dropshadow/e_mod_config.c:134
+msgid "Shadow Distance"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:137
+msgid "Very Far"
+msgstr "بعيد جداً"
+
+#: src/modules/dropshadow/e_mod_config.c:139
+msgid "Far"
+msgstr "بعيد"
+
+#: src/modules/dropshadow/e_mod_config.c:141
+msgid "Near"
+msgstr "قريب"
+
+#: src/modules/dropshadow/e_mod_config.c:143
+msgid "Very Near"
+msgstr "قريب جداً"
+
+#: src/modules/dropshadow/e_mod_config.c:145
+msgid "Extremely Near"
+msgstr "قريب جداً جداً"
+
+#: src/modules/dropshadow/e_mod_config.c:147
+msgid "Underneath"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:151
+msgid "Shadow Darkness"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:154
+msgid "Very Dark"
+msgstr "غامق جداً"
+
+#: src/modules/dropshadow/e_mod_config.c:156
+msgid "Dark"
+msgstr "غامق"
+
+#: src/modules/dropshadow/e_mod_config.c:158
+msgid "Light"
+msgstr "فاتح"
+
+#: src/modules/dropshadow/e_mod_config.c:160
+msgid "Very Light"
+msgstr "فاتح جداً"
+
+#: src/modules/dropshadow/e_mod_main.c:90
+msgid "Dropshadow"
+msgstr "ضل ساقط"
+
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+msgid "Run Command Dialog"
+msgstr "حوار تشغيل الأوامر"
+
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
+msgid "Home"
+msgstr "المنزل"
+
+#: src/modules/fileman/e_mod_main.c:322
+msgid "Favorites"
+msgstr "المفضلة"
+
+#: src/modules/fileman/e_mod_main.c:334
+msgid "Root"
+msgstr "الجذر"
+
+#: src/modules/fileman/e_mod_main.c:431
+msgid ""
+"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
+"been wiped and a new set of defaults initialized. This<br>will happen "
+"regularly during development, so don't report a<br>bug. This simply means "
+"Fileman module needs new configuration<br>data by default for usable "
+"functionality that your old<br>configuration simply lacks. This new set of "
+"defaults will fix<br>that by adding it in. You can re-configure things now "
+"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:444
+msgid ""
+"Your Fileman Module configuration is NEWER than Fileman Module version. This "
+"is very<br>strange. This should not happen unless you downgraded<br>the "
+"Fileman Module or copied the configuration from a place where<br>a newer "
+"version of the Fileman Module was running. This is bad and<br>as a "
+"precaution your configuration has been now restored to<br>defaults. Sorry "
+"for the inconvenience.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:513
+msgid "Fileman Settings Updated"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:95
+msgid "Fileman Settings"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:227
+msgid "Icon Size"
+msgstr "حجم الأيقونة"
+
+#: src/modules/fileman/e_mod_config.c:233
+msgid "View"
+msgstr "عرض"
+
+#: src/modules/fileman/e_mod_config.c:236
+msgid "Open Dirs In Place"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:240
+msgid "Sort Dirs First"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:243
+msgid "Case Sensitive"
+msgstr "حسّاس لحالة الأحرف"
+
+#: src/modules/fileman/e_mod_config.c:247
+msgid "Use Single Click"
+msgstr "استخدم نقرة واحدة"
+
+#: src/modules/fileman/e_mod_config.c:250
+msgid "Use Alternate Selection Modifiers"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:254
+msgid "Show Icon Extension"
+msgstr "اعرض امتداد الأيقونة"
+
+#: src/modules/fileman/e_mod_config.c:257
+msgid "Show Full Path"
+msgstr "اظهر كامل المسار"
+
+#: src/modules/fileman/e_mod_config.c:260
+msgid "Show Desktop Icons"
+msgstr "اظهر أيقونات سطح المكتب"
+
+#: src/modules/fileman/e_mod_config.c:263
+msgid "Show Toolbar"
+msgstr "اعرض شريط الأدوات"
+
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:775
+msgid "Behavior"
+msgstr "السّلوك"
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1412
+msgid "Go to Parent Directory"
+msgstr "اذهب للمجلد الأم"
+
+#: src/modules/fileman/e_fwin.c:1474
+msgid "Other application..."
+msgstr "تطبيق آخر..."
+
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
+msgid "Open"
+msgstr "افتح"
+
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
+msgid "Open with..."
+msgstr "فتح بـ..."
+
+#: src/modules/fileman/e_fwin.c:1838
+msgid "Known Applications"
+msgstr "التطبيقات المعروفة"
+
+#: src/modules/fileman/e_fwin.c:1848
+msgid "Specific Applications"
+msgstr "برامج معينة"
+
+#: src/modules/fileman/e_fwin.c:1890
+msgid "Custom Command"
+msgstr "أمر مخصص"
+
+#: src/modules/fileman/e_fwin.c:2146
+#: src/modules/fileman_opinfo/e_mod_main.c:94
+#, c-format
+msgid "Copying is aborted"
+msgstr "تم رفض النسخ"
+
+#: src/modules/fileman/e_fwin.c:2149
+#: src/modules/fileman_opinfo/e_mod_main.c:97
+#, c-format
+msgid "Moving is aborted"
+msgstr "تم رفض النقل"
+
+#: src/modules/fileman/e_fwin.c:2152
+#: src/modules/fileman_opinfo/e_mod_main.c:100
+#, c-format
+msgid "Deleting is aborted"
+msgstr "تم رفض الحذف"
+
+#: src/modules/fileman/e_fwin.c:2155
+#: src/modules/fileman_opinfo/e_mod_main.c:103
+#, c-format
+msgid "Unknown operation from slave is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2165
+#: src/modules/fileman_opinfo/e_mod_main.c:113
+#, c-format
+msgid "Copy of %s done"
+msgstr "تم نسخ %s بنجاح"
+
+#: src/modules/fileman/e_fwin.c:2167
+#: src/modules/fileman_opinfo/e_mod_main.c:115
+#, c-format
+msgid "Copying %s (eta: %d sec)"
+msgstr "يجري نسخ %s (في: %d ثانية)"
+
+#: src/modules/fileman/e_fwin.c:2171
+#: src/modules/fileman_opinfo/e_mod_main.c:119
+#, c-format
+msgid "Move of %s done"
+msgstr "تم نقل %s بنجاح"
+
+#: src/modules/fileman/e_fwin.c:2173
+#: src/modules/fileman_opinfo/e_mod_main.c:121
+#, c-format
+msgid "Moving %s (eta: %d sec)"
+msgstr "نقل %s (في: %d ثواني)"
+
+#: src/modules/fileman/e_fwin.c:2177
+#: src/modules/fileman_opinfo/e_mod_main.c:125
+#, c-format
+msgid "Delete done"
+msgstr "تم الحذف"
+
+#: src/modules/fileman/e_fwin.c:2179
+#: src/modules/fileman_opinfo/e_mod_main.c:127
+#, c-format
+msgid "Deleting files..."
+msgstr "جاري حذف الملفات..."
+
+#: src/modules/fileman/e_fwin.c:2182
+#: src/modules/fileman_opinfo/e_mod_main.c:130
+#, c-format
+msgid "Unknow operation from slave %d"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:138
+#: src/modules/fileman_opinfo/e_mod_main.c:148
+msgid "(no information)"
+msgstr "(لا معلومات)"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:142
+#, c-format
+msgid "File: %s"
+msgstr "الملف: %s"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:144
+#, c-format
+msgid "From: %s"
+msgstr "من: %s"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:151
+#, c-format
+msgid "To: %s"
+msgstr "إلى: %s"
+
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
+msgid "Processing %d operation(s)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:333
+msgid "Filemanager is idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:414
+msgid "EFM Operation Info"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:58
+msgid "Gadgets Manager"
+msgstr "مدير الأدوات"
+
+#: src/modules/gadman/e_mod_config.c:147
+msgid "Background Mode"
+msgstr "نمط الخلفية"
+
+#: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
+msgid "Custom Image"
+msgstr "صورة مخصصة"
+
+#: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
+msgid "Custom Color"
+msgstr "لون مخصص"
+
+#: src/modules/gadman/e_mod_config.c:160
+msgid "Transparent"
+msgstr "شفّاف"
+
+#: src/modules/gadman/e_mod_config.c:167
+msgid "Animations"
+msgstr "الحركة"
+
+#: src/modules/gadman/e_mod_config.c:168
+msgid "Background"
+msgstr "الخلفيّة"
+
+#: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
+msgid "Gadgets"
+msgstr "الأدوات"
+
+#: src/modules/gadman/e_mod_gadman.c:723
+msgid "Free"
+msgstr "حرّ"
+
+#: src/modules/gadman/e_mod_gadman.c:755
+msgid "Always on desktop"
+msgstr "دائماً في سطح المكتب"
+
+#: src/modules/gadman/e_mod_gadman.c:765
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:796
+msgid "Add other gadgets"
+msgstr "أضِف أدوات أخرى"
+
+#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+msgid "Show/hide gadgets"
+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
+msgid "Window : List"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
+msgid "Next Window"
+msgstr "النافذة التالية"
+
+#: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
+msgid "Previous Window"
+msgstr "النافذة السابقة"
+
+#: src/modules/winlist/e_winlist.c:141
+msgid "Select a window"
+msgstr "اختر نافذة"
+
+#: src/modules/ibar/e_mod_config.c:56
+msgid "IBar Settings"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:102
+msgid "Selected Bar Source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:123
+msgid "Icon Labels"
+msgstr "تسميات الأيقونات"
+
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
+msgid "Show Icon Label"
+msgstr "اعرض تسمية الأيقونة"
+
+#: src/modules/ibar/e_mod_config.c:130
+msgid "Display App Name"
+msgstr "أعرض اسم التطبيق"
+
+#: src/modules/ibar/e_mod_config.c:134
+msgid "Display App Comment"
+msgstr "أعرض تعليق التطبيق"
+
+#: src/modules/ibar/e_mod_config.c:138
+msgid "Display App Generic"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:168
+msgid "Create new IBar source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:169
+msgid "Enter a name for this new source:"
+msgstr "ادخل اسم لهذا المصدر الجديد:"
+
+#: src/modules/ibar/e_mod_config.c:183
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:187
+msgid "Are you sure you want to delete this bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:215
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:797
+msgid "Change Icon Properties"
+msgstr "غير إعدادات الأيقونة"
+
+#: src/modules/ibar/e_mod_main.c:802
+msgid "Remove Icon"
+msgstr "أزِل الأيقونة"
+
+#: src/modules/ibar/e_mod_main.c:812
+msgid "Add An Icon"
+msgstr "أضِف أيقونة"
+
+#: src/modules/ibar/e_mod_main.c:819
+msgid "Create New Icon"
+msgstr "إنشاء أيقونة جديدة"
+
+#: src/modules/ibar/e_mod_main.c:835
+msgid "Add Application"
+msgstr "إضافة تطبيق"
+
+#: src/modules/ibox/e_mod_config.c:51
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:104
+msgid "Display Name"
+msgstr "اسم العرض"
+
+#: src/modules/ibox/e_mod_config.c:109
+msgid "Display Title"
+msgstr "عنوان العرض"
+
+#: src/modules/ibox/e_mod_config.c:114
+msgid "Display Class"
+msgstr "صنف العرض"
+
+#: src/modules/ibox/e_mod_config.c:119
+msgid "Display Icon Name"
+msgstr "اسم أيقونة العرض"
+
+#: src/modules/ibox/e_mod_config.c:124
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:154
+msgid "Show windows from all screens"
+msgstr "اظهر النوافذ من كل الشاشات"
+
+#: src/modules/ibox/e_mod_config.c:159
+msgid "Show windows from current screen"
+msgstr "اظهر النوافذ من الشاشة الحلية"
+
+#: src/modules/ibox/e_mod_config.c:168
+msgid "Show windows from all desktops"
+msgstr "اظهر النوافذ من كلً سطوح المكتب"
+
+#: src/modules/ibox/e_mod_config.c:173
+msgid "Show windows from active desktop"
+msgstr "أظهر النوافذ من سطح المكتب المفعل"
+
+#: src/modules/ibox/e_mod_main.c:227
+msgid "IBox"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:72
+msgid "Pager Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
+msgid "Flip desktop on mouse wheel"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
+msgid "Show desktop names"
+msgstr "أعرض أسماء الأسطح"
+
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
+msgid "Popup Settings"
+msgstr "خيارات النافذة المنبثقة"
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
+msgid "Show popup on desktop change"
+msgstr "أعرض نافذة منبيثقة عند تغيير سطح المكتب"
+
+#: src/modules/pager/e_mod_config.c:132
+msgid "Show popup for urgent windows"
+msgstr "أظهر النوافذ المنبثقة من النوافذ العاجلة"
+
+#: src/modules/pager/e_mod_config.c:169
+msgid "Select and Slide button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:176
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:183
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:192
+msgid "Keyaction popup height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
+msgid "%.0f px"
+msgstr "%.0f بكسل"
+
+#: src/modules/pager/e_mod_config.c:198
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:209
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
+msgid "Popup speed"
+msgstr "سرعة النافذة المنبثة"
+
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
+#, c-format
+msgid "%1.1f seconds"
+msgstr "%1.1f ثواني"
+
+#: src/modules/pager/e_mod_config.c:231
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:232
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:235
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:290
+msgid ""
+"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
+"<br>Or <hilight>Del</hilight> to reset the button."
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:345
+msgid "Attetion"
+msgstr "إنتباه"
+
+#: src/modules/pager/e_mod_config.c:346
+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 ""
+
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
+msgid "Button %i"
+msgstr "الزر %i"
+
+#: src/modules/pager/e_mod_main.c:2850
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:111
+msgid "Start"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:34
+msgid "System Control"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:55
+msgid "System Controls"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:63
+msgid "Temperature Settings"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:352
+msgid "Display Units"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:354
+msgid "Celsius"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:356
+msgid "Fahrenheit"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:378
+msgid "Check Interval"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:258
+msgid "Fast"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:262
+msgid "Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Very Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:271
+#: src/modules/temperature/e_mod_config.c:295
+#: src/modules/temperature/e_mod_config.c:396
+#: src/modules/temperature/e_mod_config.c:408
+msgid "High Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:274
+msgid "200 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:276
+msgid "150 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:287
+msgid "110 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:282
+#: src/modules/temperature/e_mod_config.c:306
+#: src/modules/temperature/e_mod_config.c:401
+#: src/modules/temperature/e_mod_config.c:413
+msgid "Low Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:285
+msgid "130 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:289
+msgid "90 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:298
+msgid "93 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:300
+msgid "65 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:302
+#: src/modules/temperature/e_mod_config.c:311
+msgid "43 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:309
+msgid "55 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:313
+msgid "32 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:367
+msgid "Sensors"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:402
+#, c-format
+msgid "%1.0f F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:409
+#: src/modules/temperature/e_mod_config.c:414
+#, c-format
+msgid "%1.0f C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:147
+msgid "Temperature"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:221
+msgid "Next"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:281
+msgid "Welcome to Enlightenment"
+msgstr ""
+
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:58
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:91
+msgid ""
+"No menu files were<br>found on your system.<br>Please see "
+"the<br>documentation on<br>www.enlightenment.org<br>for more details "
+"on<br>how to get your<br>application menus<br>working."
+msgstr ""
+
+#: src/modules/wizard/page_030.c:107
+msgid "Select application menu"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:124
+msgid "System Default"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:25
+msgid "Launcher Bar"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:27
+msgid "Select applications"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:28
+msgid "Desktop Files"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:32
+msgid "No icons on desktop"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:35
+msgid "Enable desktop icons"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:28
+msgid "Focus mode"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:32
+msgid "Click to focus windows"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:35
+msgid "Mouse over focuses windows"
+msgstr ""
+
+#: src/modules/wizard/page_070.c:204
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:60
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Select Applications"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:165
+msgid "Capture"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:167
+msgid "Playback"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:289
+msgid "Output"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:363
+msgid "Cards"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
+msgid "Channels"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Card:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:394
+msgid "Channel:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:398
+msgid "Type:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:402
+msgid "Left:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:407
+msgid "Right:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
+msgid "Mute"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
+msgid "Lock Sliders"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:419
+msgid "Edit"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:202
+msgid "Show both sliders when locked"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:322
+msgid "Sound Cards"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:377
+msgid "Mixer Settings"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:98
+msgid "Mixer to use for global actions:"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:152
+msgid "Launch mixer..."
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:187
+msgid "Mixer Module Settings"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:123
+msgid "Mixer Settings Updated"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:602
+msgid "Controls"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:1157
+msgid ""
+"Mixer Module Settings data changed.<br>Your old configuration has been "
+"replaced with new default.<br>Sorry for the inconvenience."
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:214
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:731
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:737
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:742
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:745
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:748
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:769
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:891
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:892
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1094
+msgid "Systray"
+msgstr ""
+
+#~ msgid "Window name and class"
+#~ msgstr "اسم وصف النافذة"
+
+#~ msgid "Internal Windows"
+#~ msgstr "نوافِذ داخِلية"
diff --git a/po/bg.gmo b/po/bg.gmo
index d70178e..484216c 100644
Binary files a/po/bg.gmo and b/po/bg.gmo differ
diff --git a/po/bg.po b/po/bg.po
index 8f055b8..0e0b4ba 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,41 +8,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2007-11-15 00:40+0200\n"
-"Last-Translator: Viktor Kojouharov <vkojouharov at abv.bg>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-06 10:39+0000\n"
+"Last-Translator: Viktor Kojouharov <Unknown>\n"
 "Language-Team: English <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "За Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Затваряне"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -51,14 +52,6 @@ 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 ""
-"&copy; Всички права запазени; 1999-2006, Екипът  на Enlightenment."
-"<br><br>Надяваме се, че използването на средата ще ви хареса колкото на нас "
-"ни харесва да я пишем.<br><br>Този софтуер се предлага без никаква гаранция."
-"Обуславя се на лицензионните условия, описани в файловете COPYING и COPYING-"
-"PLAIN, които са инсталирани на вашата система. <br><br>Enlightenment е под "
-"<hilight>УСИЛЕНА РАЗРАБОТКА</hilight> и не е стабилна среда. Много от "
-"възможностите й не са готови или все още не съществуват, и има много грешки. "
-"Бяхте <hilight>ПРЕДУПРЕДЕНИ!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -78,637 +71,605 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Сигурни ли сте, че искате да убиете този прозорец?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Не"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Искате да излезете от Enlightenment.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Сигурни ли сте, че искате да излезнете?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Поискали сте да излезнете.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Сигурни ли сте, че искате да изключите компютъра?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Искате да изключите компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Сигурни ли сте, че искате да рестартирате компютъра?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Искате да рестартирате компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Искате да изключите временно компютъра.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Сигурни ли сте, че искате да превключите в режим \"hibernate\"?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Искате да изключите компютъра в режим \"hibernate\".<br><br>Сигурни ли сте?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Прозорец: Действия"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Преместване"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Оразмеряване"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Меню на прозореца"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Повдигане"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "По-ниско"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Убиване"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Прозорец : Състояния"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Режим на залепване"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Режим на скриване"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Режим на Цял Екран"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Уголемяване"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Уголемяване вертикално"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Уголемяване хоризонтално"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Уголемяване на цял екран"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим на уголемяване \"Умен\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим на уголемяване \"Разширяване\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим на уголемяване \"Запълване\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Режим на навиване нагоре"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Режим на навиване надолу"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Режим на навиване наляво"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Режим на навиване надясно"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Режим на навиване"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Премахване на рамката"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Състояние на забождане"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Поле"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Прелистване полето наляво"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Прелистване полето надясно"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Прелистване полето нагоре"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Прелистване полето надолу"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Прелистване полето по..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Показване на полето"
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "Показване на полето"
+msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Прелистване полето до..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Прелистване полето линейно..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Преминаване до поле 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Преминаване до поле 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Преминаване до поле 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Преминаване до поле 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Преминаване до поле 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Преминаване до поле 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Преминаване до поле 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Преминаване до поле 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Преминаване до поле 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Преминаване до поле 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Преминаване до поле 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Преминаване до поле 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Изпращане до поле..."
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Прелистване полето наляво"
+msgstr ""
 
-#: src/bin/e_actions.c:2644
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Прелистване полето надясно"
+msgstr ""
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Прелистване полето нагоре"
+msgstr ""
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Прелистване полето надолу"
+msgstr ""
 
-#: src/bin/e_actions.c:2650
-#, fuzzy
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Прелистване полето по..."
+msgstr ""
 
-#: src/bin/e_actions.c:2656
-#, fuzzy
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Прелистване полето до..."
+msgstr ""
 
-#: src/bin/e_actions.c:2662
-#, fuzzy
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Прелистване полето линейно..."
+msgstr ""
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Прелистване полето до..."
+msgstr ""
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Преминаване до поле 0"
+msgstr ""
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Преминаване до поле 1"
+msgstr ""
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Преминаване до поле 2"
+msgstr ""
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Преминаване до поле 3"
+msgstr ""
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Преминаване до поле 4"
+msgstr ""
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Преминаване до поле 5"
+msgstr ""
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Преминаване до поле 6"
+msgstr ""
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Преминаване до поле 7"
+msgstr ""
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Преминаване до поле 8"
+msgstr ""
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Преминаване до поле 9"
+msgstr ""
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Преминаване до поле 10"
+msgstr ""
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Преминаване до поле 11"
+msgstr ""
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Изпращане до поле..."
+msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Изпращане на мишката до екран 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Изпращане на мишката до екран 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Изпращане на мишката до екран..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
-msgstr "Изпращане на мишката напред 1 екран "
+msgstr "Изпращане на мишката напред 1 екран"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
-msgstr "Изпращане на мишката назад 1 екран "
+msgstr "Изпращане на мишката назад 1 екран"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Изпращане на мишката напред/назад екрани..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Прозорец : Движения"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "До следващото поле"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "До предишното поле"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "По поле #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "До поле..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Показване на главното меню"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Показване на предпочитаното меню"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Показване на меню \"Всички програми\""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Показване на клиентско меню"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Показване на меню..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Стартиране"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команда"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Програма"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Рестартиране"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2803
-#, fuzzy
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr "Изход"
+msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment·%s·Модул"
+msgstr ""
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Режим на Цял Екран"
+msgstr ""
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Режим на навиване"
+msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Системни"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Изход"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Рестартиране на компютъра"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Временно изключване"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Режим \"Hibernate\""
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "Забрани"
+msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Изчистване на прозорци"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Прозорец: Действия"
+msgstr ""
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "Специфични програми"
+msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Поставяне като фон"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Сканиране на Desktop файлове завършено"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Сканиране на Desktop файлове"
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "Избор на профили"
+msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Добре"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
-#, fuzzy
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -718,15 +679,8 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Конфигурацията трябва да се обнови. Старата ви конфигурация<br>е изтрита и е "
-"сложена нова, по подразбиране. Това става често по време<br>на "
-"разработването, затова не ни уведомявайте. Това просто означава, че "
-"Е<br>иска нови данни, които старата ви конфигурация не може да предостави. "
-"Сега<br>може да конфигурирате Е както ви харесва. Извиняваме се за това "
-"неудобство.<br>"
 
-#: src/bin/e_config.c:775
-#, fuzzy
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -734,18 +688,12 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Вашата конфигурация е по-нова от тази на Е. Това е много странно<br>и не би "
-"трябвало да става, освен ако не сте сложили по-стара<br>версия на Е, или не "
-"сте копирали конфигурацията от място, където има<br>по-нова версия. Това е "
-"лошо, и затова конфигурацията е възстановена по<br>подразбиране. Извиняваме "
-"се за това неудобство.<br>"
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "Настройки на полетата"
+msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -753,7 +701,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -763,7 +711,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -772,7 +720,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -781,7 +729,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -789,12 +737,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Проблем при запис на конфигурацията на E17"
+msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -802,12 +749,12 @@ msgstr "Проблем при запис на конфигурацията на
 msgid "Advanced"
 msgstr "Сложни"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Прости"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -815,7 +762,7 @@ msgstr "Прилагане"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Модули"
 
@@ -824,27 +771,27 @@ msgstr "Модули"
 msgid "Extensions"
 msgstr "Разширения"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Грешка - няма поддържка на PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Няма поддържка на PAM в Enlightenment, затова<br>заключването на екрана е "
 "изключено"
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Заключването е неуспешно"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -852,15 +799,15 @@ msgstr ""
 "Заключването на екрана е неуспешно, защото някоя програма<br>е прихванала "
 "клавиатурата или мишката и те не могат да се прихванат от E17"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Моля, въведете вашата парола"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Грешка в системата за идентификация"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -868,22 +815,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -904,7 +851,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Редактор на Desktop файлове"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -946,14 +893,12 @@ msgid "Categories"
 msgstr "Категории"
 
 #: src/bin/e_eap_editor.c:528
-#, fuzzy
 msgid "Mime Types"
-msgstr "Файлови типове"
+msgstr ""
 
-#: src/bin/e_eap_editor.c:534
-#, fuzzy
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr "Опции за изпълване"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
@@ -983,23 +928,23 @@ msgstr "Избиране на икона"
 msgid "Select an Executable"
 msgstr "Избиране на изпълним файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Вмъкване"
 
@@ -1007,13 +952,13 @@ msgstr "Вмъкване"
 msgid "Select All"
 msgstr "Избиране на всичко"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -1021,11 +966,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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Грешка при изпълнение"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1034,321 +979,307 @@ msgstr ""
 "Enlightenment·не успя да пусне програмата:<br><br>%s<br><br>Програмата не "
 "успя да се стартира."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Грешка при стартиране на програмата"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s е спряла неочаквано"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Изходен код %i е върнат от·%s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s е прекъсната от сигнал Interrupt."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s е прекъсната от сигнал Quit."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s е прекъсната от сигнал Abort."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s е прекъсната от Floating Point грешка."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s е прекъсната от сигнал Uninterruptable Kill."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s е прекъсната от сигнал Segmentation Fault."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s е прекъсната от сигнал Broken Pipe."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s е прекъсната от сигнал Termination."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s е прекъсната от грешка на шината."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s е прекъсната от сигнал с номер %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Остатъкът от резултата е скрит. Запазете го за да го видите***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Дневник с грешки"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Няма съобщение с грешки"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Запазване на това съобщение"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Тези грешки ще бъдат записани като %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Информация за грешката"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Информация за сигналната грешка"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Резултат"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Няма резултат"
 
-#: src/bin/e_fm.c:941
-#, fuzzy
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
-msgstr "Несъществуващ път"
+msgstr ""
 
-#: src/bin/e_fm.c:945
-#, fuzzy, c-format
+#: src/bin/e_fm.c:949
+#, c-format
 msgid "%s doesn't exist."
-msgstr "%s не съществува"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Грешка при изпълнение"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Грешка при изпълнение"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Грешка при изпълнение"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i файлове"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr "Линейно"
+msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "За"
+msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "Настройки на избиране"
+msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Режим за разглеждане"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Опресняване на изгледа"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Показване на скрити файлове"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Запомняне на подреждането"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Сортиране сега"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Нова директория"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Преименуване"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Елемент от меню"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Характеристики"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr "Използване на стандарто"
+msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Списък"
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Размер на иконите"
+msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Поставяне като фон"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Съдържание на рафта"
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Изчистване"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Създаване на нова директория"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Име на новата директория:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Преименуване на %s до:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Преименуване на файл"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
-#, fuzzy
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
-msgstr "Рестартиране"
+msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
-#, fuzzy
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
-msgstr "Грешка при изпълнение"
+msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Стартиране"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Потвърждаване за изтриването"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Сигурни ли сте, че искате да изтриете <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1361,144 +1292,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Файлови характеристики"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Последна модификация:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Файлов тип:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Разрешения:"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Собственик:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Други могат да четат"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Други могат да пишат"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Собственикът може да чете"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Собственикът може да пише"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Преглед"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "По подразбиране"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Миниизображение"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Друг"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Използване на тази икона за всики файлове от този тип"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Информация за връзката"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Избиране на изображение"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Непознат дял"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Сменяемо устройство"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Прост"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Вдълбано"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Изглед"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Автоматично плъзгане на съдържание"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Възможност за оразмеряване"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Започване редактирането на този инструмент"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Премахване"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Спиране редактирането на този инструмент"
 
@@ -1510,7 +1445,7 @@ msgstr ""
 "Предишен Enlightenment е все още активен на този\n"
 "екран. Спиране на стартирането.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Забрани на прозорци"
 
@@ -1544,21 +1479,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Ниво"
 
@@ -1567,12 +1502,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Фаза на навиване"
 
@@ -1581,7 +1516,7 @@ msgid "Maximized state"
 msgstr "Фаза на уголяване"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Фаза на цял екран"
 
@@ -1589,7 +1524,7 @@ msgstr "Фаза на цял екран"
 msgid "Lock me from changing:"
 msgstr "Забрана за мои промени:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Стил на рамка"
 
@@ -1614,9 +1549,8 @@ msgid "Edit Icon"
 msgstr "Редактиране на икона"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "Добавяне на стартер"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1635,125 +1569,121 @@ msgid "Unpin from Desktop"
 msgstr "Отбождане от поле"
 
 #: src/bin/e_int_border_menu.c:131
-#, fuzzy
 msgid "More..."
-msgstr "Внасяне..."
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Скриване"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Вертикално уголемяване"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Хоризонтално уголемяване"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Връщане от уголемяване"
 
-#: src/bin/e_int_border_menu.c:485
-#, fuzzy
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
-msgstr "Добавяне на бърз клавиш"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
-#, fuzzy
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
-msgstr "Меню за предпочитания"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
-#, fuzzy
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
-msgstr "Добавяне до стартер"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Рамка"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Пропускане"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Фаза"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Характеристики на прозореца"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Винаги отгоре"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Винаги отдолу"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Избиране стил на рамката"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Използване на икона, предоставена от E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "Използване на икона, добита от програмата"
+msgstr "Използване на икона, добита от програмата "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Използване на икона, дефинирана от потребителя"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Навиване"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Залепване"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Цял екран"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Списък с прозорци"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Превключвател на полета"
 
-#: src/bin/e_int_border_menu.c:1083
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
-msgstr "Пропускане на Taskbar"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1767,7 +1697,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM характеристики"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Заглавие"
 
@@ -1859,11 +1789,11 @@ msgstr "NetWM  характеристики"
 msgid "Modal"
 msgstr "Модален"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Пропускане на Taskbar"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Пропускане в превключватела на полета"
 
@@ -1871,15 +1801,15 @@ msgstr "Пропускане в превключватела на полета"
 msgid "Hidden"
 msgstr "Скрит"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Запомняне"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Характеристиките на прозореца не са уникални"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1893,11 +1823,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Няма сложени отговарящи характеристики"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1905,106 +1835,104 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Нищо"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Размер и позиция"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Забрани"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Размер, място и забрани"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Всичко"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Запомняне с"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Име и клас на прозореца"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Роля на прозорец"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Тип на прозореца"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Преходност"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Характеристики за запомняне"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Предпочитание на икона"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Виртуални полета"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Текущ екран"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Списък за пропускане на прозорци"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Съответствие само на този прозорец"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Стартиране на тази програма при влизане"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Стартиране на тази програма при влизане"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "Настройки на полетата"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
@@ -2020,24 +1948,24 @@ msgstr "Рафт"
 msgid "Module Settings"
 msgstr "Настройки на модули"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Налични модули"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Зареждане на модул"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Заредени модули"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Изключване на модул"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2068,12 +1996,11 @@ msgid "Remove Gadget"
 msgstr "Премахване"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "Прехвърляне"
+msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Подредба"
 
@@ -2097,12 +2024,12 @@ msgid "Favorite Applications"
 msgstr "Предпочитани програми"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Програми"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2111,7 +2038,7 @@ msgstr "Програми"
 msgid "Windows"
 msgstr "Прозорци"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Изгубени прозорци"
 
@@ -2144,134 +2071,131 @@ msgid "(No Applications)"
 msgstr "(Няма програми)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Виртуални полета"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Няма прозорци)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Няма име!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Няма рафтове)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Рафт №"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Добавяне на рафт"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Изтриване на рафт"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Настройки"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Дребен"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Малък"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Среден размер"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Голям"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Грамаден"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Съдържание на рафта"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Над всичко"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Под прозорците"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "На самото поле"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Позволяване на прозорците да застъпват този рафт"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Смаляване до размера на съдържанието"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f·пиксела"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Стилове"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Автоматично скриване"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Автоматично скриване на рафта"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Показване при влизане с показалеца"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Показване при натискане с показалеца"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Време преди скриване"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f·секунди"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Продължителност"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Показване върху всички полета"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Показване върху определено поле"
 
@@ -2296,7 +2220,7 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2323,26 +2247,6 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Опции:\n"
-"\t-display DISPLAY\n"
-"\t\tСвързване с X DISPLAY.\n"
-"\t\tПР: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tДобавяне на фалщив xinerama екран (вместо истински)\n"
-"\t\tс тези размериy. Добавете колкото ви харесва. Те заменят\n"
-"\t\tистинските xinemara екрани, ако има такива. Това се използва\n"
-"\t\tза да се симулира xinerama.\n"
-"\t\tПР: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
-"+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tИзползване на конфигурация с профил CONF_PROFILE внести стандартната на "
-"потребителя или просто \"default\".\n"
-"\t-good\n"
-"\t\tДобър.\n"
-"\t-evil\n"
-"\t\tЛош.\n"
-"\t-psychotic\n"
-"\t\tПсихо.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2469,9 +2373,8 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment не може да настрои конфигурационната си система"
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment не може да настрои системата си за рафтове"
+msgstr ""
 
 #: src/bin/e_main.c:600
 msgid "Enlightenment cannot set up the pointer system."
@@ -2501,7 +2404,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment не може да настрои стартовата си система"
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2509,11 +2412,11 @@ msgstr ""
 "Enlightenment не може да настрои начален екран.\n"
 "Може би няма свободна памет?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2521,7 +2424,7 @@ msgstr ""
 "Evas не може да създаде буферни платна. Проверете дали Evas\n"
 "има поддръжка за Software Buffer възпроизвеждане.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2529,7 +2432,7 @@ msgstr ""
 "Evas не може да зарежда PNG файлове. Проверете дали Evas\n"
 "е компилиран с PNG модула.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2537,7 +2440,7 @@ msgstr ""
 "Evas не може да зарежда JPEG файлове. Проверете дали Evas\n"
 "е компилиран с JPEG модула.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2545,21 +2448,18 @@ msgstr ""
 "Evas не може да зарежда EET файлове. Проверете дали Evas\n"
 "е компилиран с поддръжка на EET.\n"
 
-#: src/bin/e_main.c:722
-#, fuzzy
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Evas не може да зарежда PNG файлове. Проверете дали Evas\n"
-"е компилиран с PNG модула.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Настройване на екрани"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2567,197 +2467,194 @@ msgstr ""
 "Enlightenment не можа да настрои управлението на прозорци за\n"
 "всички екрани. Може би друг администратор на прозорци е пуснат?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Настройване на предпазител на екрана"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment не може да настрои X screensaver."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Настройване на заключване"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment не може да настрои заключващата си система"
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Настройване на пътища"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment не може да стартира системата за Системни команди.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Настройване на действията"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не може да настрои системата си за действия"
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не може да настрои своята 'exec' система."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Настройване на запомняне"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment не може да настрои настройките за запомняне"
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment не може да стартира файловият манипулатор.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment не може да настрои системата си за съобщения."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не може да настрои системата 'плъзгане и пускане'"
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment не може да настрои системата си за прихващане на въвеждане."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Настройване на модули"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не може да настрои модулната си система"
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Настройване на запомняне"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment не може да настрои настройките за запомняне"
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Настройване на цветови класове"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не може да настрои системата си за класове на цветовете."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment не може да настрои системата си за контролиране на "
 "джунджурийки."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment не може да настрои DPMS."
 
-#: src/bin/e_main.c:918
-#, fuzzy
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
-msgstr "Настройване на енергийното поведение на процесора"
+msgstr ""
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment не може да настрои системата си за изкачащи прозорци."
+msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Настройване на тапети"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не може да настрои система за тапети."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Настройване на показалеца"
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment не може да настрои DPMS."
+msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment не може да настрои системата си за обвързване"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Настройване на изскачащи прозорци"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не може да настрои системата си за изкачащи прозорци."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Настройване на рафтове"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment не може да настрои системата си за рафтове"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Настройване на миниизображения"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment не може да стартира системата за миниизображения:в.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не може да настрои системата за \"order\" файлове."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Зареждане на модули"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2769,11 +2666,11 @@ msgstr ""
 "проблематични модули да се отстранят. <br>Може сами да си ги включите чрез "
 "конфигурационния панел."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment е забил в самия старт и е бил рестартиран"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2785,15 +2682,15 @@ msgstr ""
 "проблематични модули да се отстранят. <br>Може сами да си ги включите чрез "
 "конфигурационния панел."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Настройване на рафтове"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Почти е готово"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2802,11 +2699,11 @@ msgstr ""
 "Имало е грешка при зареждане на модула %s<br>Не е бил намерен модул с име %"
 "s<br>в папките за търсене на модули<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Грешка при зареждане на модул"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2818,11 +2715,11 @@ msgstr ""
 "Съобщената грешка е:\n"
 "%s"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Модулът не съдържа всички нужни функции"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2830,12 +2727,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment·%s·Модул"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Искате ли да изключите този модул?<br>"
 
@@ -2846,30 +2743,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Сигурни ли сте, че искате да изтриете този рафт?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Искате да изтриете този рафт.<br><br>Сигурни ли сте?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
-msgstr "Спиране на всякакво редактиране "
+msgstr "Спиране на всякакво редактиране"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Започване на редактиране на всичко"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Съдържание на рафта"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Изтриване на този рафт"
 
@@ -2886,11 +2782,11 @@ msgstr "Преглед на системните права"
 msgid "System Check Done"
 msgstr "Прегледът над системата е завържен"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Проблем при изхода"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2899,154 +2795,129 @@ msgstr ""
 "Изходът отнема твърде много. Някои <br>програми отказват да се затворият."
 "<br>Искатели да привършите изхода<br>без да ги затваряте?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Незабавен изход"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Изчакайте още"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Спиране на изхода"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "В процес на изход"
 
-#: src/bin/e_sys.c:366
-#, fuzzy
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "Изходът е задействан.:·<br><hilight>Моля изчакайте.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment не зает с друга молба"
 
-#: src/bin/e_sys.c:401
-#, fuzzy
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Enlightenment е зает с излизането.<br>Не може да се извършват други "
-"действия<br>докато тече този процес."
 
-#: src/bin/e_sys.c:409
-#, fuzzy
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Enlightenment е зает с изключването.<br>Не може да се извършват други "
-"действия<br>докато тече този процес"
 
-#: src/bin/e_sys.c:416
-#, fuzzy
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Enlightenment е зает с рестартирането.<br>Не може да се извършват други "
-"действия<br>докато тече този процес"
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
-#, fuzzy
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
-"Enlightenment е зает с излизането.<br>Не може да се извършват други "
-"действия<br>докато тече този процес."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "Опа! Това не трябва да става"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "Desktop файл"
+msgstr ""
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "Време за временно изключване"
+msgstr ""
 
-#: src/bin/e_sys.c:478
-#, fuzzy
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
-msgstr "Системата не е могла да премине в режим \"hibernate\"."
+msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
-#, fuzzy
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Рестартиране на компютъра.<br><hilight>Моля, изчакайте.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "Настройки на полетата"
+msgstr ""
 
-#: src/bin/e_sys.c:565
-#, fuzzy
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Рестартиране на компютъра.<br><hilight>Моля, изчакайте.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Временно рестартиране"
 
-#: src/bin/e_sys.c:591
-#, fuzzy
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"Временно изключване на компютъра.<br><hilight>Моля, изчакайте.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Преминаване в режим \"hibernate\""
 
-#: src/bin/e_sys.c:617
-#, fuzzy
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"Преминаване в режим \"hibernate\".<br><hilight>Моля, изчакайте.</hilight>"
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "За тази тема"
+msgstr ""
 
 #: src/bin/e_theme.c:42
 msgid "Set As Theme"
 msgstr "Избиране като тема"
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Съдържание на лентата с инструменти"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Няма изход - безсмъртен прозорец."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3056,77 +2927,77 @@ msgstr ""
 "спрян, докато тези прозорци не бъдат затворени, или не се "
 "премахне<br>забраната им за изход."
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байтове"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f КБ"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f МБ"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ГБ"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "В бъдещето"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "В последната минута"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "Преди %li години"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "Преди %li месеца"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Преди %li седмици"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "Преди %li дни"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "Преди %li часа"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Преди %li минути"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Незнаен"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3146,58 +3017,57 @@ msgstr "Нагоре"
 msgid "Down"
 msgstr "Надолу"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Добавяне до предпочитаните"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Една директория нагоре"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Разрешения:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Изменен:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ти"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Защитен"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Само за четене"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Забранен"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Четене и запис"
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Конфигурация на модул Батерия"
+msgstr ""
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3207,63 +3077,57 @@ msgstr "Прости настройки"
 msgid "Show alert when battery is low"
 msgstr "Показване на предупреждение при изтощение на батерията"
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Проверка на батерията на всеки:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f·файлове"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
-msgstr "Прост"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
-msgstr "Показване на предупреждение при изтощение на батерията"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr "Предупреждение когато батерията се изтощи до:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "%1.0f минути"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f·сек"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "Ускорение"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "Автоматично скриване"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3271,13 +3135,12 @@ msgstr "Автоматично скриване"
 msgid "Internal"
 msgstr "Вграден(и)"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
-#, fuzzy
 msgid "HAL"
-msgstr "ALT"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3285,25 +3148,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Батерия"
 
-#: src/modules/battery/e_mod_main.c:844
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
-msgstr "Показване на предупреждение при изтощение на батерията"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3311,26 +3173,22 @@ msgstr ""
 msgid "Clock"
 msgstr "Часовник"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "Настройки на полетата"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Настройки на полетата"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Време за цялостно изкючване"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Модули"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3354,19 +3212,17 @@ msgid "Restart Applications"
 msgstr "Рестартиращи програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Всички Пограми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
-#, fuzzy
 msgid "Selected Applications"
-msgstr "Специфични програми"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Прилагане"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
@@ -3378,12 +3234,12 @@ msgstr "Други"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Менюта"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Стил на рамка по подразбиране"
 
@@ -3391,14 +3247,14 @@ msgstr "Стил на рамка по подразбиране"
 msgid "Window Border Selection"
 msgstr "Рамки на прозорци"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запомняне стила на рамката за този прозорец"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3406,9 +3262,8 @@ msgstr "Запомняне стила на рамката за този проз
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "Забрани"
+msgstr ""
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3425,7 +3280,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3519,9 +3374,8 @@ msgid "Border Title"
 msgstr "Заглавие на рамка"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "За (Заглавие)"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3636,9 +3490,8 @@ msgid "Colors"
 msgstr "Цветове"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
-#, fuzzy
 msgid "Other"
-msgstr "Други"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Window Manager Colors"
@@ -3695,9 +3548,9 @@ msgid "Desktop Name"
 msgstr "Име на полето"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Име:"
 
@@ -3707,9 +3560,8 @@ msgstr "Тапет на полето"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Избор"
+msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
@@ -3724,18 +3576,16 @@ msgid "Automatic Locking"
 msgstr "Автоматично заключване"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Използване на показалеца от E17"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Заключване при стартиране на предпазител на екрана"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "Време докато предпазителя се смени"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3766,10 +3616,10 @@ msgstr "%1.0f минути"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Лични"
@@ -3801,8 +3651,8 @@ msgstr "Показване в зона #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3822,9 +3672,8 @@ msgid "Theme Wallpaper"
 msgstr "Тапет от темата"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Тапет от темата"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3907,9 +3756,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f·сек"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Смяна на фона"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -3925,48 +3773,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Виртуални полета"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Диалогови настройки"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Общи настройки"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Изключване на диалозите за потвърждаване"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(Няма прозорци)"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "Диалог по подразбиране"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Прост достъп"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Сложен достъп"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Диалог по подразбиране"
 
@@ -3975,93 +3826,78 @@ msgid "Dialogs"
 msgstr "Диалози"
 
 #: src/modules/conf_display/e_int_config_display.c:129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored in %d seconds."
 msgstr ""
-"Това изглежда ли добре? Натиснете <hilight>Да</hilight> ако е така, или Не, "
-"ако не е.<br>Ако не натиснете нищо, старата разделителна способност от <br>%"
-"dx%d·при %d·Hz·ще бъде възстановена след %d·секунди."
 
 #: src/modules/conf_display/e_int_config_display.c:136
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
-"Това изглежда ли добре? Натиснете <hilight>Да</hilight> ако е така, или Не, "
-"ако не е.<br>Ако не натиснете нищо, старата разделителна способност от <br>%"
-"dx%d·ще бъде възстановена след %d·секунди."
 
 #: src/modules/conf_display/e_int_config_display.c:146
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Това изглежда ли добре? Натиснете <hilight>Да</hilight> ако е така, или Не, "
-"ако не е.<br>Ако не натиснете нищо, старата разделителна способност от <br>%"
-"dx%d·при %d·Hz·ще бъде възстановена <hilight>ВЕДНАГА</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:153
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Това изглежда ли добре? Натиснете <hilight>Да</hilight> ако е така, или Не, "
-"ако не е.<br>Ако не натиснете нищо, старата разделителна способност от <br>%"
-"dx%d·ще бъде възстановена <hilight>ВЕДНАГА</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
 msgstr "Смяна на разделителна способност"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Фаза"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Рестартиране"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
 msgstr "Настройки на разделителната способност"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Разделителна способност"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Възобновяване при влизане"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Опресняване"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Завъртане"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Огледално изображение"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Липсващи възможности"
 
-#: src/modules/conf_display/e_int_config_display.c:642
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4069,17 +3905,12 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
-"X сървърът на машината Ви няма поддръжка за<br><hilight>Xrandr</hilight> (X "
-"Преоразмеряване и ротация) допълнението. Не можете да променяте "
-"разделителната способност на екрана си без <br> поддръжката на това "
-"допълнение. Също така е възможно <br> когато сте инсталирали библиотеката "
-"<hilight>ecore</hilight> да не е била засечена поддръжка на Xrandr."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Не са намерени честоти на опресняване"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4114,9 +3945,8 @@ msgid "Enable Display Power Management"
 msgstr "Включване на енергийните настройки на монитора"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "Хронометър(и)"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
@@ -4135,7 +3965,7 @@ msgid "Power Management"
 msgstr "Енергийни настройки"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4145,113 +3975,107 @@ msgstr "<Без>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "Настройки на бързи клавиши"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Бързи клавиши"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "Добавяне"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "Изтриване на клавиш"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "Промяна на клавиш"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Изтриване на всички клавиши"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Връщане на стандартните настройки"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Параметри на действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "Общи настройки"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
-msgstr "Позволяване на прозорци да са над тези, с фаза цял екран"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "Серия от клавиши"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f·секунди"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr "Грешка в настройката"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
-"Серията от бързи клавиши която избрахте се използва от действие.<br><hilight>"
-"%s</hilight>.Изберете друга серия."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4261,9 +4085,8 @@ msgstr "WIN"
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "Начало"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4278,9 +4101,8 @@ msgid "Default Engine"
 msgstr "Възпройзвеждане по подразбиране"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
-#, fuzzy
 msgid "Enable Composite Support ?"
-msgstr "Включване на композиране на екрана"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4428,9 +4250,8 @@ msgid "Textblock Big"
 msgstr "Текстови блок (голям)"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Настройки на полетата"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4517,9 +4338,8 @@ msgid "Typebuf"
 msgstr "Буфер за писане"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Показване на икони вържу полето"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
@@ -4550,18 +4370,17 @@ msgstr "Много голям"
 msgid "%d pixels"
 msgstr "%d·пиксели"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Включване на шрифтови класове"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Прост текст за преглед: 123 Текст!"
 
@@ -4569,38 +4388,50 @@ msgstr "Прост текст за преглед: 123 Текст!"
 msgid "Font Classes"
 msgstr "Шрифтов клас"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Включване на шрифтов клас"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Текст за преглед: Някакъв текст на кирилица"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Заглаждане"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Шрифтове-резерви"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Име"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Включване на резерви"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Текст за преглед: Някакъв текст на кирилица"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4614,7 +4445,7 @@ msgstr "Теми за икони"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Тема за икони"
 
@@ -4662,9 +4493,8 @@ msgid "Exported Environment Variables"
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "Избор на конфигурация за входов метод..."
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
@@ -4687,19 +4517,17 @@ msgstr ""
 "копирането."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Език"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Настройки на избиране"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "Миниизображение"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
@@ -4720,23 +4548,22 @@ msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f·пиксела/сек"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f·сек"
+msgstr ""
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Вграден(и)"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -4863,7 +4690,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Полета на показалеца при автоплъзгане"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Други настройки"
 
@@ -5013,15 +4840,13 @@ msgstr "Настройки на показалеца"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
-#, fuzzy
 msgid "Show Cursor"
-msgstr "Цвят на сянката"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
-#, fuzzy
 msgid "Idle Cursor"
-msgstr "Използване на показалеца от X"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
@@ -5041,33 +4866,30 @@ msgstr "Размер на показалеца"
 msgid "Mouse Cursor"
 msgstr "Показалец"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Настройки на модули"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
-msgstr "Бутони на мишката"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Ускорение на показалеца"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Ускорение"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Праг"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Настройки при стартиране"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
@@ -5078,7 +4900,7 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Теми"
 
@@ -5127,9 +4949,8 @@ msgstr "%1.0f·к/сек"
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "Грешка при изпълнение"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5179,36 +5000,33 @@ msgstr "%1.0f·колекции"
 msgid "Performance"
 msgstr "Бързодействието"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Избор на профили"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Налични профили"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Избиране на edj файл"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "Оразмеряване"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "Искате да изтриете този рафт.<br><br>Сигурни ли сте?"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "Изтриване на клавиш"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Добавяне на нов профил"
 
@@ -5217,18 +5035,16 @@ msgid "Profiles"
 msgstr "Профили"
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Диалогови настройки"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "Повдигане"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
@@ -5236,9 +5052,9 @@ msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.0f·F"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
@@ -5250,9 +5066,8 @@ msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Забраняване"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
@@ -5270,29 +5085,25 @@ msgstr ""
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%1.0f·файлове"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Контейнер"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Минимален размер"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Максимален размер"
+msgstr ""
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Ниво"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
@@ -5351,9 +5162,8 @@ msgstr "Настроени рафтове"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Настройки при зареждане"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5379,24 +5189,23 @@ msgstr "Настройки при зареждане"
 msgid "Theme Selector"
 msgstr "Избиране на теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "Внасяне..."
+msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Категории за теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Възлагане"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Изчистване на всичко"
 
@@ -5423,9 +5232,8 @@ msgstr ""
 "Enlightenment не е могъл да внесе темата <br>заради грешка в копирането."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Теми за икони"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
@@ -5453,38 +5261,38 @@ msgid "Wallpaper Settings"
 msgstr "Настройки на тапетите"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Тапет от темата"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Картина..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Градиент..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Каде да се сложи тапетът"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Всички полета"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Това поле"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Този екран"
 
@@ -5505,14 +5313,14 @@ msgid "Fill Options"
 msgstr "Опции за изпълване"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Хоризонтално"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Вертикално"
 
@@ -5538,9 +5346,8 @@ msgstr ""
 "Поради неизвестни причини, Enlightenment не бе могъл да създаде градиент"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Настройки на тапетите"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5579,36 +5386,36 @@ msgstr "Използване от оригиналния файл"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Избиране на картина..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Грешка при внасяне на картината"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment·не успя да внесе картината<br>заради грешки в преобразуването."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Грешка при внасяне на тапета"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5616,10 +5423,9 @@ msgstr ""
 "Enlightenment не е могъл да внесе тапета. <br>Сигурни ли сте, че е валиден "
 "тапет?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "Тапет от темата"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5729,14 +5535,6 @@ msgstr "Предпочитане на потребителски икони"
 msgid "Prefer application provided icon"
 msgstr "Предпочитане на икони, добити от програмата"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Вътрешни прозорци"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Винаги запомняне на вътрешни прозорци"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Настройки на фокуса"
@@ -5824,9 +5622,8 @@ msgstr "Фокус на прозорци"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "Мърдане на прзорци"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -5849,43 +5646,33 @@ msgid "Resistance to desktop gadgets:"
 msgstr "Съпротивление със модулите:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "Клавиатура и мишка"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
-#, fuzzy
 msgid "Automatically accept changes after:"
-msgstr "Автоматично плъзгане на съдържание"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Преместване"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Оразмеряване"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "Политика на уголемяване"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Умно уголемяване"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Разширяване на прозорци"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Запълване на свободното място"
 
@@ -5893,29 +5680,27 @@ msgstr "Запълване на свободното място"
 msgid "Maximize Policy"
 msgstr "Политика на уголемяване"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "Уголемяване хоризонтално"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Разрешава манипулиране на прозорци"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Автоматично преместване на прозорци при автоматично скриване на рафтовете"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "Навиване на прозорци"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -5947,61 +5732,59 @@ msgstr "Повдигане при задвижване или оразмеряв
 msgid "Raise when clicking to focus"
 msgstr "Повдигане при щракване за фокус"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Запомняне"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "Настройване на запомняне"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
-msgstr "По подразбиране"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "Име на икони"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Клас"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "Клас"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Заглавие"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "Заглавие"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Роля"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "<Без>"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -6076,29 +5859,24 @@ msgid "Cpufreq"
 msgstr "Процесорна честота"
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Бързо (0,5 с)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Умерено (1 с)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Нормално (2 с)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Бавно (5 с)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Много бавно (30 с)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6125,9 +5903,8 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Автоматично заключване"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -6181,9 +5958,8 @@ msgstr ""
 "на честота през модула"
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Диалогови настройки"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6282,17 +6058,14 @@ msgid "Home"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:322
-#, fuzzy
 msgid "Favorites"
-msgstr "Меню за предпочитания"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "Рестартиране на компютъра"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:431
-#, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6302,15 +6075,8 @@ msgid ""
 "defaults will fix<br>that by adding it in. You can re-configure things now "
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
-"Конфигурацията трябва да се обнови. Старата ви конфигурация<br>е изтрита и е "
-"сложена нова, по подразбиране. Това става често по време<br>на "
-"разработването, затова не ни уведомявайте. Това просто означава, че "
-"Е<br>иска нови данни, които старата ви конфигурация не може да предостави. "
-"Сега<br>може да конфигурирате Е както ви харесва. Извиняваме се за това "
-"неудобство.<br>"
 
 #: src/modules/fileman/e_mod_main.c:444
-#, 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 "
@@ -6319,16 +6085,10 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Вашата конфигурация е по-нова от тази на Е. Това е много странно<br>и не би "
-"трябвало да става, освен ако не сте сложили по-стара<br>версия на Е, или не "
-"сте копирали конфигурацията от място, където има<br>по-нова версия. Това е "
-"лошо, и затова конфигурацията е възстановена по<br>подразбиране. Извиняваме "
-"се за това неудобство.<br>"
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "Конфигурация на файловия манипулатор"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
@@ -6339,9 +6099,8 @@ msgid "Icon Size"
 msgstr "Размер на иконите"
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "Режим за разглеждане"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6352,9 +6111,8 @@ msgid "Sort Dirs First"
 msgstr "Сортиране на директории най-отпред"
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Стандартен размер"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6381,14 +6139,13 @@ msgid "Show Toolbar"
 msgstr "Показване на лентата с инструменти"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:270
-#, fuzzy
 msgid "Show HAL icons on desktop"
-msgstr "Показване върху всички полета"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
@@ -6398,98 +6155,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Една директория нагоре"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Добавяне на стартер"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Отваряне"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Отваряне с ..."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "Програми"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Специфични програми"
 
-#: src/modules/fileman/e_fwin.c:1945
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr "Стартиране на програма"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Изтриване на клавиш"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Desktop файл"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6497,14 +6251,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Информация за връзката"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Файл:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6516,85 +6269,72 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Продължителност"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Файлов мениджър"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Файлов манипулатор"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Фонове"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Стартиране на програма"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Стартиране на програма"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Преходност за"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Анимация на прелистване"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Фонове"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "Части на интерфейса"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "Рамка"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "Винаги отгоре"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "Добавяне"
+msgstr ""
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-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
@@ -6614,9 +6354,8 @@ msgid "Select a window"
 msgstr "Избиране на прозорец"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "Прехвърляне"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
@@ -6626,7 +6365,7 @@ msgstr "Източник на избрания ibar"
 msgid "Icon Labels"
 msgstr "Надпис на иконата"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Имена на икони"
 
@@ -6674,58 +6413,54 @@ msgid "Remove Icon"
 msgstr "Премахване на икона"
 
 #: src/modules/ibar/e_mod_main.c:812
-#, fuzzy
 msgid "Add An Icon"
-msgstr "Добавяне на стартер"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:819
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Създаване на икона"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:835
 msgid "Add Application"
 msgstr "Добавяне на стартер"
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "Настройки на входящата кутия"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Показване на име"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Показване на заглавие"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Показване на клас"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Показване на име на икона"
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "Показване на данните"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Показване на прозорци от всички екрани"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Показване на прозорци от текущия екран"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Показване на прозорци от всички полета"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Показване на прозорци от текущо поле"
 
@@ -6742,94 +6477,84 @@ msgid "Flip desktop on mouse wheel"
 msgstr "Прелистване на екраните с колелото на мишката"
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Показване на икони вържу полето"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
-msgstr "Настройки за изкачащ прозорец на превключвателя"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
-msgstr "Показване на изскачащ прозорец при смяна на поле"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:132
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Показване на изскачащ прозорец при спешни прозорци"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Бутон за избор и плъзгане"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Щракнете"
 
-#: src/modules/pager/e_mod_config.c:174
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
-msgstr "Бутон за местене (Пази текущата позиция)"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr "Виртуални полета"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f·пиксела"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Съпротивление при плъзгане"
 
-#: src/modules/pager/e_mod_config.c:207
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "Бързина на изкачащ прозорец"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr "Бързина на изкачащ прозорец"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f·секунди"
 
-#: src/modules/pager/e_mod_config.c:229
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr "Настройки на списъка с прозорци"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "Показване на изскачащ прозорец при спешни прозорци"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Изскачащия прозорец остава на екрана"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Прихващане на бутони"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6837,70 +6562,58 @@ msgstr ""
 "Натиснете клавишна комбинация,<br>или <hilight>Escape</hilight>за отказ,"
 "<br>или <hilight>Del</hilight> за връщане."
 
-#: src/modules/pager/e_mod_config.c:343
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr "Действия"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:346
 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 ""
-"Десният бутон на мишката не може да се използва, защото вече се използва от "
-"E."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Бутон %i"
 
-#: src/modules/pager/e_mod_main.c:2844
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
-msgstr "Настройки за изкачащ прозорец на превключвателя"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "Прелистване полето надясно"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "Прелистване полето наляво"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "Прелистване полето нагоре"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
-msgstr "Прелистване полето надолу"
+msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
 msgstr "Старт"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Прегледът над системата е завържен"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:55
-#, fuzzy
 msgid "System Controls"
-msgstr "Прегледът над системата е завържен"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Общи настройки"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
@@ -7006,7 +6719,7 @@ msgstr "%1.0f·F"
 msgid "%1.0f C"
 msgstr "%1.0f·C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Температура"
 
@@ -7015,21 +6728,18 @@ msgid "Next"
 msgstr "Напред"
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Добре дошли в Enlightenment 0.17"
+msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "Избиране на икона"
+msgstr ""
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "Профили"
+msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7037,131 +6747,108 @@ msgid ""
 msgstr ""
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "Специфични програми"
+msgstr ""
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Използване на стандарто"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "Добавяне до стартер"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "Специфични програми"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Desktop файл"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Показване върху всички полета"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Показване на икони вържу полето"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Фокус"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Щракване за фокус"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "Избиране на икона"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:62
-#, fuzzy
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
-msgstr "Стартиране"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "Специфични програми"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:165
-#, fuzzy
 msgid "Capture"
-msgstr "Процесорна честота"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "Резултат"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Клас"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Отказ"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "Изчистване"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Отказ"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Файлов тип:"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Бледи"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
-#, fuzzy
 msgid "Mute"
-msgstr "Елемент от меню"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "Плъзгач"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Изход"
+msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -7172,33 +6859,28 @@ msgid "Sound Cards"
 msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "Размер"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:152
-#, fuzzy
 msgid "Launch mixer..."
-msgstr "Добавяне до стартер"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Настройки на модули"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Конфигурацията на файловия манипулатор е подновена"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "Прегледът над системата е завържен"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -7207,54 +6889,47 @@ msgid ""
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:214
-#, fuzzy
 msgid "Connection Manager"
-msgstr "Управление на прозорци"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Настройки на избиране"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:737
-#, fuzzy
 msgid "Network Device"
-msgstr "Сменяемо устройство"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
-#, fuzzy
 msgid "Wifi"
-msgstr "Изцяло вътре"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "Специфични програми"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Системни"
+msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "На плочки"
+#~ msgid "Window name and class"
+#~ msgstr "Име и клас на прозореца"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Конфигурация на виртуалните полета"
@@ -7277,6 +6952,18 @@ msgstr "Системни"
 #~ msgid "Configure"
 #~ msgstr "Конфигурация"
 
+#~ msgid "Configure Heading"
+#~ msgstr "Конфигурация на заглавие"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Вътрешни прозорци"
+
+#~ msgid "Expand the window"
+#~ msgstr "Разширяване на прозорци"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Разрешава манипулиране на прозорци"
+
 #~ msgid "Flip desktops when mouse at screen edge"
 #~ msgstr "Прелистване на екраните когато мишката е на ръба на екрана"
 
@@ -7286,19 +6973,12 @@ msgstr "Системни"
 #~ msgid "Time the mouse is at the edge before flipping:"
 #~ msgstr "Отнетото време на ръба, преди прелистване:"
 
-#~ msgid "Configure Heading"
-#~ msgstr "Конфигурация на заглавие"
-
 #~ msgid "Defined Command"
 #~ msgstr "Дефинирани команди"
 
 #~ msgid "Exit Immediately"
 #~ msgstr "Незабавен изход"
 
-#, fuzzy
-#~ msgid "Shut Down Immediately"
-#~ msgstr "Незабавен изход"
-
 #~ msgid "Shut Down"
 #~ msgstr "Изключване на компютъра"
 
@@ -7412,14 +7092,6 @@ msgstr "Системни"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Конфигурация на температурата"
 
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Конфигурация на превключватела на полета"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Конфигурациране на рафта"
-
 #~ msgid "Back"
 #~ msgstr "Назад"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 022e1bf..97e4ee3 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 5190ff3..993693b 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: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2008-06-26 11:22+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -14,29 +14,29 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Tanca"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -75,74 +75,74 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Estàs segur que vols matar aquesta finestra ?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Si"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Estàs segur que vol sortir ?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "S'ha demanat sortir de l'Enlightenment,<br><br>Estàs segur de què vols "
 "sortir?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Segur que vols sortir ?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "S'ha demanat sortir.<br><br> Estàs  segur de fer això ?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Segur que vols parar el Ordinador ?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "S'ha demanat parar l'Ordinador.<br><br>Segur que el vols parar ?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Segur que vols Re-iniciar ?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "S'ha demanat Re-iniciar l'Ordinador.<br><br> Segur que el vols Re-iniciar ?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "S'ha demanat Suspendre l'Ordinador.<br><br> Segur que el vols Suspendre ?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Estàs segur que vol hibernar ?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -150,525 +150,525 @@ msgstr ""
 "Has demanat Hibernar el seu Ordinador.<br><br> Estàs  segur que el vols "
 "suspendre a disc ?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mou "
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Re-dimensiona"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menú de Finestra"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Augment"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Més petit"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Mata"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Finestra : Estat"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Mode enganxós"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Mode icònic "
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximitza"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximitza Verticalment"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximitza Horitzontalment"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximitza a Pantalla Completa"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Mode Maximització \"Smart\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Mode Maximització \"Expand\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Mode Maximització \"Fill\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Mode d'Ombrejat Amunt Toggle"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Mode d'Ombrejat Avall Toggle"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Mode d'Ombrejat a l'Esquerrat Toggle"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Mode d'Ombrejat a Dreta Toggle"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Estat Sense Tanca de la Vora"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Estat de la Tanca Clavada "
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Taula de Treball"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Canvia de Taula de Treball per..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Canvia de Taula de Treball linealment ..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Canvia a la Taula de Treball 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Canvia a la Taula de Treball 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Canvia a la Taula de Treball 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Canvia a la Taula de Treball 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Canvia a la Taula de Treball 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Canvia a la Taula de Treball 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Canvia a la Taula de Treball 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Canvia a la Taula de Treball 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Canvia a la Taula de Treball 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Canvia a la Taula de Treball 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Canvia a la Taula de Treball 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Canvia a la Taula de Treball 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Canvia a la Taula de Treball ...."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Salta a la Taula de Treball de Baix"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Canvia de Taula de Treball per..."
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Canvia de Taula de Treball linealment ..."
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Canvia de Taula de Treball a ..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Canvia a la Taula de Treball 0"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Canvia a la Taula de Treball 1"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Canvia a la Taula de Treball 2"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Canvia a la Taula de Treball 3"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Canvia a la Taula de Treball 4"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Canvia a la Taula de Treball 5"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Canvia a la Taula de Treball 6"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Canvia a la Taula de Treball 7"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Canvia a la Taula de Treball 8"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Canvia a la Taula de Treball 9"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Canvia a la Taula de Treball 10"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Canvia a la Taula de Treball 11"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Canvia a la Taula de Treball ...."
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Envia el Ratolí A l'Escriptori 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Envia el Ratolí A l'Escriptori 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Envia el Ratolí a la Pantalla ...."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envia el Ratolí un Escriptori més enllà"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envia el Ratolí un Escriptori previ"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envia el Ratolí Endavant/Endarrera Pantalles"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Finestra : Moviment"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Següent Taula de Treball"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Envia a la Taula de Treball prèvia"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "A Taula de Treball #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "A Taula de Treball ..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Mostra el Menú Principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Mostra el Menú Favorits"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Mostra Totes les Aplicacions del Menú"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Mostra el Menú Clients"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Mostra Menú ..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Executa"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comanda"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplicació"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Re-inicia "
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 #, fuzzy
 msgid "Exit Now"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Mòdul  %s de Enlightenment"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Mostra a Pantalla Completa"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Mode d'Ombrejat Toggle"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Surt"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Re-iniciar l'ordinador"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Suspendre l'ordinador"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hiberna"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 #, fuzzy
 msgid "Lock"
 msgstr "Bloquejos "
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Neteja Finestres"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Finestra : Accions"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Accions del Mòdul"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Fons de Pantalla"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Fitxer de Taula de Treball"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Fitxer de Taula de Treball"
@@ -678,41 +678,40 @@ msgstr "Fitxer de Taula de Treball"
 msgid "Color Selector"
 msgstr "Selector de Perfil"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "D'acord"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Cancel·la "
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -731,7 +730,7 @@ msgstr ""
 "configuració.<br>Pot re-configurar les coses ara. Disculpa per les molèsties "
 "per la teva configuració<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -747,12 +746,12 @@ msgstr ""
 "fitxers de configuració han estat <br> restaurats per defecte. Perdona els "
 "inconvenients.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paràmetres de Pantalla"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -763,7 +762,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:1784
+#: src/bin/e_config.c:1774
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -778,7 +777,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:1797
+#: src/bin/e_config.c:1787
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -791,7 +790,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:1808
+#: src/bin/e_config.c:1798
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -804,7 +803,7 @@ msgstr ""
 "quedi 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:1820
+#: src/bin/e_config.c:1810
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -816,12 +815,12 @@ msgstr ""
 "succeït l'error és :<br> %s <br><br> Aquest fitxer ha estat borrat per dades "
 "incorrectes ."
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -829,12 +828,12 @@ msgstr "Problemes al Escriure la Configuració de l'Enlightenment"
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Bàsic"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Aplica"
 
@@ -842,7 +841,7 @@ msgstr "Aplica"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Mòduls"
 
@@ -851,27 +850,27 @@ msgstr "Mòduls"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Contenidor %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Error- no hi ha suport per PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "No hi ha suport per PAM en l'Enlightenment, <br> per tant el bloqueig de "
 "pantalla està  des-habilitat."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Errada en el Bloqueig"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -879,15 +878,15 @@ msgstr ""
 "El bloqueig de Taula de Treball ha fallat degut a què alguna aplicació <br> "
 "ha agafat el teclat o el ratolí o ambdós i no es pot fer el bloqueig"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Si us plau, introdueix la teva paraula clau de desbloqueig"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Error del Sistema d'Autentificació"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -898,22 +897,22 @@ msgstr ""
 "que ha succeït és <hilight>%i</hilight>.<br> Això és dolent i no hauria "
 "d'estar passant.Si us plau, reporta aquest bug."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -939,7 +938,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de l'Entrada de Taula de Treball"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -985,7 +984,7 @@ msgstr "Categories"
 msgid "Mime Types"
 msgstr "Tipus de fitxers"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 #, fuzzy
 msgid "Options"
 msgstr "Aplicacions"
@@ -1018,23 +1017,23 @@ msgstr "Seleccioneu una Icona"
 msgid "Select an Executable"
 msgstr "Seleccioneu un Executable "
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Talla"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Còpia "
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Enganxa"
 
@@ -1042,24 +1041,24 @@ msgstr "Enganxa"
 msgid "Select All"
 msgstr "Selecciona-ho Tot"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Error al fer Córrer l'Aplicació"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1068,71 +1067,71 @@ msgstr ""
 "Enlightenment no està  autoritzat a fer córrer l'aplicació.<br><br>%"
 "s<br><br> L'aplicació ha fallat en arrencar"
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Error en l'Execució de l'Aplicació"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s ha parat d'executar-se inesperadament."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, 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:450
+#: src/bin/e_exec.c:483
 #, 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:454
+#: src/bin/e_exec.c:487
 #, 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:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, 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:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, 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:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 #, fuzzy
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
@@ -1140,255 +1139,255 @@ msgstr ""
 "***El recordatori de sortida ha estat trancat. Guarda la sortida per veure."
 "***<br>"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Error en els Logs"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "No hi havia missatge d'error"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Desa Aquest Missatge"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Error d'Informació"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Error del senyal d'Informació"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Dades de sortida"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "No hi ha sortida"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Fitxers"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 #, fuzzy
 msgid "Link"
 msgstr "Lineal "
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 #, fuzzy
 msgid "Abort"
 msgstr "Quant a..."
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paràmetres de Configuració "
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode Bàsic"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Refresca la Vista"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Mostra els Fitxers Ocults"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Recorda l'Ordre"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Ordena Ara"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nou Directori"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Canvia el Nom"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propietats"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 #, fuzzy
 msgid "Use default"
 msgstr "Ajusta a Predeterminat"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Fitxers d'Icones"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Costum"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Llistat de Finestres"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Nom d'Icona"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "Fons de Pantalla"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Creeu un nou Directori"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nom Nou del Directori:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Canvia el nom %s a : "
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Canvia el nom del Fitxer"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 #, fuzzy
 msgid "Retry"
 msgstr "Re-inicia "
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 #, fuzzy
 msgid "Error"
 msgstr "Error en Execució"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "Carregant %s"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Estàs segur que vol borrar <br> <hilight> %s</hilight>?"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmació de Borrar"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Estàs segur que vol borrar <br> <hilight> %s</hilight>?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1401,144 +1400,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Propietats del Fitxer"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fitxer"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Mida"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Última Modificació"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tipus de Fitxer"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permisos"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Propietari"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Altre poden llegir"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Altres poden escriure"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "El Propietari pot llegir"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "El Propietari pot escriure"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Vista prèvia"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Defecte"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Ungla"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Costum"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Utilitza aquest icona pels fitxers d'aquest tipus"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Informació d'Enllaç "
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Seleccioneu una Imatge"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Desconegut"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Dispositiu Extraïble"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Borra aquest Gadget"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Text Pla"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Sagnat"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Aparença"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Mostra automàticament els continguts"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Autoritzat a ser re-dimensionat"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Inici de moviment/re-dimensió d'aquest Gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Borra aquest Gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Para de moure/re-dimensionar aquest gadget"
 
@@ -1551,7 +1555,7 @@ msgstr ""
 "Un altra Enlightenment previ està actiu en aquesta pantalla. Avortada "
 "l'arrencada.<br>"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Bloqueig de Finestra"
 
@@ -1587,21 +1591,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Apilant"
 
@@ -1610,12 +1614,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Estat ombrejat"
 
@@ -1624,7 +1628,7 @@ msgid "Maximized state"
 msgstr "Estat maximitzat"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Pantalla completa"
 
@@ -1632,7 +1636,7 @@ msgstr "Pantalla completa"
 msgid "Lock me from changing:"
 msgstr "Bloquegi'm  de canviar:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Estil de Vora"
 
@@ -1683,118 +1687,119 @@ msgstr "Desbloqueja de l'Àrea de Treball "
 msgid "More..."
 msgstr "Importa..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximitza verticalment"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximitza horitzontalment"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Des-maximitza "
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 #, fuzzy
 msgid "Keyboard Shortcut"
 msgstr "Teclat i Ratolí "
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 #, fuzzy
 msgid "To Favorites Menu"
 msgstr "Menú Favorits"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 #, fuzzy
 msgid "To Launcher"
 msgstr "Afegir al Llançador"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Vora"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Salta"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Estat"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Recorda"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propietats de Finestra"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Sempre davant"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Sempre Darrera"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Selecciona Estil de Vora"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Usa l'Icona per Defecte de l'E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Usa l'Icona de l'Aplicació "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Utilitza Icones Definits per L'usuari"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Ombrejat"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Enganxós"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Pantalla Completa"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Llista de Finestres"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Paginador"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 #, fuzzy
 msgid "Taskbar"
 msgstr "Salta Taskbar"
@@ -1811,7 +1816,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:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Títol"
 
@@ -1903,11 +1908,11 @@ msgstr "Propietats NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Salta Taskbar"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Salta Paginador"
 
@@ -1915,15 +1920,15 @@ msgstr "Salta Paginador"
 msgid "Hidden"
 msgstr "Ocult"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Recorda la Finestra"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 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:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1947,11 +1952,11 @@ msgstr ""
 "preferències seran acceptades. Pitja <hilight> Cancel·la </hilight> si no "
 "estàs segur i no vol fer els canvis."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "No s'han guardat els joc de propietats"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1963,106 +1968,105 @@ msgstr ""
 "finestra <br><hilight>sense especificar com recordar això</hilight>.<br><br> "
 "Has d'especificar com a mínim 1 manera de recordar aquesta finestra."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Estàs intentant de demanar a Enlightenment que recordi "
-"d'aplicar<br>propietats (com mida, localització, estil de vora etc.) a la "
-"finestra <br><hilight>sense especificar com recordar això</hilight>.<br><br> "
-"Has d'especificar com a mínim 1 manera de recordar aquesta finestra."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Res"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Mida i Posició"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Bloquejos "
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Mida, Posició i Presentació"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Tot"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Recorda usant"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nom de Finestra i Classe"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Manegador de Finestra"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Classe de Finestra"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Paper de la Finestra"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tipus de Finestra"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr " "
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propietats a Recordar"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Preferència d' Icona"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Taula de Treball Virtual"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Pantalla Actual"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ignora la llista de Finestres"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Error al fer Córrer l'Aplicació"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Lligua només amb una finestra"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Arrenca aquest programa al iniciar"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Canvia les Propietats de l'Icona"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Arrenca aquest programa al iniciar"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 #, fuzzy
 msgid "Settings"
@@ -2084,24 +2088,24 @@ msgstr "Lleixa #"
 msgid "Module Settings"
 msgstr "Configuració del Mòdul"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Mòduls  Autoritzats "
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Carregant Mòdul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Mòduls Carregats "
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Mòduls Descarregats "
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2137,8 +2141,8 @@ msgstr "Borrar Gadget"
 msgid "Toolbar Settings"
 msgstr "Paràmetres"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Disposició "
 
@@ -2166,12 +2170,12 @@ msgid "Favorite Applications"
 msgstr "Aplicacions Preferents"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2180,7 +2184,7 @@ msgstr "Aplicacions"
 msgid "Windows"
 msgstr "Finestres"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Finestres Perdudes"
 
@@ -2217,131 +2221,130 @@ msgstr "(Sense Aplicacions) "
 msgid "Set Virtual Desktops"
 msgstr "Taules de Treball Virtuals"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(No Ha Ha Finestres)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "No hi ha Nom!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(No existeixen Lleixes"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Lleixa #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Afegeix una Lleixa"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Elimina la Lleixa"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Configuració de les LLeixes"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Molt petit"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Petit"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Mitjà"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Gran"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Damunt de tot"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Sota Finestres"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Per sota de tot"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Deixa solapar les finestres a la lleixa"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Estils"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Auto oculta "
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Oculta automàticament la Lleixa"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Mostra Quan el ratolí estigui sobre "
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Mostra en clicar el ratolí "
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Temps d'Amagar"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segons"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Durada de l'ocultació "
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Mostra la Taula de Treball"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Mostra la Taula de Treball"
@@ -2576,7 +2579,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 #, fuzzy
 msgid ""
 "Enlightenment cannot set up init screen.\n"
@@ -2585,11 +2588,11 @@ msgstr ""
 "Enlightenment no pot carregar aquesta pantalla d'inici.<br> Potser que "
 "estigui fora de memòria ?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
@@ -2598,7 +2601,7 @@ msgstr ""
 "Enlightenment ha trobat que Evas no pot crear el Bufer canvas. Si us plau, "
 "<br> comproba que Evas té suport pel motor del Bufer de Software.<br> "
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
@@ -2607,7 +2610,7 @@ msgstr ""
 "Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
 "Evas<br> tingui suport per PNG.<br>"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
@@ -2616,7 +2619,7 @@ msgstr ""
 "Enlightenment ha trocat que Evas no pot carregar fitxers JPEG. Comproba que "
 "Evas<br> tingui suport per JPEG.<br>"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
@@ -2625,7 +2628,7 @@ msgstr ""
 "Enlightenment ha trocat que Evas no pot carregar fitxers EET. Comproba que "
 "Evas<br> tingui suport per EET.<br>"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
@@ -2635,12 +2638,12 @@ msgstr ""
 "Enlightenment ha trocat que Evas no pot carregar fitxers PNG. Comproba que "
 "Evas<br> tingui suport per PNG.<br>"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 #, fuzzy
 msgid "Setup Screens"
 msgstr "Pantalla Actual"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 #, fuzzy
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
@@ -2649,209 +2652,209 @@ msgstr ""
 "Enlightenment ha fallat quan intentava carregar totes les pantalles virtuals "
 "del sistema .Potser que hi hagi un altre sistema de finestres corrent ? <br> "
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Screensaver"
 msgstr "Salva Pantalles"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment no pot configurar el Salva-Pantalles de X"
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 #, fuzzy
 msgid "Setup Desklock"
 msgstr "Envia a la Taula de Treball"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment no pot bloquejar la pantalla."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 #, fuzzy
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 #, fuzzy
 msgid "Setup Actions"
 msgstr "Inicia Aplicacions"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment no pot fer aquestes accions de sistema."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Recorda"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment no pot guardar les opcions de recordar."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 #, fuzzy
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment no pot inicialitzar el Manegador de Fitxers. <br>  "
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 #, fuzzy
 msgid "Setup Modules"
 msgstr "Mòduls"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment no pot carregar aquest mòdul de sistema."
 
+#: src/bin/e_main.c:884
+#, fuzzy
+msgid "Setup Remembers"
+msgstr "Recorda"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment no pot guardar les opcions de recordar."
+
+#: src/bin/e_main.c:894
 #, fuzzy
 msgid "Setup Color Classes"
 msgstr "Tipus de Color"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 #, fuzzy
 msgid "Setup Gadcon"
 msgstr "Configuració de la Comanda"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment no pot carregar el gadjet de control de sistema."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment no pot configurar els paràmetres DPMS"
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 #, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment no pot carregar aquest mòdul de sistema."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 #, fuzzy
 msgid "Setup Wallpaper"
 msgstr "Fons de Taula de Treball"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment no pot carregar aquest fons de pantalla d'escriptori"
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment no pot configurar els paràmetres DPMS"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 #, fuzzy
 msgid "Setup Bindings"
 msgstr "Bindatje de tecles"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment no pot carregar aquesta combinació de tecles del sistema."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 #, fuzzy
 msgid "Setup Shelves"
 msgstr "Lleixes"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment no pot configurar el sistema de Lleixes."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 #, fuzzy
 msgid "Setup Thumbnailer"
 msgstr "Ungla"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 #, fuzzy
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment no pot inicialitzar el sistema d'Ungla.<br>"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 #, fuzzy
 msgid "Load Modules"
 msgstr "Carregant Mòdul"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2864,11 +2867,11 @@ msgstr ""
 "configuració del  mòdul <br> hauria de deixar-li carregar els mòduls un "
 "altra cop."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment ha fallat poc després d'arrencar i serà reiniciat."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2881,16 +2884,16 @@ msgstr ""
 "configuració<br>El mòdul de diàleg de configuració et permetrà "
 "seleccionar<br> el mòduls altra cop."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 #, fuzzy
 msgid "Configure Shelves"
 msgstr "LLeixes Configurades"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2899,11 +2902,11 @@ msgstr ""
 "Hi ha hagut un error carregant el mòdul : %s<br> No s'ha pogut trobar cap "
 "mòdul anomenat %s <br> en el directori de cerca de mòduls."
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Error Carregant el Mòdul "
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2912,11 +2915,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Mòdul que no conté totes les funcions necessàries."
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2924,12 +2927,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Mòdul  %s de Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Estàs segur que vol descarregar aquest mòdul ?<br>"
 
@@ -2940,31 +2943,31 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Estàs Segur que Vols Eliminar aquesta Lleixa?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "S'ha demanat borrar aquesta Lleixa,<br><br>Estàs segur que la vol eliminar ?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar de Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Començar a Moure/Re-dimensionar Elements"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Elimina Aquesta Lleixa"
 
@@ -2982,11 +2985,11 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problemes de Sortida"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2996,32 +2999,32 @@ msgstr ""
 "tancades <br> Vol acabar de sortir<br> sense tancar aquestes aplicacions "
 "<br> primer ?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Sortir ara"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Espera"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Anul·la la Sortida"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Sortir està  en Procés"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Sortir està en procés.<br><hilight> Si us plau, espera</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment està  col·lapsat per un altra procés"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -3030,7 +3033,7 @@ msgstr ""
 "Enlightenment s'ha sobrecarregat sortint.<br> No es poden executar altres "
 "accions de <br> sistema fins que no s'hagi sortit"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -3039,7 +3042,7 @@ msgstr ""
 "Enlightenment està parant el sistema. <br> No pot executar més accions del "
 "sistema <br> ja que la parada ha estat executada."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -3048,7 +3051,7 @@ msgstr ""
 "Enlightenment està  re-iniciant el sistema.<br> No es poden executar altres "
 "accions de <br> sistema ja que el sistema s'està  re-iniciant"
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -3057,7 +3060,7 @@ msgstr ""
 "Enlightenment està  suspenent el sistema.<br> Fins que la suspensió del "
 "sistema no sigui completa no <br>pot executar altres accions de sistema."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
@@ -3066,62 +3069,62 @@ msgstr ""
 "Enlightenment està  hibernant el sistema.<br>No es poden executar altres "
 "accions de sistema <br> fins que l'hibernació sigui completa"
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid "Reset failed."
 msgstr "Fitxer de Taula de Treball"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid "Suspend failed."
 msgstr "La suspensió del sistema ha fallat."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "La hibernació del sistema ha fallat."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Re-iniciant l'ordinador.<br> <hilight> Si us plau, espera.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 #, fuzzy
 msgid "Resetting"
 msgstr "Paràmetres de Pantalla"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Re-iniciant l'ordinador.<br> <hilight> Si us plau, espera.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Suspenent "
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspenent l'ordinador.<br> <hilight> Si us plau, espera.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernant"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernant l'ordinador.<br><hilight>Si us plau, espera</hilight>"
@@ -3141,88 +3144,88 @@ msgstr "Escull un Tema"
 msgid "Set Toolbar Contents"
 msgstr "Continguts de la LLeixa"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "No es pot sortir - Finestres immortals"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "En el Futur"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "En aquest últim Minut"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anys"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Mesos "
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Setmanes"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dies"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Hores"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuts"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconegut"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3242,51 +3245,51 @@ msgstr "Amunt"
 msgid "Down"
 msgstr "Avall "
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Afegeix a Aplicacions Preferents"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Puja un Directori"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permisos"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificat:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Tu"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protegit"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Només lectura"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Oblidat"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Escriptura-Lectura"
 
@@ -3303,63 +3306,63 @@ msgstr "Configuracions Bàsiques"
 msgid "Show alert when battery is low"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 #, fuzzy
 msgid "Check every:"
 msgstr "Xaqueja  la bateria cada "
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fitxers..."
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 #, fuzzy
 msgid "Polling"
 msgstr "Text Pla"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 #, fuzzy
 msgid "Show alert on low battery"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 #, fuzzy
 msgid "Alert when at:"
 msgstr "Avisa'm quan la bateria estigui per sota de :"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minuts"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, fuzzy, c-format
 msgid "%1.0f %%"
 msgstr "%3.0f%%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f sec"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 #, fuzzy
 msgid "Alert"
 msgstr "Acceleració"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 #, fuzzy
 msgid "Auto Detect"
 msgstr "Auto oculta "
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3367,13 +3370,13 @@ msgstr "Auto oculta "
 msgid "Internal"
 msgstr "Intern"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3381,25 +3384,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Mostrem una alerta quan la bateria estigui baixa"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Bateria"
@@ -3408,23 +3411,23 @@ msgstr "Bateria"
 msgid "Clock"
 msgstr "Rellotge"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Paràmetres de Pantalla"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "Paràmetres de Pantalla"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 #, fuzzy
 msgid "Offline"
 msgstr "Parat"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "Mòduls"
@@ -3451,7 +3454,7 @@ msgid "Restart Applications"
 msgstr "Re-inicia Aplicacions"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Totes les Aplicacions"
 
@@ -3475,12 +3478,12 @@ msgstr "Altre IBar"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menús"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Estil de Vora per Defecte"
 
@@ -3488,7 +3491,7 @@ msgstr "Estil de Vora per Defecte"
 msgid "Window Border Selection"
 msgstr "Selecció de la Vora de la Finestra"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 "Recorda aquesta Vora per aquesta finestra la pròxima vegada que aquesta "
@@ -3497,7 +3500,7 @@ msgstr ""
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3524,7 +3527,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3794,9 +3797,9 @@ msgid "Desktop Name"
 msgstr "Nom de Taula de Treball"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nom:"
 
@@ -3865,10 +3868,10 @@ msgstr "%1.0f minuts"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personal"
@@ -3900,8 +3903,8 @@ msgstr "Mostra en la zona de pantalla #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -4024,48 +4027,53 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Taules de Treball Virtuals"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Configuració de Diàlegs"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Configuracions Generals"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Deshabilita els Diàlegs de Confirmació "
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 #, fuzzy
 msgid "Normal Windows"
 msgstr "(No Ha Ha Finestres)"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 #, fuzzy
 msgid "Default Settings Dialogs Mode"
 msgstr "Mode de Diàleg per Defecte"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Mode Bàsic"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Mode avançat"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Mode de Diàleg per Defecte"
 
@@ -4135,31 +4143,31 @@ msgstr "Re-inicia "
 msgid "Screen Resolution Settings"
 msgstr "Configuració de Resolució de Pantalla"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Resolució"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaura en Entrar"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotació:"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -4174,11 +4182,11 @@ msgstr ""
 "significar també<br> quan es va construir <hilight>ecore</hilight> <br>no hi "
 "havia suport per XRandr."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4234,7 +4242,7 @@ msgid "Power Management"
 msgstr "Manegament d'Energia"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4244,83 +4252,88 @@ msgstr "Cap"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Binding Settings"
 msgstr "Opcions de Key Binding"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Bindatje de tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 #, fuzzy
 msgid "Add Edge"
 msgstr "Afegir Gadget "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 #, fuzzy
 msgid "Delete Edge"
 msgstr "Elimina Tecla"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 #, fuzzy
 msgid "Modify Edge"
 msgstr "Modificar Tecla"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Elimina-ho Tot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Ajusta a predeterminat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Acció"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paràmetres d'Acció "
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 #, fuzzy
 msgid "General Options"
 msgstr "Configuracions Generals"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Seqüència de Bindatge de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f segons"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "Error de Bindatge de Tecles"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4329,27 +4342,27 @@ msgstr ""
 "El Seqüència de Bindatge de tecles que ha escollit està  essent usat per "
 "l'acció <br> <hilight>%s</hilight>. Si us plau tria una altra seqüència."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4650,18 +4663,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4669,37 +4681,51 @@ msgstr ""
 msgid "Font Classes"
 msgstr "Tipus de Lletra"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Autoritza Tipus de Lletra"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Tipus de Lletra"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Estils"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4714,7 +4740,7 @@ msgstr "Temes d'Icona"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema d'Icones"
 
@@ -4785,7 +4811,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Llengua"
 
@@ -4962,7 +4988,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Opcions Variades"
 
@@ -5140,26 +5166,26 @@ msgstr "Mida del Cursor "
 msgid "Mouse Cursor"
 msgstr "Cursor del Ratolí "
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 #, fuzzy
 msgid "Mouse Settings"
 msgstr "Configuració del Mòdul"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 #, fuzzy
 msgid "Mouse Hand"
 msgstr "Bindatje del Ratolí "
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Acceleració del Ratolí "
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Acceleració"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -5177,7 +5203,7 @@ msgid "Images"
 msgstr "Imatges"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temes"
 
@@ -5278,37 +5304,37 @@ msgstr "%1.0f text d'element de llista"
 msgid "Performance"
 msgstr "Representació"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Selector de Perfil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Perfils Autoritzats"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "Seleccioneu Fitxer Edj"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 #, fuzzy
 msgid "Reset"
 msgstr "Re-dimensiona"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, fuzzy, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 "S'ha demanat borrar aquesta Lleixa,<br><br>Estàs segur que la vol eliminar ?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 #, fuzzy
 msgid "Delete OK?"
 msgstr "Elimina Tecla"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Afegeix Nou Perfil"
 
@@ -5482,24 +5508,24 @@ msgstr "Arrancada"
 msgid "Theme Selector"
 msgstr "Selector de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 #, fuzzy
 msgid " Import..."
 msgstr "Importa..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Categories de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Assigna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Neteja-ho Tot"
 
@@ -5556,38 +5582,38 @@ msgid "Wallpaper Settings"
 msgstr "Paràmetres de Fons de Pantalla"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Utilitza la Imatge del Tema "
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Imatge"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Totes les Taules de Treball"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Aquesta Taula de Treball"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Aquesta Pantalla"
 
@@ -5608,14 +5634,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horitzontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5681,40 +5707,40 @@ msgstr "Usa el fitxer original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Seleccioneu un Dibuix"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Error d'Importació d'Imatge"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 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:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Error d'Importació de Fons d'Escriptori"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 #, fuzzy
 msgid "Exchange wallpapers"
 msgstr "Fons de Pantalla del Tema"
@@ -5827,14 +5853,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Finestres Internes"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Configuració del Focus"
@@ -5973,17 +5991,12 @@ msgid "Window Maximize Policy"
 msgstr "Colors del Manegador de Finestra"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr ""
 
@@ -5991,20 +6004,20 @@ msgstr ""
 msgid "Maximize Policy"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 #, fuzzy
 msgid "Maximize Directions"
 msgstr "Maximitza Horitzontalment"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Autoritza Manipulació de Finestres"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automàticament finestres de moviment/mida enlleixes d'auto-amagades "
 
@@ -6044,58 +6057,67 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: 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:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Recorda aquesta aparença"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 #, fuzzy
 msgid "Delete Remember(s)"
 msgstr "Recorda"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 #, fuzzy
 msgid "Details"
 msgstr "Defecte"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 #, fuzzy
 msgid "<No Name>"
 msgstr "Nom d'Icona"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 #, fuzzy
 msgid "Class:"
 msgstr "Classe"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 #, fuzzy
 msgid "<No Class>"
 msgstr "Classe"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 #, fuzzy
 msgid "Title:"
 msgstr "Títol"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 #, fuzzy
 msgid "<No Title>"
 msgstr "Títol"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 #, fuzzy
 msgid "Role:"
 msgstr "Paper"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 #, fuzzy
 msgid "<No Role>"
 msgstr "Cap"
@@ -6486,7 +6508,7 @@ msgid "Show Toolbar"
 msgstr "Color d'Ombra"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6503,98 +6525,98 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Pujar al Directori Pare"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "Afegeix Aplicació"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Obre"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Obre amb ..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "Aplicacions"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Aplicacions Específiques"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 #, fuzzy
 msgid "Custom Command"
 msgstr "Executa Comanda"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Elimina Tecla"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Fitxer de Taula de Treball"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6621,17 +6643,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "Durada de l'ocultació "
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Manegador de Fitxers "
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6677,21 +6699,21 @@ msgstr "Fons de Pantalla"
 msgid "Gadgets"
 msgstr "Afegir Gadget "
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 #, fuzzy
 msgid "Free"
 msgstr "Feroès "
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 #, fuzzy
 msgid "Always on desktop"
 msgstr "Sempre davant"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 #, fuzzy
 msgid "Add other gadgets"
 msgstr "Afegir Gadget "
@@ -6730,7 +6752,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr "Etiquetes d'Icones"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Mostra l'Etiqueta d'Icona"
 
@@ -6793,45 +6815,45 @@ msgstr "Crea Icona"
 msgid "Add Application"
 msgstr "Afegeix Aplicació"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 #, fuzzy
 msgid "IBox Settings"
 msgstr "Paràmetres de Configuració de la Finestra d'Entrada"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Mostra el Nom"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Mostra el Títol "
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Mostra la Classe"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Mostra el Nom de l'Icona "
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 #, fuzzy
 msgid "Display Border Caption"
 msgstr "Mostra Informació"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Mostra les Finestres de Totes les Pantalles"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Mostra les Finestres d'Aquesta Pantalla"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Mostra les Finestres de totes les Taules de Treball"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Mostra les Finestres d'aquesta Taula de Treball activa"
 
@@ -6852,12 +6874,12 @@ msgstr "Canvia de Taula de Treballi quan el ratolí estigui a l'extrem"
 msgid "Show desktop names"
 msgstr "Mostra els icones de Taula de Treball"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Mostra l'Indicador de Taula de Treball en canviar"
@@ -6867,74 +6889,74 @@ msgstr "Mostra l'Indicador de Taula de Treball en canviar"
 msgid "Show popup for urgent windows"
 msgstr "Mostra el Popup en una Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Seleccioni i Rellisqui botó"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Click al conjunt"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Taula de Treball Virtual"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Resistència en Arrastrar Finestres"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Velocitat Desplegable"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 #, fuzzy
 msgid "Popup speed"
 msgstr "Velocitat Desplegable"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segons"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Mostra el Popup en una Finestra Urgent"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6942,12 +6964,12 @@ msgstr ""
 "Si us plau, pitja un botó del ratolí<br> Pitja <hilight>Escape</hilight> per "
 "avortar.<br> O <hilight>Del</hilight> per restaurar el botó"
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 #, fuzzy
 msgid "Attetion"
 msgstr "Acció"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6957,33 +6979,33 @@ msgstr ""
 "No es pot usar el botó dret del ratolí.<br> Aquest botó està  essent usat "
 "per menús de context"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Botó %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paràmetres de Popups"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Salta a la Taula de Treball de la Dreta"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Salta a la Taula de Treball de l'Esquerra"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Salta a la Taula de Treball de Dalt"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Salta a la Taula de Treball de Baix"
@@ -7110,7 +7132,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -7124,17 +7146,17 @@ msgstr "NetWM"
 msgid "Welcome to Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 #, fuzzy
 msgid "Select one"
 msgstr "Seleccioneu una Icona"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Profile"
 msgstr "Perfils"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7190,17 +7212,17 @@ msgstr "Tancant la finestra"
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 #, fuzzy
 msgid "Select Icons to Add"
 msgstr "Seleccioneu una Icona"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 #, fuzzy
 msgid "Quick Launch"
 msgstr "Executa"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 #, fuzzy
 msgid "Select Applications"
 msgstr "Aplicacions Específiques"
@@ -7342,19 +7364,49 @@ msgstr "Aplicacions Específiques"
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 #, fuzzy
 msgid "Systray"
 msgstr "Sistema"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Estàs intentant de demanar a Enlightenment que recordi "
+#~ "d'aplicar<br>propietats (com mida, localització, estil de vora etc.) a la "
+#~ "finestra <br><hilight>sense especificar com recordar això</hilight>."
+#~ "<br><br> Has d'especificar com a mínim 1 manera de recordar aquesta "
+#~ "finestra."
+
+#~ msgid "Window name and class"
+#~ msgstr "Nom de Finestra i Classe"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Finestres Internes"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Autoritza Manipulació de Finestres"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "Teula"
diff --git a/po/cs.gmo b/po/cs.gmo
index aea609d..498b3fe 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 9ab206e..0b0e45d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-03 18:04+0100\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-01 14:05+0100\n"
 "Last-Translator: quaker66 <quaker66 at gmail.com>\n"
 "Language-Team: easylinux <easylinux at sachiel.eu>\n"
 "MIME-Version: 1.0\n"
@@ -18,28 +18,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenmentu"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -48,13 +48,13 @@ 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-2008, Tým vývojářů Enlightenmentu.<br><br>Doufáme, že "
+"Copyright &copy; 1999-2009, Tým vývojářů Enlightenmentu.<br><br>Doufáme, že "
 "si náš software užijete stejně, jak jsme si užívali jeho tvorbu."
 "<br><br>Tento software je poskytován jak je a BEZ ZÁRUKY. Tento software je "
 "chráněn licencí, více informací najdete v souborech COPYING a COPYING-PLAIN "
 "ve vašem systému.<br><br>Enlightenment je stále <hilight>VE VÝVOJI</hilight> "
 "a není stabilní. Mnoho funkcí je nehotových, neexistují nebo mohou být "
-"zabugované. Byl jste <hilight>VAROVÁN!</hilight>"
+"zabugované. Byli jste <hilight>VAROVÁNI!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -74,563 +74,563 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Opravdu chcete zabít toto okno?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ano"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Opravdu chcete jít pryč?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Opravdu chcete vypnout Enlightenment?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Opravdu se chcete odhlásit?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Opravdu se chcete odhlásit?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Opravdu chcete vypnout PC?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Opravdu chcete vypnout počítač?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Opravdu chcete restartovat PC?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Opravdu chcete restartovat počítač?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Opravdu chcete uspat počítač?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Opravdu chcete hibernovat PC?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "Opravdu chcete hibernovat počítač?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Okno : Akce"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Přesunout"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Změnit velikost"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu okna"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Do popředí"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Nižší"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Zabít"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Přepnout lepkavý mód"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Přepnout ikonický mód"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Přepnout fullscreen mód"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximalizovat"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximalizovat vertikálně"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximalizovat horizontálně"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovat fullscreen"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Mód maximalizace \"Chytrý\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Mód maximalizace \"Roztáhnout\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Mód maxilaizace \"Vyplnit\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Zarolovat okno nahoru"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Zarolovat okno dolů"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Zarolovat okno doleva"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Zarolovat okno doprava"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Změnit mód stínu"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Přepnout stav bez rámů"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Přepnout přitlačený stav"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Překlopit desktop doleva"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Překlopit desktop doprava"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Překlopit plochu nahoru"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Překlopit desktop dolů"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Překlopit plochu z..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Zobrazit plochu"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Zobrazit panel"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Překlopit plochu na..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Překlopit plochu lineárně"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Přejít na plochu 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Přejít na plochu 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Přejít na plochu 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Přejít na plochu 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Přejít na plochu 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Přejít na plochu 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Přejít na plochu 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Přejít na plochu 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Přejít na plochu 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Přejít na plochu 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Přejít na plochu 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Přejít na plochu 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Přejít na plochu..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Překlopit desktop doleva (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Překlopit plochu doprava (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Překlopit plochu nahoru (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Překlopit desktop dolů (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Překlopit plochu z... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Překlopit plochu na... (Všechny obrazovkyú"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Překlopit plochu lineárně... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Překlopit plochu ve směru..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Přejít na plochu 0 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Přejít na plochu 1 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Přejít na plochu 2 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Přejít na plochu 3 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Přejít na plochu 4 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Přejít na plochu 5 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Přejít na plochu 6 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Přejít na plochu 7 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Přejít na plochu 8 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Přejít na plochu 9 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Přejít na plochu 10 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Přejít na plochu 11 (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Přejít na plochu... (Všechny obrazovky)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Poslat myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Poslat myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Poslat myš na obrazovku..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslat myš dopředu o jednu obrazovku"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslat myš zpět o jednu obrazovku"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslat myš dopředu/zpět..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Okno : Pohyb"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Na další plochu"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Na předchozí plochu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Z plochy #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Zobrazit hlavní menu"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Zobrazit menu oblíbených"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Zobrazit všechny menu aplikací"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Zobrazit menu oken"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Zobrazit menu..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Spustit"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplikace"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Pryč"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Pryč teď"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Mód"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Přepnout mód prezentace"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Přepnout mód offline"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Odhlásit se"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Vypnout nyní"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Vypnout"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Restartovat"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Uspat"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernovat"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Zamknout"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Vyčistit okna"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Různé : Akce"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Zpožděná akce"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Použít jako pozadí"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Scan desktop souborů dokončen."
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Scan desktop souboru"
 
@@ -638,41 +638,40 @@ msgstr "Scan desktop souboru"
 msgid "Color Selector"
 msgstr "Výběr barvy"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -690,7 +689,7 @@ msgstr ""
 "můžete si můžete nastavit Enlightenment zpět k obrazu svému.<br>Omlouváme se "
 "za způsobené potíže.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -704,11 +703,11 @@ msgstr ""
 "Enlightenmentu. Je to zlé a jako protiopatření<br>bylo vaše nastavení "
 "vráceno do původních hodnot.<br>Omlouvám se za způsobené potíže.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Nastavení aktualizováno"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -719,7 +718,7 @@ msgstr ""
 "nemohla být<br>určena.<br><br>Soubor, kde chyba nastala, byl:<br>%"
 "s<br><br>Soubor byl smazán, aby nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -734,7 +733,7 @@ msgstr ""
 "<br><br>Soubor, kde chyba nastala byl:<br>%s<br><br>Soubor byl smazán, aby "
 "nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -747,7 +746,7 @@ msgstr ""
 "<br><br>Poškozený soubor byl:<br>%s<br><br>Tento soubor byl smazán, aby "
 "nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -760,7 +759,7 @@ msgstr ""
 "vaší kvóty.<br><br>Poškozený soubor byl:<br>%s<br><br>Tento soubor byl "
 "smazán, aby nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -771,11 +770,11 @@ msgstr ""
 "velmi neobvyklé.<br><br>Poškozený soubor byl:<br>%s<br><br>Tento soubor byl "
 "smazán, aby nedošlo ke ztrátě dat.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problémy při zápisu konfigurace E17"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -783,12 +782,12 @@ msgstr "Problémy při zápisu konfigurace E17"
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Základní"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Použít"
 
@@ -796,7 +795,7 @@ msgstr "Použít"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduly"
 
@@ -805,27 +804,27 @@ msgstr "Moduly"
 msgid "Extensions"
 msgstr "Rozšíření"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Kontejner %i"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Chyba - žádná podpora PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM podpora nebyla do Enlightenmentu zkompilována, takže<br>zamykání plochy "
 "bylo zakázáno."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Uzamčení selhalo"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -834,15 +833,15 @@ msgstr ""
 "klávesnici nebo myši, popř. obojím,<br>a tento vyhrazený přístup se "
 "nepodařilo zrušit."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Prosím zadejte heslo pro odemčení"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Chyba systému autentizace"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -853,11 +852,11 @@ msgstr ""
 "Kód chyby je <hilight>%i</hilight>.<br> To není dobré a nemělo by se to "
 "stát. Prosím ohlaště chybu."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Povolit prezentační mód?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -867,11 +866,11 @@ msgstr ""
 "<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
 "napájení?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Ne, ale zvýšit časový limit"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Ne, a přestat se ptát"
 
@@ -896,7 +895,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor spouštěčů"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -941,7 +940,7 @@ msgstr "Kategorie"
 msgid "Mime Types"
 msgstr "MIME typy"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Volby"
 
@@ -973,23 +972,23 @@ msgstr "Vyberte ikonu"
 msgid "Select an Executable"
 msgstr "Vyberte spustitelný soubor"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Vystřihnout"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Vložit"
 
@@ -997,24 +996,24 @@ msgstr "Vložit"
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Chyba při běhu"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nemohl vytvořit proces potomka:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Chyba za běhu aplikace"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1023,307 +1022,307 @@ msgstr ""
 "Enlightenment nedokázal spustit aplikaci:<br><br>%s<br><br>Aplikace selhala "
 "při startu."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Chyba při spouštění aplikace"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Proces %s se neočekávaně ukončil."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Chybový status %i byl navrácen z %s"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s byl přerušen signálem interrupt."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s byl přerušen signálem quit."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s byl přerušen signálem abort."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s byl přerušen Floating point chybou."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s byl přerušen nepřerušitelným kill signálem."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s byl přerušen chybou při segmentaci."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s byl přerušen chybou roury."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s byl přerušen ukončovacím signálem."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s byl přerušen chybou sběrnice."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s byl přerušen signálem číslo %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Zbývající výstup byl zkrácen. Uložte výstup.***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Chybové záznamy"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Nebyla zaznamenána žádná chybová zpráva."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Uložit tuto zprávu"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Chybový záznam byl uložen jako %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Chybová informace"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informace o chybovém signálu"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Výstupní data"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Nebyl zaznamenán žádný výstup."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Neexistující cesta"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neexistuje."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Chyba při připojování"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Nemůžu připojit zařízení"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr "Chyba při odpojování"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Nemůžu odpojit zařízení"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Chyba při vysouvání"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Nemůžu vysunout zařízení"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i souborů"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Vytvořit symlink"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Zrušit"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Nastavení odvození rodiče"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Režim zobrazení"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Obnovit"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Zobrazit skryté soubory"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Zapamatovat řazení"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Setřídit teď"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nový adresář"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Odpojit"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Připojit"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Vysunout"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Použít výchozí"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Ikony v mřížce"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Vlastní ikony"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Seznam"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikon (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Nastavit pozadí..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Nastavit překrytí..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Vymazat"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Vytvořit složku"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Název nové složky:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Přejmenovat %s na:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Přejmenovat soubor"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Zkusit znovu"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Ne všem"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Ano všem"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Varování"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Soubor už existuje, přepsat?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorovat"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorovat vše"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Vyskytla se chyba při provádění operace.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Odsouhlasit smazání"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Opravdu chcete smazat<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1335,144 +1334,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Vlastnosti souboru"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Poslední změna:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Typ souboru:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Práva"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Ostatní mohou číst"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Ostatní mohou zapisovat"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Vlastník může číst"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Vlastník může zapisovat"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Výchozí"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Náhled"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Vlastní"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Použít tuto ikonu pro všechny soubory tohoto typu"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Info o odkazu"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Vybrat obrázek"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznámý svazek"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Výměnné zařízení"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Přesunout gadget do"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Plochý"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Vnořený"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Vzhled"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Automaticky skorolovat obsah"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Schopnost měnit velikost"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Přesunout nebo změnit velikost tohoto gadgetu"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Odstranit gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Uzamknout tento gadget"
 
@@ -1484,7 +1487,7 @@ msgstr ""
 "Přechozí instance Enlightenmentu je stále aktivní\n"
 "na této obrazovce. Ruším start.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Zámky okna"
 
@@ -1518,21 +1521,21 @@ msgid "Lock program changing:"
 msgstr "Zakázat programu měnit:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Pozice"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Skládání"
 
@@ -1541,12 +1544,12 @@ msgid "Iconified state"
 msgstr "Ikonifikovaný stav"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Lepkavost"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Neaktivní stav"
 
@@ -1555,7 +1558,7 @@ msgid "Maximized state"
 msgstr "Maximalizovaný stav"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Fullscreen stav"
 
@@ -1563,7 +1566,7 @@ msgstr "Fullscreen stav"
 msgid "Lock me from changing:"
 msgstr "Zakázat mi měnit:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Styl okrajů"
 
@@ -1611,115 +1614,116 @@ msgstr "Zrušit připíchnutí na plochu"
 msgid "More..."
 msgstr "Další..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Ikonifikovat"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximalizovat vertikálně"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximalizovat horizontálně"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Demaximalizovat"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Klávesová zkratka"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Do menu oblíbených"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Do spouštěče"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Rám"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Stav"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Vlastnosti okna"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Vždy navrchu"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normální"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Vždy pod"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Vybrat styl okrajů"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Použít E17 výchozí vlastnosti ikony"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Použít ikonu poskytovanou aplikací"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Použít ikonu definovanou uživatelem"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Skrytý obsah"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Připíchnuto"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Fullscreen"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Seznam oken"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Seznam úloh"
 
@@ -1735,7 +1739,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Vlastnosti ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titulek"
 
@@ -1827,11 +1831,11 @@ msgstr "Vlastnosti NetWM"
 msgid "Modal"
 msgstr "Typický"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Přeskočit seznam úloh"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Přeskočit pager"
 
@@ -1839,15 +1843,15 @@ msgstr "Přeskočit pager"
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Paměť okna"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Nastavení okna nejsou unikátní"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1874,11 +1878,11 @@ msgstr ""
 "Stiskněte <hilight>Zrušit</hilight>, pokud<br>si nejste jistý a žádné změny "
 "se neaplikují."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nenastaveny žádné správné vlastnosti"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1890,115 +1894,101 @@ msgstr ""
 "nastavení</hilight>.<br><br>Musíte upřesnit alespoň jeden způsob, jak si "
 "zapamatovat toto okno."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Chcete ,aby si Enlightenment zapamatoval, že má aplikovat<br>nastavení (jako "
-"velikost, umístění, styl rámů oken atd.) pro<br>okno, které <hilight>nemá "
-"unikátní nastavení</hilight>.<br><br>To znamená, že sdílí Jméno/Třídu, "
-"průhlednost, úlohu a další nastavení s více než jedním oknem na obrazovce a "
-"zapamatování<br>nastavení pro toto okno se aplikuje i na všechny ostatní "
-"okna,<br>které mají stejné nastavení.<br><br>Je dobré zapnout volbu "
-"<hilight>Aplikuj jen pro jedno okno</hilight> v případě, že si<br>přejete, "
-"aby nastavení platily jen pro jednu instanci tohoto okna a<br>ne pro všechny "
-"instance.<br><br>Toto je pouze varování pro případě, že neočekáváte takový "
-"průběh.<br>V případě, že očekáváte, stiskněte <hilight>Aplikovat</hilight> "
-"nebo tlačítko <hilight>OK</hilight>a vaše nastavení budou uložena. Stiskněte "
-"<hilight>Zrušit</hilight>, pokud<br>si nejste jistý a žádné změny se "
-"neaplikují."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nic"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Velikost a pozice"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Zámky"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Velikost, pozice a zámky"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "VÅ¡e"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Zapamatovat použití"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Název a třída okna"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Název okna"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Třída okna"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Funkce okna"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Typ okna"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "znak * je povolen"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Pomíjivost"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Vlastnosti k zapamatování"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Preference ikony"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuální plocha"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktuální obrazovka"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Přeskočit seznam oken"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Soubor aplikace nebo název (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Platí pouze pro jedno okno"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Spustit tento program po přihlášení"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Automaticky aktivovat při startu"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Zachovat aktuální vlastnosti"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Spustit tento program po přihlášení"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Volby"
@@ -2017,24 +2007,24 @@ msgstr "Panel"
 msgid "Module Settings"
 msgstr "Nastavení modulů"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Dostupné moduly"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Nahrát modul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Nahrané moduly"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Deaktivovat modul"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2068,8 +2058,8 @@ msgstr "Odstranit gadget"
 msgid "Toolbar Settings"
 msgstr "Nastavení panelu nástrojů"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Rozložení"
 
@@ -2096,12 +2086,12 @@ msgid "Favorite Applications"
 msgstr "Oblíbené aplikace"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplikace"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2110,7 +2100,7 @@ msgstr "Aplikace"
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Ztracená okna"
 
@@ -2146,129 +2136,128 @@ msgstr "(Žádné aplikace)"
 msgid "Set Virtual Desktops"
 msgstr "Nastavit virtuální plochy"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Žádná okna)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Beze jména!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Žádné panely)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Panel #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Přidat panel"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Smazat panel"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Nastavení panelu"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Drobný"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Malý"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Střední"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Větší"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Mohutný"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Nstavit obsah..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Nad vším"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Pod okny"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Pod vším"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Povolit oknům překrýt panel"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Zúžit na velikost obsahu"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixelů"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Styly"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automatické skrývání"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Automaticky skrývat panel"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Zobrazit, když je myš na"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Zobrazit při kliknutí myší"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Čas před skrytím"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekund"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Doba skrývání"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Zobrazit na všech plochách"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Zobrazit na vybraných plochách"
 
@@ -2511,7 +2500,7 @@ msgstr "Nastavuji mezinárodní podporu"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenmentu se nepodařilo nastavit intl systém."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2519,11 +2508,11 @@ msgstr ""
 "Enlightenmentu se nepodařilo spustit úvodní obrazovku.\n"
 "Možná došla paměť?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Podpora testovacího formátu"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2532,7 +2521,7 @@ msgstr ""
 "zkontroujte,\n"
 "jestli má Evas podporu Software Buffer Enginu.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2541,7 +2530,7 @@ msgstr ""
 "jestli má Evas podporu\n"
 "načítání PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2550,7 +2539,7 @@ msgstr ""
 "jestli má Evas podporu\n"
 "načítání JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2559,7 +2548,7 @@ msgstr ""
 "jestli má Evas podporu\n"
 "načítání EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2569,11 +2558,11 @@ msgstr ""
 "jestli má Evas\n"
 "podporu fontconfig a jestli fontconfig má 'Sans' písmo.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Nastavuji obrazovky"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2581,191 +2570,191 @@ msgstr ""
 "Nastavení manažeru okna na všech obrazovkách v systému selhalo.\n"
 "Neběží už jiný okenní manažer?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Nastavuji spořič"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment nemůže konfigurovat X spořič."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Nastavuji desklock"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém zamykání plochy."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Nastavuji cesty"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Nastavuji systémové ovládací prvky"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenmentu se nepodařilo spustit System Command systém.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Nastavuji akce"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenmentu se nepodařilo spustit systém akcí."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Nastavuji spouštěcí systém"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenmentu se nepovedlo nastavit systém exec."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Nastavuji paměť"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment nemůže nastavit volby zapamatování."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Nastavuji souborový manažer"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenmentu se nepodařilo inicializovat souborový manažer.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Nastavuji systém zpráv"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenmentu se nepodařilo nastavit msg systém."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Nastavuji DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenmentu se nepodařilo spustit systém dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr "Nastavit správu zachycení vstupu"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém klávesových zkratek."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Nastavuji moduly"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenmentu se nepodařilo spustit systém modulů."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Nastavuji paměť"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment nemůže nastavit volby zapamatování."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Nastavuji třídy barev"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nemůže nastavit systém tříd barev"
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Nastavuji gadget container"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém ovládání gadgetů"
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Nastavuji DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment nemůže konfigurovat DPMS volby."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Nastavuji módy úspory energie"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment nemůže nastavit módy správy napájení."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Nastavuji wallpaper"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém pozadí plochy."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Nastavuji myš"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nemohl nastavit myš."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Nastavuji zkratky"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenmentu se nepodařilo spustit systém klávesových zkratek."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Nastavuji popupy"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenmentu se nepodařilo spustit systém pop-upů."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Nastavuji panely"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenmentu se nepodařilo nastavit systém panelů."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Nastavuji náhledy"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenmentu se nepodařilo spustit systém náhledů.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Nastavuji řazení souborů"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment nemůže nastavit jeho order file systém."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Nahrávám moduly"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2776,11 +2765,11 @@ msgstr ""
 "zakázány<br>a nebudou aktivovány, abyste mohli<br>zjistit svůj problém. "
 "Dialog<br>nastavení modulů vám pomůže aktivovat<br>vaše moduly znovu."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment spadnul brzy po startu a byl restartován"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2792,15 +2781,15 @@ msgstr ""
 "problém. Dialog<br>nastavení modulů vám pomůže aktivovat<br>vaše moduly "
 "znovu."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Nastavit panely"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Většinou dokončeno"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2809,11 +2798,11 @@ msgstr ""
 "Došlo k chybě při načítání modulu %s.<br>Žádný modul s názvem %s nebyl "
 "nazelen<br>v adresářích pro hledání modulů.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Chyba nahrávání modulu"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2822,11 +2811,11 @@ msgstr ""
 "Došlo k chybě při načítání modulu %s.<br>Plná cesta k modulu je:<br>%"
 "s<br>Nahlášená chyba je:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modul neobsahuje všechny nutné funkce"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2836,12 +2825,12 @@ msgstr ""
 "Chyba v API modulů.<br>Chyba nahrávání modulu: %s<br>Je zapotřebí API modul "
 "s verzí minimálně %i.<br>API modul v Enlightenmentu má verzi %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Chcete tento modul uvolnit?<br>"
 
@@ -2855,29 +2844,29 @@ msgstr ""
 "<b>prezentační mód</b> a dočasně vypnout spořič, zámek obrazovky a správu "
 "napájení?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Opravdu chcete smazat tento panel?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Opravdu chcete smazat tento panel?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Zastavit přesouvání/zvětšování/zmenšování prvků"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Začít přesouvání/zvětšování/zmenšování prvků"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Nastavit obsah panelu"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Smazat tento panel"
 
@@ -2894,11 +2883,11 @@ msgstr "Kontroluji práva systému"
 msgid "System Check Done"
 msgstr "Kontrola systému dokončena"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problémy při odhlašování"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2907,31 +2896,31 @@ msgstr ""
 "Odhlašování trvá příliš dlouho. Některé<br>aplikace se odmítají zavřít."
 "<br>Chcete se odhlásit<br>bez zavírání těchto<br>aplikací?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Odhlásit nyní"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Čekat dále"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Zrušit odhlašování"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Odhlašuji se.."
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Odhlášení probíhá.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je zaneprázdněn jinou akcí"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2939,7 +2928,7 @@ msgstr ""
 "Odhlašuji se.<br>Nemůžete využívat ostatní funkce OS,<br>když odhlášení "
 "začne."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2947,7 +2936,7 @@ msgstr ""
 "Vypínání.<br>Nemůžete využívat ostatní funkce systému,<br>když započne "
 "vypínání."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2955,68 +2944,68 @@ msgstr ""
 "Restartuji.<br>Nemůžete využívat ostatní funkce systému,<br>když začne "
 "restart."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr "Uspávání.<br>Než akce skončí, nemůžete<br>využívat systémové funkce."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 "Hibernuji.<br>Nemůžete využívat funkce systému, než<br>se akce dokončí."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! Toto se nemá stát"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Vypínání selhalo."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Reset selhal."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Uspání selhalo."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Hibernace selhala."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Vypínání"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Vypínám.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Restartuji."
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Restartuji.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Uspávám"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Uspávám.<br><hilight>Prosím čekejte.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernuji"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernuji.<br><hilight>Prosím čekejte.</hilight>"
 
@@ -3032,11 +3021,11 @@ msgstr "Použít jako téma"
 msgid "Set Toolbar Contents"
 msgstr "Nastavit obsah toolbaru"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Nemůžu vypnout - některá okna neodpovídají."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3046,77 +3035,77 @@ msgstr ""
 "Enlightenment will not allow itself to exit until these windows have<br>been "
 "closed or have the lifespan lock removed.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bajtů"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "V budoucnu"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "V poslední minutě"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "Před %li lety"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "Před %li měsíci"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "Před %li týdny"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "Před %li dny"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "Před %li hodinami"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "Před %li minutami"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznámý"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3136,51 +3125,51 @@ msgstr "Nahoru"
 msgid "Down"
 msgstr "Dolů"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Přidat do oblíbených"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Přejít nahoru o složku"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Práva:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Změněno:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Vy"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Chráněno"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Jen pro čtení"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Zakázaný"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Čtení-Zápis"
 
@@ -3196,57 +3185,57 @@ msgstr "Základní nastavení"
 msgid "Show alert when battery is low"
 msgstr "Zobrazit upozornění při malé hladině baterie"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Kontrolova každých:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f taktů"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Dotazy"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Zobrazit varování, když je baterie skoro vybitá"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Upozornit, když je baterie na:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minut"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Automaticky odvolat v..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Výstraha"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Autodetekce"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3254,12 +3243,12 @@ msgstr "Autodetekce"
 msgid "Internal"
 msgstr "Interní"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3267,24 +3256,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Baterie"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Hladina vaší baterie je nízká!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Doporučena je AC energie."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Měřič baterie"
 
@@ -3292,20 +3281,20 @@ msgstr "Měřič baterie"
 msgid "Clock"
 msgstr "Hodiny"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Ovládací centrum"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Prezentace"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Offline"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Módy"
 
@@ -3331,7 +3320,7 @@ msgid "Restart Applications"
 msgstr "Aplikace při restartu"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "VÅ¡echny aplikace"
 
@@ -3353,12 +3342,12 @@ msgstr "iBar ostatní"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menu"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Výchozí styl okrajů"
 
@@ -3366,14 +3355,14 @@ msgstr "Výchozí styl okrajů"
 msgid "Window Border Selection"
 msgstr "Výběr rámu okna"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamatovat rám u tohoto okna"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3399,7 +3388,7 @@ msgstr "Řadit podle"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3667,9 +3656,9 @@ msgid "Desktop Name"
 msgstr "Jméno plochy"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -3735,10 +3724,10 @@ msgstr "%1.0f minut"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Osobní"
@@ -3770,8 +3759,8 @@ msgstr "Zobrazit na zóně obrazovky #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3892,46 +3881,51 @@ msgstr "%.2f faktor panoramatu na ose Y"
 msgid "Virtual Desktops"
 msgstr "Virtuální plochy"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Nastavení dialogů"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Hlavní nastavení"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Zakázat potvrzovací dialogy"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normální okna"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Výchozí mód konfiguračních dialogů"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Základní mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Pokročilý mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr "Zapamatovat velikost a pozici dialogů"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Výchozí mód dialogů"
 
@@ -3999,31 +3993,31 @@ msgstr "Obnovit"
 msgid "Screen Resolution Settings"
 msgstr "Nastavení rozlišení obrazovky"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Obnovit při přihlášení"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Obnovovací frekvence"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotace"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Zrcadlení"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Chybějící funkce"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4036,11 +4030,11 @@ msgstr ""
 "tohoto rozšíření. Také je možné, že<br>v době, kdy bylo <hilight>ecore</"
 "hilight> kompilováno,<br>nebyla detekována XRandr podpora."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Žádné obnovovací frekvence nenalezeny"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4084,22 +4078,22 @@ msgstr "Časovače"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
-msgstr "Rezervní čas"
+msgstr "Doba pohotovostního režimu"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
-msgstr "Suspend čas"
+msgstr "Doba, po které se počítač uspí"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
-msgstr "Čas vypnutí"
+msgstr "Doba, po které se počítač vypne"
 
 #: src/modules/conf_dpms/e_mod_main.c:35
 msgid "Power Management"
 msgstr "Správa napájení"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4109,77 +4103,83 @@ msgstr "<Žádný>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Prosím vyberte okraj,<br>nebo klikněte na <hilight>Zavřít</hilight> pro "
-"zrušení.<br><br>Pro změnu prodlevy této akce,<br>použijte posuvník:"
+"Prosím vyberte okraj<br>nebo klikněte na <hilight>Zavřít</hilight> ke "
+"zrušení.<br><br>Můžete také vybrat zpoždění<br> akce použitím posuvníku nebo "
+"jej<br>udělat aktivním při kliknutí:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Nastavení zkratek okrajů"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Zkratky okrajů"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Přidat okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Smazat okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Upravit okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Smazat vše"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Obnovit výchozí zkratky"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akce"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametry akce"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Základní nastavení"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Povolit aktivaci zkratek s maximalizovanými okny"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Sekvence zkratky okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekund"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr "Okraj reaguje na kliknutí"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Chyba při nastavení zkratky okraje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4188,27 +4188,27 @@ msgstr ""
 "Vybraná sekvence už je využita <br><hilight>%s</hilight> akcí.<br>Prosím "
 "vyberte jinou sekvenci."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "Shift"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "Win"
 
@@ -4505,18 +4505,17 @@ msgstr "Obrovský"
 msgid "%d pixels"
 msgstr "%d pixelů"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Povolit vlastní třídy písma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Základní ukázkový text: 123: 我的天空!"
 
@@ -4524,38 +4523,50 @@ msgstr "Základní ukázkový text: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Třídy písma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Povolit třídy písma"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Písmo"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Styl"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Pokročilý ukázkový text.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Vyhlazování"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatický"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Rezervní písma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Název rezervy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Povolit rezervy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Pokročilý ukázkový text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Vyhlazování / Rezervy"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4569,7 +4580,7 @@ msgstr "Témata ikon"
 msgid "Icon theme overrides general theme"
 msgstr "Téma ikon přepisuje základní téma"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Téma ikon"
 
@@ -4639,7 +4650,7 @@ msgid ""
 msgstr "Enlightenment nemohl importovat konfiguraci<br>kvůli chybě kopírování."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4812,7 +4823,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Okraj kurzoru autoscrollu"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Různé volby"
 
@@ -4991,24 +5002,24 @@ msgstr "Velikost kurzoru"
 msgid "Mouse Cursor"
 msgstr "Kurzor myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Nastavení myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Ruka myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Akcelerace myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Akcelerace"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Práh"
 
@@ -5025,7 +5036,7 @@ msgid "Images"
 msgstr "Obrázky"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Témata"
 
@@ -5125,33 +5136,33 @@ msgstr "%1.0f kolekcí"
 msgid "Performance"
 msgstr "Výkon"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Výběr profilu"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Dostupné profily"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Vyberte profil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Obnovit"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Opravdu chcete smazat profil \"%s\"?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Smazat OK?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Přidat profil"
 
@@ -5314,23 +5325,23 @@ msgstr "Spuštění"
 msgid "Theme Selector"
 msgstr "Výběr témat"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr "Importovat..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Z webu..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Kategorie tématu"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Vymazat vše"
 
@@ -5384,38 +5395,38 @@ msgid "Wallpaper Settings"
 msgstr "Nastavení pozadí plochy"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Použít pozadí tématu"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Obrázek..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Barevný přechod..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Z webu..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Kde umístit pozadí"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "VÅ¡echny plochy"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Tato plocha"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Tato obrazovka"
 
@@ -5436,14 +5447,14 @@ msgid "Fill Options"
 msgstr "Nastavení výplně"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontální"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertikální"
 
@@ -5508,34 +5519,34 @@ msgstr "Použít původní soubor"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Vybrat obrázek..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Chyba při importu obrázku"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment nemohl importovat obrázek<br>kvůli chybě při konverzi."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Chyba při importu pozadí"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment nemohl importovat pozadí<br>kvůli chybě při kopírování."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5543,7 +5554,7 @@ msgstr ""
 "Enlightenment nemohl importovat pozadí.<br><br>Jste si jistí, že je to "
 "správný soubor?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Exchange pozadí"
 
@@ -5655,14 +5666,6 @@ msgstr "Preferovat ikonu definovanou uživatelem"
 msgid "Prefer application provided icon"
 msgstr "Preferovat ikonu poskytovanou aplikací"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Interní okna"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Vždy zapamatovat vnitřní okna"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Nastavení zaostření"
@@ -5795,17 +5798,12 @@ msgid "Window Maximize Policy"
 msgstr "Pravidla maximalizace"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Chytré roztažení"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Roztáhnout okno"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Zaplnit volný prostor"
 
@@ -5813,19 +5811,19 @@ msgstr "Zaplnit volný prostor"
 msgid "Maximize Policy"
 msgstr "Pravidla maximalizace"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Směry maximalizace"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Oba"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Povolit manipulaci s okny"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr "Povolit manipulaci s maximalizovanými okny"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Automaticky posunout/zmenšit/zvětšit okno při automatickém skrývání panelu"
@@ -5865,49 +5863,57 @@ msgstr "Přenést do popředí při změně polohy nebo velikosti"
 msgid "Raise when clicking to focus"
 msgstr "Přenést do popředí při aktivaci kliknutím"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Paměť oken"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr "Zapamatovat interní okna Enlightenmentu"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr "Zapamatovat okna správce souborů"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Smazat zapamatování"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detaily"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Beze jména>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Třída:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Žádná třída>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titulek:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Žádný titulek>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Úloha:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Žádná úloha>"
 
@@ -6276,7 +6282,7 @@ msgid "Show Toolbar"
 msgstr "Zobrazit toolbar"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Chování"
 
@@ -6292,95 +6298,95 @@ msgstr "Připojit zařízení při vložení"
 msgid "Open filemanager on mount"
 msgstr "Otevřít správce souborů při připojení"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Jít do předchozího adresáře"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Jiná aplikace..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Otevřít"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Otevřít s.."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Známé aplikace"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Specifické aplikace"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Vlastní příkaz"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr "Kopírování přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr "Přesouvání přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Mazání přerušeno"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Neznámá operace z podřízeného přerušena"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr "Kopírování %s dokončeno"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Kopíruji %s (zbývá: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr "Přesun %s dokončen"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Přesouvám %s (zbývá: %d sek)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr "Mazání dokončeno"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr "Mažu soubory..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6406,16 +6412,16 @@ msgstr "Z: %s"
 msgid "To: %s"
 msgstr "Do: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr "Provádím %d operaci(e)"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr "Správce souborů čeká"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "Info o EFM operaci"
 
@@ -6453,19 +6459,19 @@ msgstr "Pozadí"
 msgid "Gadgets"
 msgstr "Gadgety"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Volný"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Vždy na ploše"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "On top stisknutí"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Přidat jiné gadgety"
 
@@ -6502,7 +6508,7 @@ msgstr "Vybraný zdroj iBaru"
 msgid "Icon Labels"
 msgstr "Názvy ikon"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Zobrazit název ikony"
 
@@ -6562,43 +6568,43 @@ msgstr "Vytvořit novou ikonu"
 msgid "Add Application"
 msgstr "Přidat aplikaci"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "iBox nastavení"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Zobrazit jméno"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Zobrazit titulek"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Zobrazit třídu"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Zobrazit jméno ikny"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Zobrazit titulek okraje"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Zobrazit okna ze všech obrazovek"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Zobrazit okna z aktuální obrazovky"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Zobrazit okna ze všech ploch"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Zobrazit okna z aktivní plochy"
 
@@ -6618,11 +6624,11 @@ msgstr "Překlopit plochy kolečkem myši"
 msgid "Show desktop names"
 msgstr "Zobrazit jména ploch"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Nastavení pop-up"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Zobrazit popup při změně plochy"
 
@@ -6630,69 +6636,69 @@ msgstr "Zobrazit popup při změně plochy"
 msgid "Show popup for urgent windows"
 msgstr "Zobrazit popup pro důležitá okna"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Vybrat a přemístit tlačítko"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Klikněte k nastavení"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Tlačítko Táhnout a pustit"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Táhnout celou plochu"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Výška keyaction popup"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Odpor k táhnutí"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Výška popup pageru"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Rychlost popup"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Nastavení důležitého okna"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Zobrazit popup na důležitém oknu"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Popup na důležitých připíchnutích oken na této obrazovce"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Uchopení pager tlačítka"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6700,11 +6706,11 @@ msgstr ""
 "Prosím stiskněte tlačítko myši.<br>Stiskněte <hilight>Escape</hilight> ke "
 "zrušení.<br>Nebo <hilight>Del</hilight> k resetu tlačítka."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Pozor"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6714,29 +6720,29 @@ msgstr ""
 "interním<br>kódem kontextového menu. <br>Toto tlačítko bude fungovat pouze v "
 "popup."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Tlačítko %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Zobrazit pager popup"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Popup plochy doprava"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Popup plochy doleva"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Popup plochy nahoru"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Popup plochy dolů"
 
@@ -6860,7 +6866,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Teplota"
 
@@ -6872,15 +6878,15 @@ msgstr "Další"
 msgid "Welcome to Enlightenment"
 msgstr "Vítejte v Enlightenmentu"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Vyberte"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6930,15 +6936,15 @@ msgstr "Kliknout k aktivaci okna"
 msgid "Mouse over focuses windows"
 msgstr "Okno se aktivuje kurzorem myši"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Vyberte ikony k přidání"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Rychlé spuštění"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Vyberte aplikace"
 
@@ -7062,18 +7068,59 @@ msgstr "Specifické zařízení"
 msgid "Networks"
 msgstr "Sítě"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Jiná upozorňovací oblast už existuje"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Jen jeden gadget upozorňovací oblasti může běžet a jiný už existuje."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Upozorňovací oblast"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Chcete ,aby si Enlightenment zapamatoval, že má aplikovat<br>nastavení "
+#~ "(jako velikost, umístění, styl rámů oken atd.) pro<br>okno, které "
+#~ "<hilight>nemá unikátní nastavení</hilight>.<br><br>To znamená, že sdílí "
+#~ "Jméno/Třídu, průhlednost, úlohu a další nastavení s více než jedním oknem "
+#~ "na obrazovce a zapamatování<br>nastavení pro toto okno se aplikuje i na "
+#~ "všechny ostatní okna,<br>které mají stejné nastavení.<br><br>Je dobré "
+#~ "zapnout volbu <hilight>Aplikuj jen pro jedno okno</hilight> v případě, že "
+#~ "si<br>přejete, aby nastavení platily jen pro jednu instanci tohoto okna "
+#~ "a<br>ne pro všechny instance.<br><br>Toto je pouze varování pro případě, "
+#~ "že neočekáváte takový průběh.<br>V případě, že očekáváte, stiskněte "
+#~ "<hilight>Aplikovat</hilight> nebo tlačítko <hilight>OK</hilight>a vaše "
+#~ "nastavení budou uložena. Stiskněte <hilight>Zrušit</hilight>, pokud<br>si "
+#~ "nejste jistý a žádné změny se neaplikují."
+
+#~ msgid "Window name and class"
+#~ msgstr "Název a třída okna"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Interní okna"
+
+#~ msgid "Expand the window"
+#~ msgstr "Roztáhnout okno"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Povolit manipulaci s okny"
+
 #~ msgid "idle"
 #~ msgstr "stojí"
 
diff --git a/po/da.gmo b/po/da.gmo
index 486cd21..12a4841 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 99fb70c..4bac54f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2005-11-20 11:18+0100\n"
-"Last-Translator: Martin Geisler <mgeisler at mgeisler.net>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-06-03 15:49+0000\n"
+"Last-Translator: Martin Geisler <Unknown>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Luk"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,14 +50,6 @@ 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 af Enlightenment Development Team.<br><br>Vi "
-"håber at du nyder dette software lige så meget som vi nød at skrive det."
-"<br><br>Dette software er leveret som beset uden noget eksplicit eller "
-"antydet garanti. Dette software er underlagt licensbetingelser, så se "
-"venligst COPYING og COPYING-PLAIN licensfilerne installeret på dit system."
-"<br><br>Enlightenment er under <hilight>KRAFTIG UDVIKLING</hilight> og er "
-"ikke stabil. Mange funktioner er ufærdige eller mangler helt og kan have "
-"mange fejl. Du er blevet <hilight>ADVARET!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -72,696 +64,609 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_actions.c:357
-#, fuzzy
 msgid "Are you sure you want to kill this window?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Er du sikker på at du vil afslutte?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
 "afslutte?"
 
-#: src/bin/e_actions.c:1867
-#, fuzzy
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_actions.c:1869
-#, fuzzy
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
-#, fuzzy
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_actions.c:1933
-#, fuzzy
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_actions.c:1995
-#, fuzzy
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_actions.c:1997
-#, fuzzy
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_actions.c:2061
-#, fuzzy
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_actions.c:2123
-#, fuzzy
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_actions.c:2125
-#, fuzzy
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
-#, fuzzy
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
-msgstr "Valg af vinduesramme"
+msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:2470
-#, fuzzy
+#: src/bin/e_actions.c:2518
 msgid "Resize"
-msgstr "Modstand"
+msgstr ""
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
-#, fuzzy
 msgid "Menu"
-msgstr "Manuel"
+msgstr ""
 
-#: src/bin/e_actions.c:2481
-#, fuzzy
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
-msgstr "Vinduesrolle"
+msgstr ""
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
-#, fuzzy
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
-msgstr "Lav"
+msgstr ""
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Dræb"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
-#, fuzzy
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
-msgstr "Vinduetype"
+msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
-#, fuzzy
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
-msgstr "Fuldskærm tilstand"
+msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
-#, fuzzy
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
-msgstr "Maksimeret"
+msgstr ""
 
-#: src/bin/e_actions.c:2532
-#, fuzzy
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
-msgstr "Maksimeringspolitik"
+msgstr ""
 
-#: src/bin/e_actions.c:2535
-#, fuzzy
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
-msgstr "Centrér horizontalt"
+msgstr ""
 
-#: src/bin/e_actions.c:2538
-#, fuzzy
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
-msgstr "Fuldskærm"
+msgstr ""
 
-#: src/bin/e_actions.c:2540
-#, fuzzy
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
-msgstr "Maksimeret tilstand"
+msgstr ""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
-#, fuzzy
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
-msgstr "Maksimeringspolitik"
+msgstr ""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
-#, fuzzy
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
-msgstr "Uden ramme"
+msgstr ""
 
-#: src/bin/e_actions.c:2571
-#, fuzzy
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
-msgstr "Uden ramme"
+msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
-#, fuzzy
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_actions.c:2576
-#, fuzzy
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
-msgstr "Skrivebordsnavn"
+msgstr ""
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2580
-#, fuzzy
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2590
-#, fuzzy
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
-#, fuzzy
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2614
-#, fuzzy
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2616
-#, fuzzy
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2618
-#, fuzzy
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2620
-#, fuzzy
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2622
-#, fuzzy
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2624
-#, fuzzy
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2626
-#, fuzzy
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2628
-#, fuzzy
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2630
-#, fuzzy
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2632
-#, fuzzy
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2634
-#, fuzzy
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2636
-#, fuzzy
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Skrivebordsnavn"
+msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Skrivebordsnavn"
+msgstr ""
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
-msgstr "Skærmzone"
+msgstr ""
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
-#, fuzzy
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
-#: src/bin/e_actions.c:2755
-#, fuzzy
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
-#, fuzzy
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_actions.c:2765
-#, fuzzy
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2775
-#, fuzzy
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
-#, fuzzy
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
-msgstr "Udfør kommando"
+msgstr ""
 
-#: src/bin/e_actions.c:2791
-#, fuzzy
+#: src/bin/e_actions.c:2840
 msgid "Application"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s modul"
+msgstr ""
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Fuldskærm tilstand"
+msgstr ""
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Fuldskærm tilstand"
+msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
-#, fuzzy
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
-msgstr "Lineær"
+msgstr ""
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "LÃ¥sninger"
+msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Ryd vinduer op"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Valg af vinduesramme"
+msgstr ""
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "Moduler"
+msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
-#, fuzzy
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "O.k."
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Fortryd"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
-#, fuzzy
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -771,17 +676,8 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Konfigurationsdata krævede en opdatering. Din gamle konfiguration\n"
-"er blevet slettet og et nyt sæt standardværdier initialiseret. Dette\n"
-"vil ske regelmæssigt i forbindelse med udviklingen, så rapportér ikke\n"
-"dette som en fejl. Dette betyder ganske enkelt at Enlightenment har\n"
-"brug for ny konfigurationsdata som standard for funktionalitet som din\n"
-"gamle konfiguration mangler. Dette nye sæt standardværdier vil ordne\n"
-"dette ved at tilføje. Du kan genkonfigurere tingene nu efter behag.\n"
-"Beklager dette rod i din konfiguration.\n"
 
-#: src/bin/e_config.c:775
-#, fuzzy
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -789,19 +685,12 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Din konfiguration er NYERE end Enlightenment. Dette er meget\n"
-"underligt. Dette skulle ikke ske, med mindre du nedgraderede\n"
-"Enlightenment eller kopierede konfigurationen fra et sted hvor\n"
-"en nyere version af Enlightenment kørte. Dette er dårligt og\n"
-"som en forholdsregel er din konfiguration nu sat tilbage til\n"
-"standardværdierne. Beklager ulejligheden.\n"
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -809,7 +698,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -819,7 +708,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -828,7 +717,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -837,7 +726,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -845,27 +734,24 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Enlightenment opsætning"
+msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
-#, fuzzy
 msgid "Advanced"
-msgstr "Advancerede indstillinger"
+msgstr ""
 
-#: src/bin/e_config_dialog.c:234
-#, fuzzy
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
-msgstr "Basas info"
+msgstr ""
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Anvend"
 
@@ -873,7 +759,7 @@ msgstr "Anvend"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduler"
 
@@ -882,39 +768,39 @@ msgstr "Moduler"
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -922,22 +808,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -958,7 +844,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -971,9 +857,8 @@ msgstr "Basas info"
 
 #: src/bin/e_eap_editor.c:473 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:911
-#, fuzzy
 msgid "Name"
-msgstr "Intet navn!!"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:479
 msgid "Executable"
@@ -988,15 +873,13 @@ msgid "General"
 msgstr "Generelt"
 
 #: src/bin/e_eap_editor.c:515
-#, fuzzy
 msgid "Generic Name"
-msgstr "Generelle låsninger"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:520
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:105
-#, fuzzy
 msgid "Window Class"
-msgstr "Vinduer"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
 msgid "Categories"
@@ -1006,10 +889,9 @@ msgstr ""
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
-#, fuzzy
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr "Tilvalg"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
@@ -1020,563 +902,526 @@ msgid "Run in Terminal"
 msgstr ""
 
 #: src/bin/e_eap_editor.c:539
-#, fuzzy
 msgid "Show in Menus"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:543
-#, fuzzy
 msgid "Desktop file"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:544
-#, fuzzy
 msgid "Filename"
-msgstr "Omdøb"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:573
-#, fuzzy
 msgid "Select an Icon"
-msgstr "Vælg et vindue"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:642
-#, fuzzy
 msgid "Select an Executable"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Slet"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
-#, fuzzy
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
-msgstr "Klip"
+msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
-#, fuzzy
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
-msgstr "Hurtig"
+msgstr ""
 
 #: src/bin/e_entry.c:529
-#, fuzzy
 msgid "Select All"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Udførselsfejl"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
-"Enlightenment var ikke i stand til at skabe en proces:\n"
-"\n"
-"%s\n"
-"\n"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
-#, fuzzy
+#: src/bin/e_exec.c:670
 msgid "Error Information"
-msgstr "Vis information"
+msgstr ""
 
-#: src/bin/e_exec.c:645
-#, fuzzy
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
-msgstr "Vis information"
+msgstr ""
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Udførselsfejl"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Udførselsfejl"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Udførselsfejl"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
-#, fuzzy, c-format
+#: src/bin/e_fm.c:3685
+#, c-format
 msgid "%i Files"
-msgstr "Filer"
+msgstr ""
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr "Lineær"
+msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "Om..."
+msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
-#, fuzzy
 msgid "View Mode"
-msgstr "Tilpasningstilstand"
+msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
-#, fuzzy
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
-msgstr "Husk ved hjælp af"
+msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Omdøb"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Moduler"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
-#, fuzzy
+#: src/bin/e_fm.c:8090
 msgid "Properties"
-msgstr "Egenskaber"
+msgstr ""
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
-#, fuzzy
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "Ikon"
+msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
-#, fuzzy
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "Klip"
+msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
-#, fuzzy
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
-msgstr "Overspring i vinduesliste"
+msgstr ""
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Størrelse"
+msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Basas info"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
-msgstr "Nær"
+msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8858
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8821
+#, c-format
 msgid "Rename %s to:"
-msgstr "Omdøb"
+msgstr ""
 
-#: src/bin/e_fm.c:8860
-#, fuzzy
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
-msgstr "Omdøb"
+msgstr ""
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
-#, fuzzy
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
-msgstr "Udførselsfejl"
+msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Starter %s"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
-#, fuzzy
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_fm.c:9297
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9260
+#, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_fm.c:9303
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9266
+#, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
 #: src/bin/e_fm_prop.c:108
-#, fuzzy
 msgid "File Properties"
-msgstr "Egenskaber"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:359
-#, fuzzy
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
-msgstr "Fil:"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:366
-#, fuzzy
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
-msgstr "Rettigheder:"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
-#, fuzzy
 msgid "Default"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
-#, fuzzy
 msgid "Custom"
-msgstr "Klip"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
-#, fuzzy
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr "Vis information"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
-#, fuzzy
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1586,7 +1431,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Vindueslåsninger"
 
@@ -1620,21 +1465,21 @@ msgid "Lock program changing:"
 msgstr "Forhindrér programmet i at ændre:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Størrelse"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Niveau"
 
@@ -1643,12 +1488,12 @@ msgid "Iconified state"
 msgstr "Minimeret tilstand"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Klæbrighed"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Oprullet tilstand"
 
@@ -1657,7 +1502,7 @@ msgid "Maximized state"
 msgstr "Maksimeret tilstand"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Fuldskærm tilstand"
 
@@ -1665,7 +1510,7 @@ msgstr "Fuldskærm tilstand"
 msgid "Lock me from changing:"
 msgstr "Forhindrér mig i at ændre:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Rammestil"
 
@@ -1690,9 +1535,8 @@ msgid "Edit Icon"
 msgstr "Redigér ikon"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1703,137 +1547,127 @@ msgid "Send to Desktop"
 msgstr "Send til skrivebord"
 
 #: src/bin/e_int_border_menu.c:111
-#, fuzzy
 msgid "Pin to Desktop"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:122
-#, fuzzy
 msgid "Unpin from Desktop"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:131
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimér"
 
-#: src/bin/e_int_border_menu.c:362
-#, fuzzy
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
-msgstr "Maksimeringspolitik"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
-#, fuzzy
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
-msgstr "Maksimeringspolitik"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
-#, fuzzy
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
-msgstr "Maksimeret"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
-#, fuzzy
 msgid "Border"
-msgstr "Rammer"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Husk"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
-#, fuzzy
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
-msgstr "Egenskaber"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Altid øverst"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Altid nederst"
 
-#: src/bin/e_int_border_menu.c:922
-#, fuzzy
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
-msgstr "Rammestil"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
-#, fuzzy
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Oprullet"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Klæbrig"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Fuldskærm"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
-msgstr "Overspring i vinduesliste"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
-msgstr "Fare"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1846,23 +1680,20 @@ msgid "ICCCM"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:418
-#, fuzzy
 msgid "ICCCM Properties"
-msgstr "Egenskaber"
+msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titel"
 
 #: src/bin/e_int_border_prop.c:421
-#, fuzzy
 msgid "Class"
-msgstr "Luk"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
-#, fuzzy
 msgid "Icon Name"
-msgstr "Ikon"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
@@ -1873,19 +1704,16 @@ msgid "Role"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:426
-#, fuzzy
 msgid "Minimum Size"
-msgstr "Minimal hastighed"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:427
-#, fuzzy
 msgid "Maximum Size"
-msgstr "Maksimal hastighed"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:428
-#, fuzzy
 msgid "Base Size"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:429
 msgid "Resize Steps"
@@ -1896,24 +1724,20 @@ msgid "Aspect Ratio"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:432
-#, fuzzy
 msgid "Initial State"
-msgstr "Minimeret tilstand"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:434
-#, fuzzy
 msgid "Window ID"
-msgstr "Vindue"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:435
-#, fuzzy
 msgid "Window Group"
-msgstr "Vinduetype"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:436
-#, fuzzy
 msgid "Transient For"
-msgstr "Midlertidighed"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
@@ -1924,61 +1748,54 @@ msgid "Gravity"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:441
-#, fuzzy
 msgid "Take Focus"
-msgstr "Fokuséring"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:442
 msgid "Accepts Focus"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:443
-#, fuzzy
 msgid "Urgent"
-msgstr "Enhed"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:444
-#, fuzzy
 msgid "Request Delete"
-msgstr "Slet"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:445
-#, fuzzy
 msgid "Request Position"
-msgstr "Position"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:466
-#, fuzzy
 msgid "NetWM Properties"
-msgstr "Egenskaber"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:471
-#, fuzzy
 msgid "Modal"
-msgstr "Moduler"
+msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
-#, fuzzy
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
-msgstr "Fare"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Husk for vindue"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Vindueegenskaber udgør ikke et unikt match"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -2002,11 +1819,11 @@ msgstr ""
 "indstillinger vil bliver accepteret. Tryk <hilight>Fortryd</hilight> hvis "
 "du<br>ikke er sikker, og ingenting vil da blive ændret."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Ingen sammenlignings-egenskaber blev valgt"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -2018,106 +1835,94 @@ msgstr ""
 "hvordan de skal huskes</hilight>.<br><br>Du skal specificere mindst en måde "
 "hvorpå dette vindue kan huskes."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Du forsøger at bede Enlightenment om at huske<br>egenskaber (såsom "
-"størrelse, placering, rammestil osv.) for<br>et vindue som <hilight>ikke har "
-"unikke egenskaber</hilight>.<br><br>Det betyder at det deler navn/klasse, "
-"midlertidighed, rolle, osv.<br>med et andet vindue på skærmen og huskede "
-"egenskaber for dette vindue vil blive anvendt til all andre vinduer der "
-"matcher de samme egenskaber.<br><br>Du vil måske anvende <hilight>Match kun "
-"ét vindue</hilight> muligheden hvis<br>du kun ønskede at én instans af dette "
-"vindue skal ændres. Andre instanser vil ikke blive ændret.<br><br>Dette er "
-"blot en advarsel for det tilfælde at du ikke ønskede dette.<br>Hvis du "
-"gjorde, tryk da <hilight>Anvend</hiligt> eller <hilight>O.k.</hilight> og "
-"dine indstillinger vil blive accepteret. Tryk <hilight>Fortryd</hiligt> hvis "
-"du<br>ikke er sikker og ingenting vil da blive ændret."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Størelse og position"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "LÃ¥sninger"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Størelse, position og låsninger"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Alting"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Husk ved hjælp af"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Vinduenavn og -klasse"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Vinduesrolle"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Vindueslåsninger"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Vinduesrolle"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Vinduetype"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Midlertidighed"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Egenskaber der skal huskes"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuelt skrivebord"
 
-#: src/bin/e_int_border_remember.c:531
-#, fuzzy
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
-msgstr "Skærmzone"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Overspring i vinduesliste"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Match kun ét vindue"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
-msgid "Always focus on start"
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
@@ -2126,51 +1931,43 @@ msgstr ""
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 #: src/modules/wizard/page_050.c:26
-#, fuzzy
 msgid "File Manager"
-msgstr "Fare"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:44
-#, fuzzy
 msgid "Shelf"
-msgstr "Temaer"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:120
-#, fuzzy
 msgid "Module Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
-#, fuzzy
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
-msgstr "Favoritapplikationer"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
-#, fuzzy
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
-msgstr "(Ingen indlæste moduler)"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
-#, fuzzy
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
-msgstr "(Ingen indlæste moduler)"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
-#, fuzzy
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
-msgstr "Fejl ved indlæsning af modul"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2189,27 +1986,23 @@ msgid "Available Gadgets"
 msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
-#, fuzzy
 msgid "Add Gadget"
-msgstr "Dimser"
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:133
-#, fuzzy
 msgid "Selected Gadgets"
-msgstr "Dimser"
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:140
-#, fuzzy
 msgid "Remove Gadget"
-msgstr "Dimser"
+msgstr ""
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2218,35 +2011,27 @@ msgid "Input Method Error"
 msgstr "Input method fejl"
 
 #: src/bin/e_intl.c:362
-#, fuzzy
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
 "configuration's<br>executable is in your PATH<br>"
 msgstr ""
-"Fejl ved opstart af\n"
-"\n"
-"Undersøg venligst om din input method\n"
-"indstillinger er korrekte og om den\n"
-"eksekverbare fil er i din PATH\n"
 
 #: src/bin/e_int_menus.c:89
-#, fuzzy
 msgid "Main"
-msgstr "Manuel"
+msgstr ""
 
 #: src/bin/e_int_menus.c:106
 msgid "Favorite Applications"
 msgstr "Favoritapplikationer"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2255,33 +2040,29 @@ msgstr "(Ingen applikationer)"
 msgid "Windows"
 msgstr "Vinduer"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Forsvundne vinduer"
 
 #: src/bin/e_int_menus.c:170
-#, fuzzy
 msgid "About"
-msgstr "Om..."
+msgstr ""
 
 #: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
 #: src/modules/conf_theme/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:84
-#, fuzzy
 msgid "Theme"
-msgstr "Temaer"
+msgstr ""
 
 #: src/bin/e_int_menus.c:262
-#, fuzzy
 msgid "Virtual"
-msgstr "Virtuelt skrivebord"
+msgstr ""
 
 #: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
 #: src/modules/conf_shelves/e_mod_main.c:41
 #: src/modules/conf_shelves/e_mod_main.c:85
-#, fuzzy
 msgid "Shelves"
-msgstr "Temaer"
+msgstr ""
 
 #: src/bin/e_int_menus.c:278
 msgid "Show/Hide All Windows"
@@ -2292,146 +2073,133 @@ msgid "(No Applications)"
 msgstr "(Ingen applikationer)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Virtuelt skrivebord"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Ingen vinduer)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Intet navn!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
-#, fuzzy
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
-#, fuzzy
 msgid "Shelf Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Super lille"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Lille"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medium"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Stor"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Kæmpe"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
-msgstr "Alting"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
-msgstr "(Ingen vinduer)"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
-msgstr "Alting"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
-msgstr "Følg vinduet når det flyttes"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
-#, fuzzy, c-format
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
 msgid "%3.0f pixels"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr "Automatisk hævning"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
-msgstr "Skærmzone"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
-#, fuzzy, c-format
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
 msgid "%.1f seconds"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
-msgstr "Konfiguration"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2454,7 +2222,7 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2481,26 +2249,6 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Tilvalg:\n"
-"\t-display DISPLAY\n"
-"\t\tForbind til terminal med navn DISPLAY.\n"
-"\t\tFx: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tTilføj en FALSK xinerama skærm (istedet for de rigtige)\n"
-"\t\tgivet geometrien. Tilføj så mange som du vil. De vil alle\n"
-"\t\tudskifte eventuelle rigtige xinerama skærme. Dette kan\n"
-"\t\tbruges til at simulere xinerama.\n"
-"\t\tFx: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
-"+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tBrug konfigurationen CONF_PROFILE i stedet for standardbrugeren eller "
-"bare \"default\"\n"
-"\t-good\n"
-"\t\tVær god.\n"
-"\t-evil\n"
-"\t\tVær ond.\n"
-"\t-psychotic\n"
-"\t\tVær psykotisk.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2583,35 +2331,24 @@ msgstr ""
 "Måske er du løbet tør for hukommelse?"
 
 #: src/bin/e_main.c:515
-#, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
-"Enlightenment opdagede at ecore_evas ikke understøtter Software\n"
-"X11 rendering i Evas. Undersøg venligst din installation af Evas\n"
-"og Ecore og tjek at de understøtter Software X11 rendering."
 
 #: src/bin/e_main.c:522
-#, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
-"Enlightenment opdagede at ecore_evas ikke understøtter Software\n"
-"X11 rendering i Evas. Undersøg venligst din installation af Evas\n"
-"og Ecore og tjek at de understøtter Software X11 rendering."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
-#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment kan ikke initialisere File-systemet.\n"
-"Måske er du løbet tør for hukommelse?"
 
 #: src/bin/e_main.c:559
 msgid ""
@@ -2622,23 +2359,20 @@ msgstr ""
 "MÃ¥ske har du ingen hjemmemappe eller disken er fuld?"
 
 #: src/bin/e_main.c:569
-#, fuzzy
 msgid "Enlightenment cannot set up its file registry system."
-msgstr "Enlightenment kan ikke initialisere sit konfigurationssystem."
+msgstr ""
 
 #: src/bin/e_main.c:578
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kan ikke initialisere sit konfigurationssystem."
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment kan ikke initialisere sit temasystem."
+msgstr ""
 
 #: src/bin/e_main.c:600
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment kan ikke initialisere sit internationalseringssystem."
+msgstr ""
 
 #: src/bin/e_main.c:609
 msgid ""
@@ -2664,7 +2398,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan ikke initialisere sit internationalseringssystem."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2672,47 +2406,46 @@ msgstr ""
 "Enlightenment kan ikke initialisere startbilledet.\n"
 "Måske er du løbet tør for hukommelse?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
-#, fuzzy
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
-msgstr "Skærmzone"
+msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2720,213 +2453,191 @@ msgstr ""
 "Enlightenment kunne ikke blive indsat som vindueshåndtering på alle\n"
 "skærme på dit system. Måske kører der en anden vindueshåndtering?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
-#, fuzzy
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
+msgstr ""
 
-#: src/bin/e_main.c:752
-#, fuzzy
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_main.c:757
-#, fuzzy
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr "Enlightenment kan ikke initialisere sit dnd-system."
+msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
-#, fuzzy
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
-msgstr "Sæt kontrollør"
+msgstr ""
 
-#: src/bin/e_main.c:792
-#, fuzzy
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
+msgstr ""
 
-#: src/bin/e_main.c:797
-#, fuzzy
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
-msgstr "Moduler"
+msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kan ikke initialisere sit handlingssystem."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
-#, fuzzy
-msgid "Enlightenment cannot set up its exec system."
-msgstr "Enlightenment kan ikke initialisere sit temasystem."
-
 #: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Husk"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment kan ikke initialisere huskesystemet."
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan ikke initialisere filhåndteringen.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan ikke initialisere sit beskedsystem."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan ikke initialisere sit dnd-system."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment kan ikke initialisere sit input grab system."
 
-#: src/bin/e_main.c:879
-#, fuzzy
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
-msgstr "Moduler"
+msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan ikke initialisere sit modulsystem."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment kan ikke initialisere huskesystemet."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:894
-#, fuzzy
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
-msgstr "Enlightenment kan ikke initialisere sit handlingssystem."
+msgstr ""
 
-#: src/bin/e_main.c:899
-#, fuzzy
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/bin/e_main.c:904
-#, fuzzy
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
-msgstr "Enlightenment kan ikke initialisere sit fontsystem."
+msgstr ""
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
-#, fuzzy
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment kan ikke initialisere huskesystemet."
+msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment kan ikke initialisere sit pop up-system."
+msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
-#, fuzzy
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr "Enlightenment kan ikke initialisere sit dnd-system."
+msgstr ""
 
-#: src/bin/e_main.c:937
-#, fuzzy
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
-msgstr "Slet"
+msgstr ""
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment kan ikke initialisere huskesystemet."
+msgstr ""
 
-#: src/bin/e_main.c:947
-#, fuzzy
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kan ikke initialisere sit bindingssystem."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan ikke initialisere sit pop up-system."
 
-#: src/bin/e_main.c:967
-#, fuzzy
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
-msgstr "Temaer"
+msgstr ""
 
-#: src/bin/e_main.c:972
-#, fuzzy
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment kan ikke initialisere sit temasystem."
+msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kan ikke initialisere sit miniaturebilledsystem.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
-#, fuzzy
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
-msgstr "Enlightenment kan ikke initialisere sit modulsystem."
+msgstr ""
 
-#: src/bin/e_main.c:1026
-#, fuzzy
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
-msgstr "(Ingen indlæste moduler)"
+msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2934,11 +2645,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2946,16 +2657,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
-#, fuzzy
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
-msgstr "Konfiguration"
+msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2964,11 +2674,11 @@ msgstr ""
 "Der opstod en fejl ved indlæsning af modulet ved navn: %s<br>Intet modul ved "
 "navn %s kunne findes i søgestierne<br>for moduler.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Fejl ved indlæsning af modul"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2977,11 +2687,11 @@ msgstr ""
 "Der opstod en fejl ved indlæsning af modulet ved navn: %s<br>Den fulde sti "
 "til dette modul er:<br>%s<br>Fejlen rapporteret var:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2991,12 +2701,12 @@ msgstr ""
 "Modul-API fejl<br>Fejl ved initialisering af modul: %s<br>Mindste krævet "
 "modul-API version: %i.<br>Enlightenment modul-API version: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du gerne unloade dette modul?<br>"
 
@@ -3007,41 +2717,35 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
-#, fuzzy
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
-#: src/bin/e_shelf.c:1273
-#, fuzzy
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Temaer"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
 #: src/bin/e_startup.c:66
-#, fuzzy
 msgid "Starting"
-msgstr "Starter %s"
+msgstr ""
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
@@ -3052,239 +2756,225 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
-#, fuzzy
+#: src/bin/e_sys.c:321
 msgid "Logout now"
-msgstr "Forsvundne vinduer"
+msgstr ""
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
-#, fuzzy
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
-msgstr "Fortryd"
+msgstr ""
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
-#, fuzzy
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
-msgstr "Enlightenment kan ikke initialisere sit temasystem."
+msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "Udvidede indstillinger"
+msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "Om dette tema"
+msgstr ""
 
 #: src/bin/e_theme.c:42
-#, fuzzy
 msgid "Set As Theme"
-msgstr "Om dette tema"
+msgstr ""
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Konfiguration"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Kan ikke afslutte - udødelige vinduer."
 
-#: src/bin/e_utils.c:247
-#, fuzzy
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
-"Nogle vinduer har stadig deres livstidslåsning sat. Dette betyder at\n"
-"Enlightenment ikke vil tillade sig selv at afslutte før disse vinduer\n"
-"er blevet lukket eller har fået fjernet deres livstidslåsning.\n"
 
-#: src/bin/e_utils.c:811
-#, fuzzy, c-format
+#: src/bin/e_utils.c:804
+#, c-format
 msgid "%'.0f Bytes"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:69
-#, fuzzy
 msgid "Remove"
-msgstr "Omdøb"
+msgstr ""
 
 #: src/bin/e_widget_config_list.c:83
 #: src/modules/conf_applications/e_int_config_apps.c:258
@@ -3296,58 +2986,57 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Rettigheder:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
-#, fuzzy, c-format
+#: src/bin/e_widget_fsel.c:663
+#, c-format
 msgid "Protected"
-msgstr "Egenskaber"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Enlightenment opsætning"
+msgstr ""
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3357,74 +3046,70 @@ msgstr "Basale indstillinger"
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Tjekinterval"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "10 min."
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "Accelerér"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "Automatisk hævning"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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 "Generelt"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3432,51 +3117,47 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
 #: src/modules/clock/e_mod_main.c:98
-#, fuzzy
 msgid "Clock"
-msgstr "Luk"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Udvidede indstillinger"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Moduler"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3486,42 +3167,35 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:104
 #: src/modules/conf_applications/e_int_config_apps.c:119
 #: src/modules/conf_applications/e_mod_main.c:36
-#, fuzzy
 msgid "IBar Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:135
 #: src/modules/conf_applications/e_mod_main.c:38
-#, fuzzy
 msgid "Startup Applications"
-msgstr "Favoritapplikationer"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:151
 #: src/modules/conf_applications/e_mod_main.c:37
-#, fuzzy
 msgid "Restart Applications"
-msgstr "Favoritapplikationer"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
-#, fuzzy
 msgid "Selected Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Anvend"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:35
-#, fuzzy
 msgid "New Application"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
@@ -3529,28 +3203,27 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
-#, fuzzy
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
-msgstr "Rammestil"
+msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:50
 msgid "Window Border Selection"
 msgstr "Valg af vinduesramme"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Husk denne ramme for dette vindue næste gang det vises"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3558,18 +3231,16 @@ msgstr "Husk denne ramme for dette vindue næste gang det vises"
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "LÃ¥sninger"
+msgstr ""
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
 msgstr "Rammer"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
-#, fuzzy
 msgid "Client List Settings"
-msgstr "Overspringning i vinduesliste"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
 msgid "Group By"
@@ -3578,7 +3249,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3607,23 +3278,20 @@ msgid "Client Sort Order"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
-#, fuzzy
 msgid "Alphabetical"
-msgstr "Centrér vertikalt"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
-#, fuzzy
 msgid "Window stacking layer"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:134
-#, fuzzy
 msgid "Iconified Windows"
-msgstr "Match kun ét vindue"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
@@ -3642,27 +3310,25 @@ msgid "Warp to owning desktop"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
-#, fuzzy
 msgid "Menu Item Captions"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f Chars"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
 msgid "Client List Menu"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
-#, fuzzy
 msgid "Window Manager"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
 msgid "About Dialog Title"
@@ -3673,14 +3339,12 @@ msgid "About Dialog Version"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#, fuzzy
 msgid "Border Title"
-msgstr "Rammestil"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Konfigurationspanel"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3688,9 +3352,8 @@ msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 #: src/modules/conf_fonts/e_int_config_fonts.c:63
-#, fuzzy
 msgid "Menu Title"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
@@ -3725,15 +3388,13 @@ msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
-#, fuzzy
 msgid "Winlist Title"
-msgstr "Overspringning i vinduesliste"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 #: src/modules/conf_fonts/e_int_config_fonts.c:82
-#, fuzzy
 msgid "Widgets"
-msgstr "Dimser"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
 msgid "Button Text"
@@ -3789,24 +3450,21 @@ msgid "Slider Text Disabled"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
-#, fuzzy
 msgid "Module Label"
-msgstr "Moduler"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:130
 #: src/modules/conf_colors/e_mod_main.c:35
-#, fuzzy
 msgid "Colors"
-msgstr "Luk"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
 msgid "Other"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
-#, fuzzy
 msgid "Window Manager Colors"
-msgstr "Vinduenavn og -klasse"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:437
 #: src/modules/conf_colors/e_int_config_color_classes.c:445
@@ -3819,18 +3477,16 @@ msgstr "Aktiv"
 #: src/modules/conf_colors/e_int_config_color_classes.c:447
 #: src/modules/conf_colors/e_int_config_color_classes.c:455
 #: src/modules/conf_colors/e_int_config_color_classes.c:522
-#, fuzzy
 msgid "Disabled"
-msgstr "Deaktiver"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:443
 msgid "Widget Colors"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:451
-#, fuzzy
 msgid "Module Colors"
-msgstr "Moduler"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:501
 msgid "Color Classes"
@@ -3853,26 +3509,23 @@ msgid "Defaults"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:52
-#, fuzzy
 msgid "Desk Settings"
-msgstr "Udvidede indstillinger"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:149
-#, fuzzy
 msgid "Desktop Name"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:156
-#, fuzzy
 msgid "Desktop Wallpaper"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
@@ -3880,24 +3533,20 @@ msgid "Set"
 msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
-#, fuzzy
 msgid "Screen Lock Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
-#, fuzzy
 msgid "Automatic Locking"
-msgstr "Automatisk højde"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Enlightenment: Fejl!"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
@@ -3911,9 +3560,9 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:189
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:207
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f seconds"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
@@ -3929,40 +3578,36 @@ msgstr ""
 #: src/modules/conf_dpms/e_int_config_dpms.c:232
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:143
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f minutes"
-msgstr "10 min."
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
-#, fuzzy
 msgid "Personal"
-msgstr "Rettigheder:"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:391
-#, fuzzy
 msgid "Login Box Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:394
-#, fuzzy
 msgid "Show on all screen zones"
-msgstr "Skærmzone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:402
-#, fuzzy
 msgid "Show on screen zone #:"
-msgstr "Skærmzone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:406
 #: src/modules/conf_desks/e_int_config_desks.c:247
@@ -3975,8 +3620,8 @@ msgstr "Skærmzone"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3996,9 +3641,8 @@ msgid "Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -4016,44 +3660,38 @@ msgid "If deactivated before"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:457
-#, fuzzy
 msgid "Custom Screenlock"
-msgstr "Skærmzone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
 #: src/modules/conf_desklock/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Lock"
-msgstr "Skærmzone"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:62
 #: src/modules/pager/e_mod_main.c:822
-#, fuzzy
 msgid "Virtual Desktops Settings"
-msgstr "Virtuelt skrivebord"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:239
-#, fuzzy
 msgid "Number of Desktops"
-msgstr "Ny skrivebordesrække"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:258
 #: src/modules/conf_desks/e_int_config_desks.c:295
-#, fuzzy
 msgid "Desktop Mouse Flip"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:277
-#, fuzzy
 msgid "Desktops"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
@@ -4064,23 +3702,20 @@ msgid "Wrap desktops around when flipping"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:302
-#, fuzzy
 msgid "Flip Animation"
-msgstr "Vis information"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:307
-#, fuzzy
 msgid "Pane"
-msgstr "Fare"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:310
-#, fuzzy
 msgid "Zoom"
-msgstr "Nederst"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:313
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
@@ -4090,9 +3725,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f sek."
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Basas info"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -4105,57 +3739,54 @@ msgid "%.2f Y-axis pan factor"
 msgstr ""
 
 #: src/modules/conf_desks/e_mod_main.c:35
-#, fuzzy
 msgid "Virtual Desktops"
-msgstr "Virtuelt skrivebord"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
-#, fuzzy
 msgid "General Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr "Konfigurationspanel"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(Ingen vinduer)"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "Konfigurationspanel"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
-msgstr "Basas info"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
-msgstr "Advancerede indstillinger"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -4200,47 +3831,42 @@ msgid "Resolution change"
 msgstr "Skift af opløsning"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Oprullet"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Modstand"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:228
-#, fuzzy
 msgid "Screen Resolution Settings"
-msgstr "Opløsning"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:412
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
-msgstr "Gendan guvernør ved opstart"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:475
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
-msgstr "Opløsning"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4249,11 +3875,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4263,9 +3889,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Resolution"
-msgstr "Opløsning"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
@@ -4281,154 +3906,145 @@ msgid "The current display server does not <br>have the DPMS extension."
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
-#, fuzzy
 msgid "Display Power Management Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "Temaer"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:216
-#, fuzzy
 msgid "Suspend time"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
 #: src/modules/conf_dpms/e_mod_main.c:35
-#, fuzzy
 msgid "Power Management"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
-#, fuzzy
 msgid "<None>"
-msgstr "Ingen"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "Dimser"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "Slet"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "Minimér"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
-#, fuzzy
 msgid "Delete All"
-msgstr "Slet"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
-#, fuzzy
 msgid "Action"
-msgstr "Tilvalg"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "Andre indstillinger"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "Basale indstillinger"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4438,19 +4054,16 @@ msgstr ""
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "Enhed"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
-#, fuzzy
 msgid "Engine Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:95
-#, fuzzy
 msgid "Enable Composite"
-msgstr "Aktivér pop op"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
 msgid "Default Engine"
@@ -4472,9 +4085,8 @@ msgid "Engine"
 msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:49
-#, fuzzy
 msgid "Run Command Settings"
-msgstr "Udfør kommando"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:115
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:168
@@ -4495,9 +4107,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:182
 #: src/modules/conf_winlist/e_int_config_winlist.c:183
 #: src/modules/conf_winlist/e_int_config_winlist.c:269
-#, fuzzy
 msgid "Scroll Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:130
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:183
@@ -4508,9 +4119,8 @@ msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:185
 #: src/modules/conf_winlist/e_int_config_winlist.c:272
-#, fuzzy
 msgid "Scroll Speed"
-msgstr "Sæt hastighed"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:189
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:228
@@ -4524,9 +4134,8 @@ msgid "%1.2f"
 msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:197
-#, fuzzy
 msgid "Terminal Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
@@ -4534,15 +4143,13 @@ msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
-#, fuzzy
 msgid "Size Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:207
 #: src/modules/conf_winlist/e_int_config_winlist.c:296
-#, fuzzy
 msgid "Minimum Width"
-msgstr "Minimal hastighed"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:209
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:213
@@ -4558,39 +4165,33 @@ msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:211
 #: src/modules/conf_winlist/e_int_config_winlist.c:300
-#, fuzzy
 msgid "Minimum Height"
-msgstr "Minimal hastighed"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:215
 #: src/modules/conf_winlist/e_int_config_winlist.c:304
-#, fuzzy
 msgid "Maximum Width"
-msgstr "Maksimal hastighed"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:219
 #: src/modules/conf_winlist/e_int_config_winlist.c:308
-#, fuzzy
 msgid "Maximum Height"
-msgstr "Maksimal hastighed"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:225
 #: src/modules/conf_winlist/e_int_config_winlist.c:284
-#, fuzzy
 msgid "Position Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:226
 #: src/modules/conf_winlist/e_int_config_winlist.c:285
-#, fuzzy
 msgid "X-Axis Alignment"
-msgstr "Afslut Enlightenment"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:230
 #: src/modules/conf_winlist/e_int_config_winlist.c:289
-#, fuzzy
 msgid "Y-Axis Alignment"
-msgstr "Afslut Enlightenment"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
 #: src/modules/exebuf/e_mod_main.c:129
@@ -4598,14 +4199,12 @@ msgid "Run Command"
 msgstr "Udfør kommando"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
 msgid "Core"
-msgstr "Luk"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
-#, fuzzy
 msgid "Title Bar"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
@@ -4620,23 +4219,20 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
-#, fuzzy
 msgid "About Title"
-msgstr "Om dette tema"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
-#, fuzzy
 msgid "About Text"
-msgstr "Om dette tema"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
@@ -4651,9 +4247,8 @@ msgid "Dialog Error"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
-#, fuzzy
 msgid "Exebuf Command"
-msgstr "Udfør kommando"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
@@ -4676,19 +4271,16 @@ msgid "Frame"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:85
-#, fuzzy
 msgid "Label"
-msgstr "Stor"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:86
-#, fuzzy
 msgid "Buttons"
-msgstr "Nederst"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:87
-#, fuzzy
 msgid "Slider"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
@@ -4707,37 +4299,32 @@ msgid "List Item"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
-#, fuzzy
 msgid "Filemanager"
-msgstr "Fare"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
-#, fuzzy
 msgid "Typebuf"
-msgstr "Type:"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
-#, fuzzy
 msgid "Normal Styled"
-msgstr "Normal"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:168
-#, fuzzy
 msgid "Font Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
@@ -4748,23 +4335,21 @@ msgid "Really Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "%d pixels"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
-#, fuzzy
 msgid "Fonts"
-msgstr "Fokuséring"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4772,80 +4357,86 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Titel"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
-#, fuzzy
 msgid "Icon Theme Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
-#, fuzzy
 msgid "Icon Themes"
-msgstr "Temaer"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
-#, fuzzy
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
-msgstr "Temaer"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:109
 #: src/modules/conf_imc/e_mod_main.c:35
-#, fuzzy
 msgid "Input Method Settings"
-msgstr "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:297
-#, fuzzy
 msgid "Input Method Selector"
-msgstr "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:300
 #: src/modules/conf_imc/e_int_config_imc.c:894
-#, fuzzy
 msgid "Use No Input Method"
-msgstr "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:961
-#, fuzzy
 msgid "Setup Selected Input Method"
-msgstr "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:901
 msgid "New"
@@ -4856,34 +4447,29 @@ msgid "Import..."
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:908
-#, fuzzy
 msgid "Input Method Parameters"
-msgstr "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:918
-#, fuzzy
 msgid "Execute Command"
-msgstr "Udfør kommando"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:925
-#, fuzzy
 msgid "Setup Command"
-msgstr "Udfør kommando"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:934
 msgid "Exported Environment Variables"
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "Konfiguration"
+msgstr ""
 
 #: 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 "Input method fejl"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:282
 msgid ""
@@ -4892,25 +4478,18 @@ msgid ""
 msgstr ""
 
 #: 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 ""
-"Enlightenment var ikke i stand til at skabe en proces:\n"
-"\n"
-"%s\n"
-"\n"
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
-#, fuzzy
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
-msgstr "Fare"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
 msgid "Thumbscroll"
@@ -4926,38 +4505,36 @@ msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels"
-msgstr "%2.0f pixels"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
 msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%4.0f pixels/sek."
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Opløsning"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
-#, fuzzy
 msgid "Language Settings"
-msgstr "Advancerede indstillinger"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:900
 #: src/modules/conf_intl/e_int_config_intl.c:977
@@ -4980,9 +4557,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:92
-#, fuzzy
 msgid "Key Binding Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:223
 #: src/modules/conf_keybindings/e_mod_main.c:35
@@ -4994,9 +4570,8 @@ msgid "Add Key"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:231
-#, fuzzy
 msgid "Delete Key"
-msgstr "Slet"
+msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:235
 msgid "Modify Key"
@@ -5021,15 +4596,13 @@ msgstr ""
 #: src/modules/conf_menus/e_int_config_menus.c:110
 #: src/modules/conf_menus/e_int_config_menus.c:169
 #: src/modules/conf_menus/e_mod_main.c:35
-#, fuzzy
 msgid "Menu Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: 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 "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:102
 #: src/modules/conf_menus/e_int_config_menus.c:161
@@ -5038,9 +4611,8 @@ msgstr ""
 
 #: 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 "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:111
 #: src/modules/conf_menus/e_int_config_menus.c:170
@@ -5058,9 +4630,8 @@ msgid "Show Comment In Menu"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:181
-#, fuzzy
 msgid "Autoscroll Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
 msgid "Autoscroll Margin"
@@ -5082,19 +4653,18 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Diverse valgmuligheder"
 
 #: src/modules/conf_menus/e_int_config_menus.c:195
-#, fuzzy
 msgid "Menu Scroll Speed"
-msgstr "Minimal hastighed"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "%5.0f pixels/sec"
-msgstr "%4.0f pixels/sek."
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:200
 msgid "Fast Mouse Move Threshhold"
@@ -5111,57 +4681,50 @@ msgid "Click Drag Timeout"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%2.2f seconds"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime.c:64
 #: src/modules/conf_mime/e_mod_main.c:35
-#, fuzzy
 msgid "File Icons"
-msgstr "Fil info:"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime.c:186
-#, fuzzy
 msgid "File Types"
-msgstr "Filer"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:69
-#, fuzzy
 msgid "File Icon"
-msgstr "Fil info:"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
-#, fuzzy
 msgid "Mime:"
-msgstr "Maksimeret"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:147
 msgid "Use Generated Thumbnail"
 msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:150
-#, fuzzy
 msgid "Use Theme Icon"
-msgstr "Opret ikon"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:153
 msgid "Use Edje File"
 msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:156
-#, fuzzy
 msgid "Use Image"
-msgstr "Dimser"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:159
 msgid "Use Default"
 msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:270
-#, fuzzy
 msgid "Select an Edj File"
-msgstr "Vælg et vindue"
+msgstr ""
 
 #: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
 #: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
@@ -5176,9 +4739,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
-#, fuzzy
 msgid "Mouse Binding Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
 #: src/modules/conf_mousebindings/e_mod_main.c:35
@@ -5190,14 +4752,12 @@ msgid "Add Binding"
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
-#, fuzzy
 msgid "Delete Binding"
-msgstr "Slet"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
-#, fuzzy
 msgid "Modify Binding"
-msgstr "Minimér"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
 msgid "Restore Mouse and Wheel Binding Defaults"
@@ -5212,29 +4772,24 @@ msgid "Any"
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
-#, fuzzy
 msgid "Win List"
-msgstr "Overspring i vinduesliste"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
-#, fuzzy
 msgid "Popup"
-msgstr "Pop op hastighed"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
-#, fuzzy
 msgid "Zone"
-msgstr "Ingen"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
-#, fuzzy
 msgid "Container"
-msgstr "Beholder %d"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
-#, fuzzy
 msgid "Manager"
-msgstr "Fare"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
 msgid "Mouse Binding Sequence"
@@ -5243,9 +4798,8 @@ msgstr ""
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
-#, fuzzy
 msgid "Cursor Settings"
-msgstr "Udvidede indstillinger"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
@@ -5259,9 +4813,8 @@ msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
-#, fuzzy
 msgid "Use Enlightenment Cursor"
-msgstr "Enlightenment: Fejl!"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
@@ -5276,53 +4829,47 @@ msgstr ""
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
-msgstr "Moduler"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
-msgstr "Accelerér"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:75
-#, fuzzy
 msgid "Images"
-msgstr "Dimser"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temaer"
 
 #: src/modules/conf_paths/e_int_config_paths.c:81
-#, fuzzy
 msgid "Icons"
-msgstr "Ikon"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Backgrounds"
@@ -5349,9 +4896,8 @@ msgid "Search Directories"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:40
-#, fuzzy
 msgid "Performance Settings"
-msgstr "Advancerede indstillinger"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:95
 #: src/modules/conf_performance/e_int_config_performance.c:135
@@ -5360,34 +4906,31 @@ msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:97
 #: src/modules/conf_performance/e_int_config_performance.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f fps"
-msgstr "%2.0f pixels"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
-#, fuzzy
 msgid "Cache Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:147
-#, fuzzy
 msgid "Cache Flush Interval"
-msgstr "Tjekinterval"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:152
 msgid "Size Of Font Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%1.1f MB"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:157
 msgid "Size Of Image Cache"
@@ -5403,9 +4946,9 @@ msgid "Number Of Edje Files To Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f files"
-msgstr "%2.0f pixels"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:167
 msgid "Number Of Edje Collections To Cache"
@@ -5420,51 +4963,43 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
-msgstr "Favoritapplikationer"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "Modstand"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "Slet"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "Filer"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
@@ -5480,9 +5015,9 @@ msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
@@ -5494,9 +5029,8 @@ msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
@@ -5514,34 +5048,29 @@ msgstr ""
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%2.0f pixels"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Beholder %d"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Minimal hastighed"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Maksimal hastighed"
+msgstr ""
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Niveau"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
-#, fuzzy
 msgid "Screen Saver Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:135
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:173
@@ -5563,9 +5092,8 @@ msgid "Time until X screensaver alternates"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
-#, fuzzy
 msgid "Blanking"
-msgstr "Niveau"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
@@ -5580,18 +5108,16 @@ msgid "Exposure Events"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:234
-#, fuzzy
 msgid "Allow"
-msgstr "Langsom"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Saver"
-msgstr "Skærmzone"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:71
 msgid "Configured Shelves"
@@ -5599,23 +5125,19 @@ msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Skarp"
+msgstr ""
 
 #: 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 ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
 #: src/modules/conf_startup/e_int_config_startup.c:39
-#, fuzzy
 msgid "Startup Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_startup/e_int_config_startup.c:328
 msgid "Show Splash Screen on Login"
@@ -5623,34 +5145,32 @@ msgstr ""
 
 #: src/modules/conf_startup/e_mod_main.c:35
 #: src/modules/conf_transitions/e_int_config_transitions.c:134
-#, fuzzy
 msgid "Startup"
-msgstr "Skarp"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme.c:90
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
-msgstr "Slet"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
@@ -5672,23 +5192,20 @@ msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Temaer"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
-#, fuzzy
 msgid "Transition Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:126
 msgid "Events"
 msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:135
-#, fuzzy
 msgid "Desk Change"
-msgstr "Skrivebordsnavn"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:136
 msgid "Background Change"
@@ -5696,50 +5213,46 @@ msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:144
 #: src/modules/conf_transitions/e_mod_main.c:35
-#, fuzzy
 msgid "Transitions"
-msgstr "Midlertidighed"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
-#, fuzzy
 msgid "Wallpaper Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5756,23 +5269,20 @@ msgid "Color 2:"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
-#, fuzzy
 msgid "Fill Options"
-msgstr "Tilvalg"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
-msgstr "Centrér horizontalt"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
-msgstr "Centrér vertikalt"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
 msgid "Diagonal Up"
@@ -5795,43 +5305,36 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
-#, fuzzy
 msgid "Fill and Stretch Options"
-msgstr "Diverse valgmuligheder"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
 msgid "Stretch"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
-#, fuzzy
 msgid "Center"
-msgstr "Generelt"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
-#, fuzzy
 msgid "Tile"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
-#, fuzzy
 msgid "Within"
-msgstr "Ingenting"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
-#, fuzzy
 msgid "Fill"
-msgstr "Dræb"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
-#, fuzzy
 msgid "File Quality"
-msgstr "Høj kvalitet"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
 msgid "Use original file"
@@ -5842,48 +5345,42 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
-"Enlightenment var ikke i stand til at skabe en proces:\n"
-"\n"
-"%s\n"
-"\n"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "Temaer"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5982,26 +5479,15 @@ msgid "Decelerate"
 msgstr "Decelerér"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
-#, fuzzy
 msgid "Window Border"
-msgstr "Vinduesrolle"
+msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
 msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:274
-#, fuzzy
 msgid "Prefer application provided icon"
-msgstr "(Ingen applikationer)"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-#, fuzzy
-msgid "Internal Windows"
-msgstr "(Ingen vinduer)"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
 msgstr ""
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
@@ -6086,15 +5572,13 @@ msgstr ""
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 #: src/modules/wizard/page_060.c:26
-#, fuzzy
 msgid "Window Focus"
-msgstr "Fokusering af nye vinduer"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "Information ved flytning af vinduer"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -6130,28 +5614,21 @@ msgid "Move by:"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Modstand"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "Maksimeringspolitik"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Smart ekspansion"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Ekspandér vinduet"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Fyld den tilgængelige plads"
 
@@ -6159,30 +5636,26 @@ msgstr "Fyld den tilgængelige plads"
 msgid "Maximize Policy"
 msgstr "Maksimeringspolitik"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "Centrér horizontalt"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#, fuzzy
-msgid "Allow window manipulation"
-msgstr "Manipulering af vinduer"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
-msgstr "Hæv automatisk vinduer når musen er over dem"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -6203,93 +5676,87 @@ msgid "Delay before raising:"
 msgstr "Pause før hævning:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
-#, fuzzy
 msgid "Raise Window"
-msgstr "Vindue"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
 msgid "Raise when starting to move or resize"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
-#, fuzzy
 msgid "Raise when clicking to focus"
-msgstr "Klik for fokusering"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Husk for vindue"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
 #, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Husk disse låsninger"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "Husk"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "Intet navn!!"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Luk"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "Luk"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Titel"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "Titel"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Fil:"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "Ingen"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
-#, fuzzy
 msgid "Window List Settings"
-msgstr "Overspringning i vinduesliste"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:145
-#, fuzzy
 msgid "Show iconified windows"
-msgstr "Match kun ét vindue"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:147
-#, fuzzy
 msgid "Show iconified windows from other desks"
-msgstr "Match kun ét vindue"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:151
-#, fuzzy
 msgid "Show iconified windows from other screens"
-msgstr "Match kun ét vindue"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:157
 msgid "Show windows from other desks"
@@ -6301,9 +5768,8 @@ msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:163
 #: src/modules/conf_winlist/e_int_config_winlist.c:241
-#, fuzzy
 msgid "Selection Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:164
 #: src/modules/conf_winlist/e_int_config_winlist.c:242
@@ -6332,9 +5798,8 @@ msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:176
 #: src/modules/conf_winlist/e_int_config_winlist.c:254
-#, fuzzy
 msgid "Warp Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:177
 #: src/modules/conf_winlist/e_int_config_winlist.c:255
@@ -6342,38 +5807,32 @@ msgid "Warp At End"
 msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:257
-#, fuzzy
 msgid "Warp Speed"
-msgstr "Pop op hastighed"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:135
 msgid "Cpufreq"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Hurtig (1 sek.)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Medium (5 sek.)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normal (10 sek.)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Langsom (30 sek.)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Meget langsom (60 sek.)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6400,19 +5859,18 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Automatisk højde"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:299
-#, fuzzy, c-format
+#, c-format
 msgid "%i MHz"
-msgstr "%i Mhz"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:301
-#, fuzzy, c-format
+#, c-format
 msgid "%i.%i GHz"
-msgstr "%i.%i Ghz"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:318
 msgid "Time Between Updates"
@@ -6423,22 +5881,18 @@ msgid "Set CPU Power Policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:331
-#, fuzzy
 msgid "Set CPU Speed"
-msgstr "Sæt hastighed"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:386
-#, fuzzy
 msgid ""
 "There was an error trying to set the<br>cpu frequency governor via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Der opstod en fejl i ved at sætte CPU frekvensen<br>via modulets setfreq "
-"program."
 
 #: src/modules/cpufreq/e_mod_main.c:412
 msgid ""
@@ -6448,23 +5902,18 @@ msgid ""
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:432
-#, fuzzy
 msgid ""
 "There was an error trying to set the<br>cpu frequency setting via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Der opstod en fejl i ved at sætte CPU frekvensen<br>via modulets setfreq "
-"program."
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:108
-#, fuzzy
 msgid "Quality"
-msgstr "Lav kvalitet"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:111
 msgid "High Quality"
@@ -6499,9 +5948,8 @@ msgid "Very Sharp"
 msgstr "Meget skarp"
 
 #: src/modules/dropshadow/e_mod_config.c:134
-#, fuzzy
 msgid "Shadow Distance"
-msgstr "Oprullet tilstand"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:137
 msgid "Very Far"
@@ -6524,9 +5972,8 @@ msgid "Extremely Near"
 msgstr "Ekstremt nær"
 
 #: src/modules/dropshadow/e_mod_config.c:147
-#, fuzzy
 msgid "Underneath"
-msgstr "Umiddelbart nedenunder"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:151
 msgid "Shadow Darkness"
@@ -6553,26 +6000,22 @@ msgid "Dropshadow"
 msgstr ""
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
-#, fuzzy
 msgid "Run Command Dialog"
-msgstr "Udfør kommando"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:322
-#, fuzzy
 msgid "Favorites"
-msgstr "Favoritapplikationer"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "Opløsning"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:431
-#, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6582,17 +6025,8 @@ 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 ""
-"Konfigurationsdata krævede en opdatering. Din gamle konfiguration\n"
-"er blevet slettet og et nyt sæt standardværdier initialiseret. Dette\n"
-"vil ske regelmæssigt i forbindelse med udviklingen, så rapportér ikke\n"
-"dette som en fejl. Dette betyder ganske enkelt at Enlightenment har\n"
-"brug for ny konfigurationsdata som standard for funktionalitet som din\n"
-"gamle konfiguration mangler. Dette nye sæt standardværdier vil ordne\n"
-"dette ved at tilføje. Du kan genkonfigurere tingene nu efter behag.\n"
-"Beklager dette rod i din konfiguration.\n"
 
 #: src/modules/fileman/e_mod_main.c:444
-#, 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 "
@@ -6601,32 +6035,22 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Din konfiguration er NYERE end Enlightenment. Dette er meget\n"
-"underligt. Dette skulle ikke ske, med mindre du nedgraderede\n"
-"Enlightenment eller kopierede konfigurationen fra et sted hvor\n"
-"en nyere version af Enlightenment kørte. Dette er dårligt og\n"
-"som en forholdsregel er din konfiguration nu sat tilbage til\n"
-"standardværdierne. Beklager ulejligheden.\n"
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:95
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:227
-#, fuzzy
 msgid "Icon Size"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "Tilpasningstilstand"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6637,9 +6061,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6658,16 +6081,15 @@ msgid "Show Full Path"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:260
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6683,99 +6105,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Ã…ben"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr "Udfør kommando"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Slet"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6783,14 +6201,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Vis information"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Fil:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6802,80 +6219,68 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Konfiguration"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Fare"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Fare"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Basas info"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Klip"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Klip"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Midlertidighed"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Vis information"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Basas info"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "Dimser"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "Fjern"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "Altid øverst"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "Dimser"
+msgstr ""
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
 msgid "Show/hide gadgets"
@@ -6883,28 +6288,24 @@ 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
-#, fuzzy
 msgid "Window : List"
-msgstr "Overspring i vinduesliste"
+msgstr ""
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
-#, fuzzy
 msgid "Next Window"
-msgstr "Vindue"
+msgstr ""
 
 #: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
-#, fuzzy
 msgid "Previous Window"
-msgstr "Forsvundne vinduer"
+msgstr ""
 
 #: src/modules/winlist/e_winlist.c:141
 msgid "Select a window"
 msgstr "Vælg et vindue"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
@@ -6914,24 +6315,21 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:130
-#, fuzzy
 msgid "Display App Name"
-msgstr "Visning"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:134
-#, fuzzy
 msgid "Display App Comment"
-msgstr "Visning"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:138
-#, fuzzy
 msgid "Display App Generic"
-msgstr "Visning"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
@@ -6942,91 +6340,77 @@ msgid "Enter a name for this new source:"
 msgstr ""
 
 #: 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 ""
-"Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-"afslutte?"
 
 #: src/modules/ibar/e_mod_config.c:187
-#, fuzzy
 msgid "Are you sure you want to delete this bar source?"
-msgstr "Er du sikker på at du vil afslutte?"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:215
 msgid "IBar"
 msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:797
-#, fuzzy
 msgid "Change Icon Properties"
-msgstr "Egenskaber"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:802
-#, fuzzy
 msgid "Remove Icon"
-msgstr "Opret ikon"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:812
-#, fuzzy
 msgid "Add An Icon"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:819
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Opret ikon"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:835
-#, fuzzy
 msgid "Add Application"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
-msgstr "Visning"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
-msgstr "Visning"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
-msgstr "Visning"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "Vis information"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
-msgstr "Skærmzone"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -7035,180 +6419,159 @@ msgid "IBox"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:72
-#, fuzzy
 msgid "Pager Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Send til skrivebord"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:132
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Match kun ét vindue"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
 msgid "Click to set"
-msgstr "Klik for fokusering"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr "Virtuelt skrivebord"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
 msgid "%.0f px"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
-msgstr "Modstand mellem vinduer:"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "Pop op hastighed"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr "Pop op hastighed"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
+#, c-format
 msgid "%1.1f seconds"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:229
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr "Overspringning i vinduesliste"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "Match kun ét vindue"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr "Tilvalg"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
 msgid "Button %i"
-msgstr "Nederst"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "Fokusindstillinger"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "Skrivebordsnavn"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "Skriveborde"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
-#, fuzzy
 msgid "Start"
-msgstr "Starter %s"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Sæt kontrollør"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:55
-#, fuzzy
 msgid "System Controls"
-msgstr "Sæt kontrollør"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Andre indstillinger"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
-#, fuzzy
 msgid "Display Units"
-msgstr "Visning"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:250
 #: src/modules/temperature/e_mod_config.c:354
-#, fuzzy
 msgid "Celsius"
-msgstr "Celcius"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:252
 #: src/modules/temperature/e_mod_config.c:356
@@ -7289,47 +6652,42 @@ msgid "32 C"
 msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:367
-#, fuzzy
 msgid "Sensors"
-msgstr "Sensor"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:397
 #: src/modules/temperature/e_mod_config.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f F"
-msgstr "%1.1f sek."
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:409
 #: src/modules/temperature/e_mod_config.c:414
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f C"
-msgstr "%1.1f sek."
+msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
-#, fuzzy
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
-msgstr "Lav temperatur"
+msgstr ""
 
 #: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Om Enlightenment"
+msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "Filer"
+msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7337,66 +6695,56 @@ msgid ""
 msgstr ""
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Slet"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:25
 msgid "Launcher Bar"
 msgstr ""
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Skriveborde"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Send til skrivebord"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Fokuséring"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Klik for fokusering"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "Vælg et vindue"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
@@ -7411,53 +6759,44 @@ msgid "Output"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Oprullet"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Fortryd"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "Oprullet"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Fortryd"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Type:"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Lys"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
-#, fuzzy
 msgid "Mute"
-msgstr "Moduler"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "Størrelse"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Redigér ikon"
+msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -7468,9 +6807,8 @@ msgid "Sound Cards"
 msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "Basale indstillinger"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
@@ -7481,19 +6819,16 @@ msgid "Launch mixer..."
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Konfiguration opgraderet"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "Sæt kontrollør"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -7502,103 +6837,82 @@ msgid ""
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:214
-#, fuzzy
 msgid "Connection Manager"
-msgstr "Op- og nedrulning af vinduer"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Fokusindstillinger"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:737
 msgid "Network Device"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
-#, fuzzy
 msgid "Wifi"
-msgstr "Ingenting"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "(Ingen applikationer)"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Configure Virtual Desktops"
-#~ msgstr "Virtuelt skrivebord"
-
-#, fuzzy
-#~ msgid "Configure"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Configure Heading"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Custom Grid Icons"
-#~ msgstr "Tilpas til ikoner"
-
-#, fuzzy
-#~ msgid "Defined Command"
-#~ msgstr "Udfør kommando"
-
-#, fuzzy
-#~ msgid "Suspend to Disk"
-#~ msgstr "Send til skrivebord"
-
-#, fuzzy
-#~ msgid "Desktop Lock"
-#~ msgstr "Skriveborde"
-
-#~ msgid "Advanced Settings"
-#~ msgstr "Advancerede indstillinger"
-
-#, fuzzy
-#~ msgid "%1.0f percent"
-#~ msgstr "%1.1f sek."
-
-#, fuzzy
 #~ msgid ""
-#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
-#~ "this profile?"
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
 #~ msgstr ""
-#~ "Du bad om at afslutte Enlightenment.<br><br>Er du sikker på at du vil "
-#~ "afslutte?"
+#~ "Du forsøger at bede Enlightenment om at huske<br>egenskaber (såsom "
+#~ "størrelse, placering, rammestil osv.) for<br>et vindue som <hilight>ikke "
+#~ "har unikke egenskaber</hilight>.<br><br>Det betyder at det deler navn/"
+#~ "klasse, midlertidighed, rolle, osv.<br>med et andet vindue på skærmen og "
+#~ "huskede egenskaber for dette vindue vil blive anvendt til all andre "
+#~ "vinduer der matcher de samme egenskaber.<br><br>Du vil måske anvende "
+#~ "<hilight>Match kun ét vindue</hilight> muligheden hvis<br>du kun ønskede "
+#~ "at én instans af dette vindue skal ændres. Andre instanser vil ikke blive "
+#~ "ændret.<br><br>Dette er blot en advarsel for det tilfælde at du ikke "
+#~ "ønskede dette.<br>Hvis du gjorde, tryk da <hilight>Anvend</hiligt> eller "
+#~ "<hilight>O.k.</hilight> og dine indstillinger vil blive accepteret. Tryk "
+#~ "<hilight>Fortryd</hiligt> hvis du<br>ikke er sikker og ingenting vil da "
+#~ "blive ændret."
+
+#~ msgid "Window name and class"
+#~ msgstr "Vinduenavn og -klasse"
+
+#~ msgid "Expand the window"
+#~ msgstr "Ekspandér vinduet"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete this profile?"
-#~ msgstr "Er du sikker på at du vil afslutte?"
-
-#, fuzzy
-#~ msgid "Desktop %i, %i"
-#~ msgstr "Skriveborde"
+#~ msgid "Advanced Settings"
+#~ msgstr "Advancerede indstillinger"
 
 #~ msgid "Configuration Upgraded"
 #~ msgstr "Konfiguration opgraderet"
@@ -7606,72 +6920,12 @@ msgstr ""
 #~ msgid "Configuration"
 #~ msgstr "Konfiguration"
 
-#, fuzzy
-#~ msgid "Shelf Configuration"
-#~ msgstr "Konfiguration"
-
 #~ msgid "Enlightenment Configuration"
 #~ msgstr "Enlightenment opsætning"
 
 #~ msgid "Configuration Panel"
 #~ msgstr "Konfigurationspanel"
 
-#, fuzzy
-#~ msgid "Input Method Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Language Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Search Path Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Dropshadow Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Fileman Configuration Updated"
-#~ msgstr "Konfiguration opgraderet"
-
-#, fuzzy
-#~ msgid "IBar Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "IBox Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Pager Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Virtual Desktops Configuration"
-#~ msgstr "Virtuelt skrivebord"
-
-#, fuzzy
-#~ msgid "Temperature Configuration"
-#~ msgstr "Enlightenment opsætning"
-
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
-#~ msgstr ""
-#~ "Enlightenment var ikke i stand til at skabe en proces:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-
 #~ msgid "X reports there are no root windows and %i screens!\n"
 #~ msgstr "X rapporterer at der er ingen rod-vinduer og %i skærme!\n"
 
@@ -7690,250 +6944,22 @@ msgstr ""
 #~ msgid "About..."
 #~ msgstr "Om..."
 
-#, fuzzy
-#~ msgid "Miscellaneous"
-#~ msgstr "Diverse valgmuligheder"
-
 #~ msgid "Window Manipulation"
 #~ msgstr "Manipulering af vinduer"
 
-#, fuzzy
-#~ msgid "French"
-#~ msgstr "Fahrenheit"
-
-#, fuzzy
-#~ msgid "German"
-#~ msgstr "Generelt"
-
-#, fuzzy
-#~ msgid "Portuguese"
-#~ msgstr "Egenskaber"
-
-#, fuzzy
-#~ msgid "Slovak"
-#~ msgstr "Langsom"
-
-#, fuzzy
-#~ msgid "Amharic"
-#~ msgstr "Automatisk"
-
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Rettigheder:"
-
-#, fuzzy
-#~ msgid "Manx"
-#~ msgstr "Manuel"
-
-#, fuzzy
-#~ msgid "Lingala"
-#~ msgstr "Lineær"
-
-#, fuzzy
-#~ msgid "Lao"
-#~ msgstr "Lav"
-
-#, fuzzy
-#~ msgid "Nepali"
-#~ msgstr "Nær"
-
-#, fuzzy
-#~ msgid "Somali"
-#~ msgstr "Lille"
-
-#, fuzzy
-#~ msgid "Tamil"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Tigrinya"
-#~ msgstr "Super lille"
-
-#, fuzzy
-#~ msgid "Tigre"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Vietnamese"
-#~ msgstr "Omdøb"
-
-#, fuzzy
-#~ msgid "Antarctica"
-#~ msgstr "Automatisk"
-
-#, fuzzy
-#~ msgid "Australia"
-#~ msgstr "Automatisk hævning"
-
-#, fuzzy
-#~ msgid "Austria"
-#~ msgstr "Automatisk hævning"
-
-#, fuzzy
-#~ msgid "Belgium"
-#~ msgstr "Medium"
-
-#, fuzzy
-#~ msgid "Belize"
-#~ msgstr "Størrelse"
-
-#, fuzzy
-#~ msgid "Chile"
-#~ msgstr "Luk"
-
-#, fuzzy
-#~ msgid "China"
-#~ msgstr "Oplader"
-
-#, fuzzy
-#~ msgid "Denmark"
-#~ msgstr "Mørk"
-
-#, fuzzy
-#~ msgid "France"
-#~ msgstr "Fortryd"
-
-#, fuzzy
-#~ msgid "Guinea"
-#~ msgstr "Lineær"
-
-#, fuzzy
-#~ msgid "Mali"
-#~ msgstr "Manuel"
-
-#, fuzzy
-#~ msgid "Mexico"
-#~ msgstr "Diverse"
-
-#, fuzzy
-#~ msgid "Micronesia"
-#~ msgstr "Mikroskopisk"
-
-#, fuzzy
-#~ msgid "Myanmar"
-#~ msgstr "Manuel"
-
-#, fuzzy
-#~ msgid "Nauru"
-#~ msgstr "Nær"
-
-#, fuzzy
-#~ msgid "Nepal"
-#~ msgstr "Nær"
-
-#, fuzzy
-#~ msgid "Niger"
-#~ msgstr "Nær"
-
-#, fuzzy
-#~ msgid "Norway"
-#~ msgstr "Normal"
-
-#, fuzzy
-#~ msgid "Pitcairn"
-#~ msgstr "Position"
-
-#, fuzzy
-#~ msgid "Reunion"
-#~ msgstr "Opløsning"
-
-#, fuzzy
-#~ msgid "Samoa"
-#~ msgstr "Lille"
-
-#, fuzzy
-#~ msgid "Senegal"
-#~ msgstr "Generelt"
-
-#, fuzzy
-#~ msgid "Somalia"
-#~ msgstr "Lille"
-
-#, fuzzy
-#~ msgid "Taiwan"
-#~ msgstr "Super lille"
-
-#, fuzzy
-#~ msgid "United States"
-#~ msgstr "Minimeret tilstand"
-
-#, fuzzy
-#~ msgid "Uzbekistan"
-#~ msgstr "Modstand"
-
-#, fuzzy
-#~ msgid "Vanuatu"
-#~ msgstr "Manuel"
-
-#, fuzzy
-#~ msgid "Viet Nam"
-#~ msgstr "Skrivebordsnavn"
-
 #~ msgid "Window list skip"
 #~ msgstr "Overspringning i vinduesliste"
 
 #~ msgid "Window"
 #~ msgstr "Vindue"
 
-#, fuzzy
-#~ msgid "Window Name"
-#~ msgstr "Vinduesrolle"
-
-#, fuzzy
-#~ msgid "Window Title"
-#~ msgstr "Vinduesrolle"
-
 #~ msgid "Misc"
 #~ msgstr "Diverse"
 
-#, fuzzy
-#~ msgid "Window Frame"
-#~ msgstr "Vinduetype"
-
 #~ msgid "When moving or resizing windows, resist at the boundaries"
 #~ msgstr ""
 #~ "Lav modstand ved kanter når vinduer flyttes eller størrelsen ændres på dem"
 
-#, fuzzy
-#~ msgid "Module State"
-#~ msgstr "Moduler"
-
-#, fuzzy
-#~ msgid "Terminal Command"
-#~ msgstr "Udfør kommando"
-
-#, fuzzy
-#~ msgid "Widget"
-#~ msgstr "Dimser"
-
-#, fuzzy
-#~ msgid "Font Size:"
-#~ msgstr "Størrelse:"
-
-#, fuzzy
-#~ msgid "%2.1f pixels"
-#~ msgstr "%2.0f pixels"
-
-#, fuzzy
-#~ msgid "Font Class Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Edit Application"
-#~ msgstr "Favoritapplikationer"
-
-#, fuzzy
-#~ msgid "Create a new application"
-#~ msgstr "Favoritapplikationer"
-
-#, fuzzy
-#~ msgid "Regenerate \"Applications\" Menu"
-#~ msgstr "Favoritapplikationer"
-
-#, fuzzy
-#~ msgid "Move application up"
-#~ msgstr "(Ingen applikationer)"
-
 #~ msgid ""
 #~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
 #~ "switch to an AC source."
@@ -8052,22 +7078,6 @@ msgstr ""
 #~ "brugbart med moderne bærbare med<br>hurtige processorer, der genererer en "
 #~ "masse varme."
 
-#, fuzzy
-#~ msgid "Temp 1"
-#~ msgstr "Temp1"
-
-#, fuzzy
-#~ msgid "Temp 2"
-#~ msgstr "Temp2"
-
-#, fuzzy
-#~ msgid "Temp 3"
-#~ msgstr "Temp3"
-
-#, fuzzy
-#~ msgid "ACPI Temperature"
-#~ msgstr "Lav temperatur"
-
 #~ msgid "CPU Frequency Controller Module"
 #~ msgstr "CPU frekvenskontrolmodul"
 
@@ -8084,14 +7094,6 @@ msgstr ""
 #~ msgid "Experimental Button module for E17"
 #~ msgstr "Eksperimentel knapmodul for E17"
 
-#, fuzzy
-#~ msgid "ITray Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Enlightenment ITray Module"
-#~ msgstr "Enlightenment IBar-modul"
-
 #~ msgid "The border style"
 #~ msgstr "Rammestilen"
 
diff --git a/po/de.gmo b/po/de.gmo
index fb8239f..d678bd9 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 4f48c2e..175b474 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,40 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-06-09 11:41+0100\n"
-"Last-Translator: Thomas Gstädtner <thomas at gstaedtner.net>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-06 10:41+0000\n"
+"Last-Translator: Thomas Gstädtner <Unknown>\n"
 "Language-Team: E17-de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Ãœber Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Schließen"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -48,16 +50,6 @@ 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-2008 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 "
-"steht unter gewissen Lizenzbestimmungen; sehen Sie hierzu bitte die \"COPYING"
-"\"- und \"COPYING-PLAIN\"-Lizenzdateien ein, welche auf Ihrem System "
-"abgespeichert sind.<br><br>An Enlightenment wird <hilight>SEHR INTENSIV "
-"ENTWICKELT</hilight> und es ist nicht stabil! Viele Funktionen sind nicht "
-"komplett oder schlicht noch nicht existent und haben möglicherweise viele "
-"Fehler. Sie wurden <hilight>GEWARNT!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -78,61 +70,61 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Möchten Sie dieses Fenster wirklich abrupt schliessen?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nein"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Möchten Sie Enlightenment wirklich beenden?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Sie sind im Begriff Enlightenment zu beenden.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Möchten Sie sich wirklich abmelden?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Sie sind im Begriff sich abzumelden.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Möchten Sie den Computer wirklich herunterfahren?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Sie sind im Begriff den Computer herunterzufahren.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Möchten Sie wirklich neustarten?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Sie sind im Begriff den Computer neuzustarten.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -140,11 +132,11 @@ msgstr ""
 "Sie sind im Begriff den Computer in den Bereitschaftsmodus zu versetzen."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Wollen Sie den Computer wirklich in den Ruhezustand herunterfahren?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,494 +144,494 @@ msgstr ""
 "Sie sind im Begriff den Computer in den Ruhezustand herunterzufahren."
 "<br><br>Sind Sie sicher?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Fenster : Aktionen"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Verschieben"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Größe ändern"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Fenstermenü"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "nach oben"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "nach unten"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Schließen erzwingen"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Fenster : Zustand"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Klebrig-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Icon-Modus-Umschalter"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Vollbildmodus-Umschalter"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximieren"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximiere vertikal"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximiere horizontal"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximiere auf Vollbild"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximierungsmodus \"Geschickt\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximieren-Modus \"Erweitern\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximierungsmodus \"Füllen\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Einklappmodus-Oben-Umschalter"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Ausklappmodus-Unten-Umschalter"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "EInklappmodus-Links-Umschalter"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Einklappmodus-Rechts-Umschalter"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Einklappmodus-Umschalter"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Schalte Rahmenloszustand um"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Schalte Befestigungszustand um"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Wechsle zu linker Arbeitsfläche"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Wechsle zu rechter Arbeitsfläche"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Wechsle zu oberer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Wechsle zu unterer Arbeitsfläche"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Wechsle um Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Zeige die Arbeitsfläche"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Zeige die Modulablage"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Wechsle linear zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Wechsle zu Arbeitsfläche 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Wechsle zu Arbeitsfläche 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Wechsle zu Arbeitsfläche 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Wechsle zu Arbeitsfläche 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Wechsle zu Arbeitsfläche 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Wechsle zu Arbeitsfläche 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Wechsle zu Arbeitsfläche 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Wechsle zu Arbeitsfläche 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Wechsle zu Arbeitsfläche 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Wechsle zu Arbeitsfläche 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Wechsle zu Arbeitsfläche 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Wechsle zu Arbeitsfläche 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Wechsle zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Klappe Arbeitsfläche nach links (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Klappe Arbeitsfläche nach rechts (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Klappe Arbeitsfläche nach oben (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Klappe Arbeitsfläche nach unten (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Klappe ... Arbeitsflächen weiter (alle Bidschirme)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Klappe Arbeitsfläche nach... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Klappe Arbeitsfläche linear nach... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Klappe Arbeitsfläche in Richtung..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 0 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 1 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 2 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 3 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 4 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 5 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 6 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 7 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 8 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 9 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 10 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche 11 (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Wechsle zu Arbeitsfläche... (alle Bildschirme)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Verschiebe Maus auf Bildschirm 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Verschiebe Maus auf Bildschirm 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Verschiebe Maus auf Bildschirm..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm weiter"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Verschiebe Maus 1 Bildschirm zurück"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Verschiebe Maus Bildschirme weiter/zurück..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Fenster : Bewegen"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Zur nächsten Arbeitsfläche"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Zur vorhergehenden Arbeitsfläche"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Von Arbeitsfläche #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Zu Arbeitsfläche..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Zeige Hauptmenü"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Zeige Favoritenmenü"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Zeige Anwendungsmenü"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Zeige Fensterlistenmenü"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Zeige Menü..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Führe aus"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Befehl"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Anwendung"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Neustart"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Beenden"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Sofort Beenden"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modus"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Präsentationsmodus-Umschalter"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Offlinemodus-Umschalter"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Sofort abschalten"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Abschalten"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Bereitschaftsmodus"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Ruhezustand"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Sperren"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Fenster aufräumen"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Allgemein: Aktionen"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Verzögerte Aktion"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Setzte als Hintergrund"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Suche nach Desktopdateien erledigt"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Suche nach Desktopdateien"
 
@@ -647,41 +639,40 @@ msgstr "Suche nach Desktopdateien"
 msgid "Color Selector"
 msgstr "Farbwähler"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -699,7 +690,7 @@ msgstr ""
 "nun eine Rekonfiguration vornehmen wenn<br>Sie möchten. Entschuldigen Sie "
 "die Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -715,11 +706,11 @@ msgstr ""
 "Standardeinstellungen<br>benutzt. Bitte entschuldigen Sie etwaige "
 "Unannehmlichkeiten.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Einstellungen wurden aktualisiert"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -731,7 +722,7 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -747,7 +738,7 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -761,7 +752,7 @@ msgstr ""
 "betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung zu "
 "vermeiden.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -775,7 +766,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:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -787,11 +778,11 @@ msgstr ""
 "war betroffen:<br>%s<br><br>Diese Datei wurde entfernt um Datenverfälschung "
 "zu vermeiden.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Konfiguration Schreibprobleme"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -799,12 +790,12 @@ msgstr "Enlightenment Konfiguration Schreibprobleme"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Einfach"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Ãœbernehmen"
 
@@ -812,7 +803,7 @@ msgstr "Ãœbernehmen"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Module"
 
@@ -821,27 +812,27 @@ msgstr "Module"
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Fehler - keine PAM-Unterstützung"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment wurde ohne PAM-Unterstützung<br>kompiliert, wodurch die "
 "Arbeitsflächensperre deaktiviert ist."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Sperrung schlug fehl"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -850,15 +841,15 @@ msgstr ""
 "Tastatur oder Maus in Beschlag nimmt<br>und eine Aufhebung dessen nicht "
 "möglich ist."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Bitte geben Sie ihr Kennwort zum Entsperren ein"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Fehler im Authentifizierungssystem"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -869,11 +860,11 @@ msgstr ""
 "Sitzungseinrichtung auf. Der Fehlercode lautet <hilight>%i</hilight>."
 "<br>Dies sollte nicht passieren; bitte melden Sie den Fehler."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Präsentationsmodus aktivieren?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -883,11 +874,11 @@ msgstr ""
 "<b>Präsentationsmodus</b> aktivieren und vorübergehend Bildschirmschoner und "
 "-sperre sowie Stromsparen deaktivieren?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Nein, stattdessen Verzögerung erhöhen"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Nein, und nicht mehr nachfragen"
 
@@ -914,7 +905,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Programmeintragseditor"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -959,7 +950,7 @@ msgstr "Kategorien"
 msgid "Mime Types"
 msgstr "Dateitypen"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Optionen"
 
@@ -991,23 +982,23 @@ msgstr "Wählen Sie ein Icon"
 msgid "Select an Executable"
 msgstr "Wählen Sie eine ausführbare Datei aus"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Entfernen"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -1015,24 +1006,24 @@ msgstr "Einfügen"
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Laufzeitfehler"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Anwendungslaufzeitfehler"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1041,310 +1032,310 @@ msgstr ""
 "Enlightenment konnte die Anwendung nicht ausführen:<br><br>%s<br><br>Der "
 "Anwendungsstart schlug fehl."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Fehler beim Ausführen der Anwendung"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s wurde unerwartet beendet."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s wurde durch ein Unterbrechungssignal unterbrochen."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s wurde durch ein Endesignal unterbrochen."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s wurde durch ein Abbruchssignal unterbrochen."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s wurde durch einen Fließkommafehler unterbrochen."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s wurde durch einen Segmentierungsfehler unterbrochen."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s wurde durch eine defekte Weiterleitung unterbrochen."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s wurde durch ein Terminierungssignal unterbrochen."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s wurde durch einen Bus-Fehler unterbrochen."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s wurde durch das Signal %i unterbrochen."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Fehlerprotokolle"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Es gab keine Fehlermeldung."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Speichere diese Nachricht"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Fehlerinformation"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Fehlersignalinformation"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Ausgabedaten"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Es gab keine Ausgabe."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Nicht vorhandener Pfad"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existiert nicht"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Einhängefehler"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Gerät kann nicht eingehängt werden"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr "Aushängefehler"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Gerät kann nicht ausgehängt werden"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Auswurffehler"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Gerät kann nicht ausgeworfen werden"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Dateien"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Verknüpfung"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Abbruch"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Übergeordnete Einstellungen übernehmen"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Ansicht"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Aktualisiere die Anzeige"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Zeige versteckte Dateien"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "An Anordnung erinnern"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Jetzt sortieren"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Neues Verzeichnis"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Aushängen"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Einhängen"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Auswerfen"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Verwende Standard"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Raster-Icons"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Angepasste Icons"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Icon-Größe (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Hintergrundbild setzen..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Ãœberlagerung setzen..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Leeren"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Neues Verzeichnis erstellen"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Neuer Verzeichnisname:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Umbenennen von %s in:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Benenne Datei um"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Fehler"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Nein für alle"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Ja für alle"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 "Die datei existiert bereits, wirklich überschreiben?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorieren"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignoriere alles"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Es trat ein Fehler bei der Ausführung einer Operation auf.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Löschung bestätigen"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1357,144 +1348,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Dateieigenschaften"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Datei:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Zuletzt geändert:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Dateitype:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Andere dürfen lesen"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Andere dürfen schreiben"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Besitzer darf lesen"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Besitzer darf schreiben"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Standard"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Minibild"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Verwende dieses Icon für alle Dateien dieses Typs"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Verknüpfungsinformation"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Wähle ein Bild aus"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Unbekanntes Laufwerk"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Entfernbare Geräte"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Flach"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Eingedrückt"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Verschiebe Inhalte automatisch"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Ermögliche Größenänderung"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Starte Verschieben/Größenänderung dieses Helfers"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Entferne diesen Helfer"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Beende Verschieben/Größenänderung dieses Helfers"
 
@@ -1506,7 +1501,7 @@ msgstr ""
 "Auf diesem Bildschirm läuft bereits eine Instanz von Enlightenment.\n"
 "Der Startvorgang wird abgebrochen.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Fenstersperren"
 
@@ -1541,21 +1536,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Ablage"
 
@@ -1564,12 +1559,12 @@ 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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Eingeklappt"
 
@@ -1578,7 +1573,7 @@ msgid "Maximized state"
 msgstr "Maximierter Zustand"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Vollbildmodus"
 
@@ -1586,7 +1581,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Rahmenart"
 
@@ -1634,115 +1629,116 @@ msgstr "Löse von Arbeitsfläche"
 msgid "More..."
 msgstr "Mehr..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimieren"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Vertikal maximieren"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Horizontal maximieren"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Maxmimierung aufheben"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Tastaturkürzel"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Zum Favoritenmenü"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Zum Schnellstartmenü"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Fensterrahmen"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Ãœberspringen"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Status"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Erinnern"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Fenstereigenschaften"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Immer im Vordergrund"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Immer im Hintergrund"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Wähle Rahmenart"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Benutze E17 Standardsymbolvoreinstellung"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "Verwende Anwendungsspezifisches Icon"
+msgstr "Verwende Anwendungsspezifisches Icon "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Verwende Benutzerspezifisches Icon"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Eingeklappt"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Klebrig"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Fensterliste"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Arbeitsflächenumschalter"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Fensterleiste"
 
@@ -1758,7 +1754,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Eigenschaften"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titel"
 
@@ -1850,11 +1846,11 @@ msgstr "NetWM Eigenschaften"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Fensterliste überspringen"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Arbeitsflächenumschalter überspringen"
 
@@ -1862,15 +1858,15 @@ msgstr "Arbeitsflächenumschalter überspringen"
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Fenstereigenschaften merken"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Eigenschaften treffen auf mehrere Fenster zu"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1894,11 +1890,11 @@ msgstr ""
 "<hilight>Abbrechen</hilight> wenn Sie sich nicht sicher sind,<br>wodurch die "
 "Änderungen verworfen werden."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Keine passenden Eigenschaften ausgewählt"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1909,114 +1905,101 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Sie wollen, dass Enlightenment sich verschiedene Eigenschaften<br>eines "
-"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 "
-"die<hilight>Nur auf dieses Fenster zutreffend</hilight>-Option<br>wählen "
-"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ä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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nichts"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Größe und Position"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Sperren"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Größe, Position und Sperren"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Alles"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Merken an Hand"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Fensternamen und -klasse"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Funktion des Fensters"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Fenstertyp"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Vergänglichkeit"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Zu merkende Eigenschaften"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Icon-Eigenschaften"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Arbeitsfläche"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktueller Bildschirm"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Fensterliste überspringen"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Nur auf dieses Fenster zutreffend"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Starte dieses Programm beim Anmelden"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Immer beim start fokusieren"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Starte dieses Programm beim Anmelden"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Einstellungen"
@@ -2035,24 +2018,24 @@ msgstr "Modulablage"
 msgid "Module Settings"
 msgstr "Modul-Einstellungen"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Verfügbare Module"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Lade Modul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Geladene Module"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Entlade Module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2086,8 +2069,8 @@ msgstr "Helfer entfernen"
 msgid "Toolbar Settings"
 msgstr "Werkzeugleisteneinstellungen"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Ausführung"
 
@@ -2114,12 +2097,12 @@ msgid "Favorite Applications"
 msgstr "Bevorzugte Anwendungen"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2128,7 +2111,7 @@ msgstr "Anwendungen"
 msgid "Windows"
 msgstr "Fenster"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Verlorene Fenster"
 
@@ -2164,129 +2147,128 @@ msgstr "(Keine Anwendung)"
 msgid "Set Virtual Desktops"
 msgstr "Setze virtuelle Arbeitsflächen"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Keine Fenster)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Kein Name!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Keine Modulablagen)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Modulablage #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Modulablage hinzufügen"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Modulablage entfernen"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Modulablageneinstellungen"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Winzig"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Klein"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Groß"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Riesig"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Setze Inhalte..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Ãœber allem"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Unter Fenstern"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Unter allem"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Erlaube Fenstern diese Modulablage zu überdecken"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Schrumpfe auf Größe des Inhalts"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f Pixel"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Stile"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automatisches Verstecken"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Modulablage automatisch verstecken"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Zeige bei Mausberührung"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Zeige bei Mausklick"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Zeit bis zum Ausblenden"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f Sekunden"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Ausblenddauer"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Auf allen Arbeitsflächen anzeigen"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Auf bestimmten Arbeitsflächen anzeigen"
 
@@ -2536,7 +2518,7 @@ msgstr "Starte Internationalisierungsunterstützung"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kann sein intl-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2544,11 +2526,11 @@ msgstr ""
 "Enlightenment kann den Startbildschirm nicht initialisieren.\n"
 "Vielleicht haben sie nicht genügend freien Arbeitsspeicher?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Überprüfe Formatübestützung"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2556,7 +2538,7 @@ msgstr ""
 "Enlightenment entdeckte, dass Evas keine Buffercanvas erstellen konnte.\n"
 "Bitte überprüfen Sie Evas auf Softwarebufferengine-Unterstützung.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2564,7 +2546,7 @@ msgstr ""
 "Enlightenment entdeckte, dass Evas keine PNG-Dateien laden kann.\n"
 "Bitte überprüfen Sie Evas auf PNG-Loader-Unterstützung.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2572,7 +2554,7 @@ msgstr ""
 "Enlightenment entdeckte, dass Evas keine JPEG-Dateien laden kann.\n"
 "Bitte überprüfen Sie Evas auf JPEG-Loader-Unterstützung.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2580,7 +2562,7 @@ msgstr ""
 "Enlightenment entdeckte, dass Evas keine EET-Dateien laden kann.\n"
 "Bitte überprüfen Sie Evas auf EET-Loader-Unterstützung.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2590,11 +2572,11 @@ msgstr ""
 "Bitte überprüfen Sie Evas auf 'fontconfig'-Unterstützung fontconfig darauf\n"
 "ob es eine 'Sans'-Schriftart definiert..\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Bildschirme einstellen"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2602,198 +2584,197 @@ msgstr ""
 "Enlightenment konnte sich für keinen Ihrer Bildschirme als Fenstermanager\n"
 "etablieren. Vielleicht läuft schon ein anderer Fenstermanager?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Bildschirmschoner einstellen"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment kann den Dateimanager nicht initialisieren."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Richte Bildschirmsperre ein"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment kann sein Bildschirmsperre-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Richte Pfade ein"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Richte Systemsteuerung ein"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment kann das Systembefehls-Subsystem nicht intitialisieren.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Richte Aktionen ein"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kann sein Aktions-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Richte Ausführungssystem ein"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kann sein Ausführungssystem nicht initialisieren."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Richte Erinnern ein"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment kann die \"Merken\"-Einstellungen nicht initialisieren."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Richte FM ein"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kann den Dateimanager nicht initialisieren.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Richte Nachrichtensystem ein"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kann sein msg-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Richte DND ein"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kann sein dnd-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:869
-#, fuzzy
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr "Richte Eingabeübernahmeverarbeitung ein"
+msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment kann sein Eingabeerkennungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Richte Module ein"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kann sein Modul-Subsystem nicht initialisieren."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Richte Erinnern ein"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment kann die \"Merken\"-Einstellungen nicht initialisieren."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Richte Farbklassen ein"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kann sein Farbklassen-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Richte Gadcon ein"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment kann sein Helfersteuerungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Richte DPMS ein"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment kann die DPMS-Einstellungen nicht initialisieren."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Richte Energiesparmodi ein"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment kann sein Energiespar-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Hintergrundbild einstellen"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment kann sein Hintergrundbild-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Maus-einstellungen"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment kann die Maus-Einstellungen nicht initialisieren."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Richte Belegungen ein"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment kann sein Tastenbelegungs-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Richte Popups ein"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kann sein Popup-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Richte Modulablagen ein"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment kann sein Modulablagen-Subsystem nicht initialisieren."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Richte Vorschaubild-Generator ein"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kann sein Vorschaubild-Subsystem nicht initialisieren.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Richte Dateibeschaffung ein"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment kann sein Anordnungsdateisystem nicht initialisieren."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Lade Module"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2805,11 +2786,11 @@ msgstr ""
 "der<br>fehlerhaften Module zu helfen. Im Modul-<br>konfigurationsmenü "
 "sollten Sie die gewünschten<br>Module wieder auswählen können."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment stürzte kurz nach dem Start ab und wurde neugestartet"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2821,15 +2802,15 @@ msgstr ""
 "der<br>fehlerhaften Module zu helfen. Im Modul-<br>konfigurationsmenü "
 "sollten Sie die gewünschten<br>Module wieder auswählen können."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Konfiguriere Modulablagen"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Fast fertig"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2838,11 +2819,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Fehler beim Laden des Moduls"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2851,11 +2832,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Das Modul enthält nicht alle benötigten Funktionen."
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2865,12 +2846,12 @@ msgstr ""
 "Fehler beim initialisieren des Moduls %s.<br>Es wird mindestens Modul-API %i "
 "benötigt.<br>Die  Enlightenment bekannte Modul-API ist %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Möchten Sie dieses Modul abschalten?<br>"
 
@@ -2884,29 +2865,29 @@ msgstr ""
 "den <b>Präsentationsmodus</b> aktivieren und vorübergehend Bildschirmschoner "
 "und -sperre sowie Stromsparen deaktivieren?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie diese Modulablage wirklich entfernen?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Sie wollen diese Modulablage entfernen.<br><br>Sind Sie sicher?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Stoppe Verschieben/-ändern von Gegenständen"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Starte Verschieben/-ändern von Gegenständen"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Setze Modulablageninhalte"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Lösche diese Modulablage"
 
@@ -2923,11 +2904,11 @@ msgstr "Überprüfe Systemrechte"
 msgid "System Check Done"
 msgstr "Systemüberprüfung abgeschlossen"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Abmeldeprobleme"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2937,31 +2918,31 @@ msgstr ""
 "werden.<br>Möchten Sie die Abmeldung abschließen ohne diese<br>Programme "
 "zuerst zu beenden?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Jetzt abmelden"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Warten Sie länger"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Abmeldung abbrechen"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Abmeldevorgang im Gange"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Abmeldung ist im Gange.<br><hilight>Bitte warten.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment ist mit einer anderen Nachfrage beschäftigt"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2969,7 +2950,7 @@ msgstr ""
 "Melde ab.<br>Sie können keine anderen Systemaktionen ausführen<br>sobald mit "
 "der Abmeldung begonnen wurde."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2977,7 +2958,7 @@ msgstr ""
 "Schalte ab.<br>Sie können keine anderen Systemaktionen ausführen<br>sobald "
 "das Herunterfahren begonnen hat."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2985,7 +2966,7 @@ msgstr ""
 "Starte neu.<br>Sie können keine anderen Systemaktionen ausführen<br>bis der "
 "Neustart abgeschlossen ist."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2993,7 +2974,7 @@ msgstr ""
 "Schlafmodus wird vorbereitet.<br>Erst nach dem Aufwachen können<br>weitere "
 "Systemaktionen ausgeführt werden."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -3001,55 +2982,55 @@ msgstr ""
 "Das System wird in den Ruhezustand versetzt.<br>Erst nach dem "
 "Wiedereinschalten können<br>wieder Systemaktionen ausgeführt werden."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "D'oh! Hier stimmt was nicht."
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Herunterfahren fehlgeschlagen."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Neustart fehlgeschlagen."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Einschlafen fehlgeschlagen."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Versetzen in den Ruhezustand fehlgeschlagen."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Abschalten"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Schalte ab.<br><hilight>Bitte warten.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Starte neu"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Starte neu.<br><hilight>Bitte warten...</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Versetze den Computer in den Schlafmodus."
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Schlafmodus wird vorbereitet.<br><hilight>Bitte warten...</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Fahre den Computer in den Ruhezustand herunter."
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Das System wird in den Ruhezustand versetzt.<br><hilight>Bitte warten.</"
@@ -3067,11 +3048,11 @@ msgstr "Aktiviere als Thema"
 msgid "Set Toolbar Contents"
 msgstr "Konfiguriere Modulablageninhalte"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Beenden unmöglich - unsterbliche Fenster."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3081,77 +3062,77 @@ msgstr ""
 "<br>dass Enlightenment sich nicht beenden kann bis jene Fenster "
 "manuell<br>geschlossen wurden oder die Sperre entfernt wurde.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KiB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MiB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GiB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "In der Zukunft"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "In der letzten Minute"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Jahre früher"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Monate früher"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Wochen früher"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Tage früher"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Stunden früher"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minuten früher"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3171,51 +3152,51 @@ msgstr "Nach oben"
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Zu den Favoriten hinzufügen"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Ein Verzeichnis nach oben"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Genehmigungen:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Geändert:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Sie"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Geschützt"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Nur lesen"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lesen-Schreiben"
 
@@ -3231,57 +3212,57 @@ msgstr "Einfache Einstellungen"
 msgid "Show alert when battery is low"
 msgstr "Benachrichtigung bei niedrigem Akkustand"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Überprüfe alle:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f ticks"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Polling"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Alarm bei niedrigem Akkustand"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Alarm wenn Akku bei:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f Minute(n)"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Automatisch ablehnen in..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f Sekunde(n)"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Alarm"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Automatische Erkennen"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3289,12 +3270,12 @@ msgstr "Automatische Erkennen"
 msgid "Internal"
 msgstr "Intern"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3302,24 +3283,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Niedriger Akkustand"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Netzbetrieb empfohlen"
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Akkuzustand"
 
@@ -3327,20 +3308,20 @@ msgstr "Akkuzustand"
 msgid "Clock"
 msgstr "Uhr"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Einstellungskonsole"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Präsentation"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Offline"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Modi"
 
@@ -3366,7 +3347,7 @@ msgid "Restart Applications"
 msgstr "Neustartanwendungen"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Alle Anwendungen"
 
@@ -3388,12 +3369,12 @@ msgstr "IBar Andere"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menüs"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Standard Rahmenstil"
 
@@ -3401,14 +3382,14 @@ msgstr "Standard Rahmenstil"
 msgid "Window Border Selection"
 msgstr "Fensterrahmenauswahl"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Merke diesen Rahmen für zukünftiges Öffnen des Fensters"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3434,7 +3415,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3702,9 +3683,9 @@ msgid "Desktop Name"
 msgstr "Arbeitsflächenname"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Name:"
 
@@ -3770,10 +3751,10 @@ msgstr "%1.0f Minute(n)"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Persönlich"
@@ -3805,8 +3786,8 @@ msgstr "Zeige auf Bildschirmbereich #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3927,46 +3908,51 @@ msgstr "%.2f Y-Achsen Schwenkfaktor"
 msgid "Virtual Desktops"
 msgstr "Arbeitsflächen"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Dialogeinstellungen"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Deaktiviere Bestätigungsdialoge"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normale Fenster"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Standard Einstellungsdialog-Modus"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Einfacher Modus"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Erweiterter Modus"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Standard Dialogmodus"
 
@@ -4035,31 +4021,31 @@ msgstr "Wiederherstellen"
 msgid "Screen Resolution Settings"
 msgstr "Auflösungseinstellungen"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Bildschirmauflösung"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Beim Anmelden wiederherstellen"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Spiegelung"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Fehlende Funktionen"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4072,11 +4058,11 @@ msgstr ""
 "ohne diese<br>nicht ändern. Es könnte allerdings auch sein,<br>dass XRandR "
 "nicht verfügbar war als <hilight>ecore</hilight><br>kompiliert wurde."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Keine Wiederholraten gefunden"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4136,7 +4122,7 @@ msgid "Power Management"
 msgstr "Energiemanagement"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4146,78 +4132,80 @@ msgstr "<Nichts>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Bitte eine Kante auswählen,<br>oder <hilight>Schließen</hilight> klicken um "
-"abzubrechen.<br><br>Um die Verzögerung dieser Aktion zu ändern,<br> bitte "
-"den Schieber verwenden:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Kantenbelegungseinstellungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Kantenbelegungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Kante hinzufügen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Entferne Kante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Ändere Kante"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Alle entfernen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Stelle Standardbelegung wieder her"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Aktion"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Aktionsparameter"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Allgemeine Einstellungen"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Erlaube Aktivierung der Belegungen bei Vollbildfenstern"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Kantenbelegungsabfolge"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f Sekunden"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Kantenbelegungsfehler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4226,27 +4214,27 @@ msgstr ""
 "Die Belegungsabfolge die Sie wählten wird bereits von der <br><hilight>%s</"
 "hilight>-Aktion verwendet.<br>Bitte wählen Sie eine andere Kantenabfolge."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "STRG"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4544,18 +4532,17 @@ msgstr "Wirklich groß"
 msgid "%d pixels"
 msgstr "%d Pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Aktiviere benutzerdefinierte Schriftklassen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Standardvorschautext: 123: 我的天空!"
 
@@ -4563,38 +4550,50 @@ msgstr "Standardvorschautext: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Schriftklasse"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Aktiviere Schriftklasse"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Erweiterter Vorschautext.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Ersatzschriftart"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Ersatznamen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Aktiviere Ersatzobjekte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Erweiterter Vorschautext.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4608,7 +4607,7 @@ msgstr "Icon-Erscheinungsbild"
 msgid "Icon theme overrides general theme"
 msgstr "Icon-Thema überschreibt Haupt-Thema"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Icon-Thema"
 
@@ -4680,7 +4679,7 @@ msgstr ""
 "Konfiguration zu importieren."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Sprache"
 
@@ -4707,9 +4706,8 @@ msgid "%1.0f pixels"
 msgstr "%1.0f Pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-#, fuzzy
 msgid "Threshold for applying drag momentum"
-msgstr "Grenzbereich für übernehmen des Zugmoments"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 #, c-format
@@ -4855,7 +4853,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Autoscroll-Mauszeiger-Spanne"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Verschiedene Optionen"
 
@@ -5034,24 +5032,24 @@ msgstr "Zeigergröße"
 msgid "Mouse Cursor"
 msgstr "Mauszeiger"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Maus-Einstellungen"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Maushand"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Mausbeschleunigung"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Beschleunigung"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Grenzwert"
 
@@ -5068,7 +5066,7 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Erscheinungsbild"
 
@@ -5168,33 +5166,33 @@ msgstr "%1.0f Sammlungen"
 msgid "Performance"
 msgstr "Leistung"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profilauswahl"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Verfügbare Profile"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Profil auswählen"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Rücksetzen"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Sie wollen das Profil \"%s\" entfernen.<br><br>Sind Sie sicher?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Enternen OK?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Füge neues Profil hinzu"
 
@@ -5357,23 +5355,23 @@ msgstr "Start"
 msgid "Theme Selector"
 msgstr "Themenwähler"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "Importiere..."
+msgstr " Importiere..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
-msgstr "Verbunden..."
+msgstr " Verbunden..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Themenkategorien"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Zuweisen"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Alle leeren"
 
@@ -5430,38 +5428,38 @@ msgid "Wallpaper Settings"
 msgstr "Hintergrundeinstellungen"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Verwende Themenhintergrundbild"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Bild..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Farbverlauf..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Verbunden..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Verwende dieses Hintergrundbild auf..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "...allen Arbeitsflächen"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "...dieser Arbeitsfläche"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "...diesem Bildschirm"
 
@@ -5482,14 +5480,14 @@ msgid "Fill Options"
 msgstr "Füll-Optionen"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertikal"
 
@@ -5555,37 +5553,37 @@ msgstr "Verwende Originaldatei"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Wähle ein Bild aus..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Bild-Importfehler"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment konnte das Bild wegen<br>Umwandlungsfehlern nicht importieren."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Hintergrundbild-Importfehler"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5593,7 +5591,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "\"Exchange\"-Hintergrundbilder"
 
@@ -5705,14 +5703,6 @@ msgstr "Bevorzuge Benutzerspezifisches Icon"
 msgid "Prefer application provided icon"
 msgstr "Bevorzuge Anwendungsspezifisches Icon"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Interne Fenster"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Interne Fenster immer merken"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Aktivierungs Einstellungen"
@@ -5846,17 +5836,12 @@ msgid "Window Maximize Policy"
 msgstr "Fenstermaximierungsrichtlinie"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Smarte Ausdehnung"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Dehne das Fenster aus"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Belege verfügbaren Platz"
 
@@ -5864,19 +5849,19 @@ msgstr "Belege verfügbaren Platz"
 msgid "Maximize Policy"
 msgstr "Maximierungsrichtlinien"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Maximierungsrichtungen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Beides"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Erlaube Veränderungen an Fenstern"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Verschiebe/Verändere Fenster beim Ausblenden der Modulablage automatisch"
@@ -5916,49 +5901,57 @@ msgstr "Hebe beim Verschieben/Größenändern an"
 msgid "Raise when clicking to focus"
 msgstr "Hebe durch Anklicken hervor"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Fenster merken"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Entferne Erinnerung(en)"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Details"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<kein Name>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<keine Klasse>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<kein Titel>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Rolle:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<keine Rolle>"
 
@@ -6330,7 +6323,7 @@ msgid "Show Toolbar"
 msgstr "Zeige Werkzeugleiste"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Verhalten"
 
@@ -6346,95 +6339,95 @@ msgstr "Hänge Medien beim einlegen ein"
 msgid "Open filemanager on mount"
 msgstr "Öffne Dateimanager beim einhängen"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Gehe zum übergeordneten Verzeichnis"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Andere Anwendung..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Öffnen"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Öffnen mit..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Bekannte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Bestimmte Anwendungen"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Individueller Befehl"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Entferne Kante"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Neustart fehlgeschlagen."
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6442,14 +6435,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Verknüpfungsinformation"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Datei:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6461,17 +6453,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "%d Operationen"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Datei-Manager"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "EFM Operationsinformation"
 
@@ -6509,19 +6500,19 @@ msgstr "Hintergrund"
 msgid "Gadgets"
 msgstr "Helfer"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Frei"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Immer auf der Arbeitsfläche"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Nach oben durch drücken von"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Andere Helfer hinzufügen"
 
@@ -6558,7 +6549,7 @@ msgstr "Ausgewählte IBar-Quelle"
 msgid "Icon Labels"
 msgstr "Icon-Beschriftungen"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Zeige Icon-Beschriftung"
 
@@ -6619,43 +6610,43 @@ msgstr "Anwendung erstellen"
 msgid "Add Application"
 msgstr "Anwendung hinzufügen"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBox-Einstellungen"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Arbeitsflächenname"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Arbeitsflächen Titel"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Klasse anzeigen"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Iconnamen anzeigen"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Zeige Randbeschriftung an"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Zeige Fenster aller Bildschirme"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Zeige Fenster des aktuellen Bildschirms"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Zeige Fenster aller Arbeitsflächen"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Zeige Fenster der aktiven Arbeitsfläche"
 
@@ -6675,11 +6666,11 @@ msgstr "Arbeitsfläche mit Mausrad wechseln"
 msgid "Show desktop names"
 msgstr "Zeige Arbeitsflächennamen"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Popup-Einstellungen"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Zeige Popup beim Arbeitsflächenwechsel"
 
@@ -6687,69 +6678,69 @@ msgstr "Zeige Popup beim Arbeitsflächenwechsel"
 msgid "Show popup for urgent windows"
 msgstr "Zeige Popup bei wichtigen Fenstern"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Auswahl- und Verschiebeschaltfläche"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Klicken zum Aktivieren"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "\"Drag and Drop\"-Schaltfläche"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Ziehe gesamte Arbeitsfläche"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Höhe des Tastenaktions-Popup"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Widerstand bis das Fenster verschoben wird:"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Höhe des Arbeitsflächenumschalter-Popups"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Popup-Geschwindigkeit"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f Sekunden"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Einstellungen für wichtige Fenster"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Zeige Popup bei wichtigen Fenstern"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Blende bei Wichtige-Fenster-Markierungen am Bildschirm auf"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Arbeitsflächenumschalter-Taste abgreifen"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6757,11 +6748,11 @@ msgstr ""
 "Bitte betätigen Sie eine Maustaste<br>Drücken Sie <hilight>Escape</hilight> "
 "um abzubrechen<br>oder <hilight>Entfernen</hilight> zum zurücksetzen."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Achtung"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6771,29 +6762,29 @@ msgstr ""
 "sie bereits intern<br>für Kontextmenüs vergeben ist.<br>Diese Maustaste "
 "funktioniert nur im Popup."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Schaltfläche %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Zeige Arbeitsflächenumschalter-Popup"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6831,7 +6822,7 @@ msgstr "Fahrenheit"
 #: src/modules/temperature/e_mod_config.c:256
 #: src/modules/temperature/e_mod_config.c:378
 msgid "Check Interval"
-msgstr "Abfrageinterval"
+msgstr "Abfrageintervall"
 
 #: src/modules/temperature/e_mod_config.c:258
 msgid "Fast"
@@ -6917,7 +6908,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperaturanzeige"
 
@@ -6929,15 +6920,15 @@ msgstr "Weiter"
 msgid "Welcome to Enlightenment"
 msgstr "Herzlich Willkommen in Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Wählen Sie"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6987,15 +6978,15 @@ msgstr "Zum Aktivieren anklicken"
 msgid "Mouse over focuses windows"
 msgstr "Mauszeigerberührung aktiviert Fenster"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Wählen Sie hinzuzufügende Icons aus"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Schnellstart"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Wähle Anwendungen"
 
@@ -7057,7 +7048,7 @@ msgstr "Zeige beide Schieberegler wenn gesperrt"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
-msgstr "Soundkarten "
+msgstr "Soundkarten"
 
 #: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
@@ -7120,22 +7111,51 @@ msgstr "Bestimmtes Gerät"
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Es existiert ein anderer Infobereich"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Es kann nur ein Infobereich-Helfer geben und es existiert bereits ein "
 "anderer."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Infobereich"
 
-#~ msgid "idle"
-#~ msgstr "inaktiv"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Sie wollen, dass Enlightenment sich verschiedene Eigenschaften<br>eines "
+#~ "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 die<hilight>Nur auf dieses Fenster "
+#~ "zutreffend</hilight>-Option<br>wählen 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ä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."
+
+#~ msgid "Window name and class"
+#~ msgstr "Fensternamen und -klasse"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Arbeitsflächen konfigurieren"
@@ -7149,27 +7169,23 @@ msgstr "Infobereich"
 #~ msgid "Configure Shelf Contents"
 #~ msgstr "Konfiguriere Modulablageninhalte"
 
-#, fuzzy
-#~ msgid "Configure Toolbar Contents"
-#~ msgstr "Konfiguriere Modulablageninhalte"
-
 #~ msgid "Configure Dialog Title"
 #~ msgstr "Konfiguration-Dialog-Text"
 
 #~ msgid "Configure"
 #~ msgstr "Konfiguriere"
 
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "Wechsle Arbeitsfläche wenn Maus an Bildschirmkante"
+#~ msgid "Configure Heading"
+#~ msgstr "Ãœberschrift konfigurieren"
 
-#~ msgid "Flip when moving mouse to the screen edge"
-#~ msgstr "Wechsle bei Bewegung der Maus an Bildschirmkante"
+#~ msgid "Internal Windows"
+#~ msgstr "Interne Fenster"
 
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "Zeit der Maus an der Kante bis zum Wechsel:"
+#~ msgid "Expand the window"
+#~ msgstr "Dehne das Fenster aus"
 
-#~ msgid "Configure Heading"
-#~ msgstr "Ãœberschrift konfigurieren"
+#~ msgid "Allow window manipulation"
+#~ msgstr "Erlaube Veränderungen an Fenstern"
 
 #~ msgid "Custom Grid Icons"
 #~ msgstr "Benuzerdefinierte Raster-Icons"
@@ -7177,6 +7193,15 @@ msgstr "Infobereich"
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Benutzerdefinierte geschickt plazierte Raster-Icons"
 
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Wechsle Arbeitsfläche wenn Maus an Bildschirmkante"
+
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr "Wechsle bei Bewegung der Maus an Bildschirmkante"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Zeit der Maus an der Kante bis zum Wechsel:"
+
 #~ msgid "Advanced Settings"
 #~ msgstr "Erweiterte Einstellungen"
 
@@ -7236,10 +7261,6 @@ msgstr "Infobereich"
 #~ msgid "Exit Immediately"
 #~ msgstr "Sofort beenden"
 
-#, fuzzy
-#~ msgid "Shut Down Immediately"
-#~ msgstr "Sofort beenden"
-
 #~ msgid "Shut Down"
 #~ msgstr "Herunterfahren"
 
@@ -7264,10 +7285,6 @@ msgstr "Infobereich"
 #~ msgid "Configuration"
 #~ msgstr "Konfiguration"
 
-#, fuzzy
-#~ msgid "Toolbar Configuration"
-#~ msgstr "IBar-Konfiguration"
-
 #~ msgid "Shelf Configuration"
 #~ msgstr "Modulablagenkonfiguration"
 
@@ -7316,14 +7333,6 @@ msgstr "Infobereich"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Temperatureinstellungen"
 
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Konfiguration"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Modulablagenkonfiguration"
-
 #~ msgid "Back"
 #~ msgstr "Zurück"
 
@@ -8024,7 +8033,7 @@ msgstr "Infobereich"
 #~ msgstr "Britisches Territorium im Indischen Ozean"
 
 #~ msgid "Brunei Darussalam"
-#~ msgstr "Brunei "
+#~ msgstr "Brunei"
 
 #~ msgid "Bulgaria"
 #~ msgstr "Bulgarien"
@@ -8906,3 +8915,6 @@ msgstr "Infobereich"
 
 #~ msgid "Module State"
 #~ msgstr "Modul-Status"
+
+#~ msgid "idle"
+#~ msgstr "inaktiv"
diff --git a/po/el.gmo b/po/el.gmo
index d3d2314..652bc1c 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index f02ed79..b483bb6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,40 +11,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-05-02 15:43+0200\n"
-"Last-Translator: Giorgos Koutsikos <ragecryx at yahoo.gr>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-08-02 17:50+0200\n"
+"Last-Translator: George Koutsikos <ragecryx at yahoo.gr>\n"
 "Language-Team: Ελληνικά\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-Country: GREECE\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Σχετικά με το Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
+#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -82,71 +85,71 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Είστε σίγουροι ότι θέλετε να σκοτώσετε αυτό το παράθυρο?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ναι"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Όχι"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Αιτήθηκε έξοδος από το Enlightenment.<br><br>Επιθυμείτε σίγουρα την έξοδο?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Επιθυμείτε σίγουρα να αποσυνδεθείτε?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Πρόκειται να αποσυνδεθείτε.<br><br>Είστε σίγουροι για αυτό?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Επιθυμείτε σίγουρα το κλείσιμο του συστήματος?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Αιτήθηκε κλείσιμο Η/Υ.<br><br>Είστε σίγουροι για το κλείσιμο?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Είστε σίγουροι ότι θέλετε να κάνετε επανεκκίνηση?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "Αιτήθηκε επανεκκίνηση Η/Υ.<br><br>Είστε σίγουροι για την επανεκκίνηση?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Αιτήθηκε αναστολή Η/Υ.<br><br>Είστε σίγουροι για την αναστολή?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Είστε σίγουροι οτι θέλετε να κάνετε αδρανοποίηση;"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -154,497 +157,494 @@ msgstr ""
 "Ζητήσατε να αδρανοποίησετε τον Υπολογιστή.<br><br>Είστε σίγουροι οτι θέλετε "
 "να αναστείλετε τις εργασίες στον δίσκο;"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Παράθυρο : Ενέργειες"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Μετακίνηση"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Αλλαγή μεγέθους"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Μενού"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Μενού παραθύρου"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Ανύψωση"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Βύθιση"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Σκότωμα"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Παράθυρο : Κατάσταση"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Εναλλαγή σε κολλημένη λειτουργία"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Εναλλαγή σε εικονιδιοποιημένη λειτουργία"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Εναλλαγή σε λειτουργία πλήρους οθόνης"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Μεγιστοποίηση"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Μεγιστοποίηση κάθετα"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Μεγιστοποίηση οριζόντια"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Μεγιστοποίηση σε πλήρη οθόνη"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Κατάσταση μεγιστοποίησης \"έξυπνη\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Κατάσταση μεγιστοποίησης \"επέκταση\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Κατάσταση μεγιστοποίησης \"γέμισμα\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Εναλλαγή σε Κατάσταση χωρίς περίγραμμα"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Εναλλαγή σε κατάσταση ακινητοποίησης"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Γύρισμα επιφάνειας εργασίας αριστερά"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Γύρισμα επιφάνειας εργασίας δεξιά"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Γύρισμα επιφάνειας εργασίας επάνω"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Γύρισμα επιφάνειας εργασίας κάτω"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Γύρισμα επιφάνειας εργασίας κατά..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Εμφάνιση επιφάνειας εργασίας"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Εμφάνισε το ράφι"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Γύρισμα επιφάνειας εργασίας σε..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Εναλλαγή στην επιφάνεια εργασίας 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Εναλλαγή στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας αριστερά (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας δεξιά(Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας επάνω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας κάτω (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας κατά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας σε... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Γύρισμα επιφάνειας εργασίας γραμμικά... (Σε όλες τις οθόνες)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Εναλλαγή επιφάνειας εργασίας σε κατεύθυνση..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 0 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 1 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 2 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 3 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 4 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 5 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 6 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 7 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 8 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 9 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 10 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας 11 (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Αλλαγή στην επιφάνεια εργασίας... (Όλες οθόνες)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Αποστολή ποντικιού στη οθόνη 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Αποστολή ποντικιού στη οθόνη 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Αποστολή ποντικιού στη οθόνη..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Προώθηση ποντικιού κατά 1 οθόνη μπροστά"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Προώθηση ποντικιού κατά 1 οθόνη πίσω"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Προώθηση ποντικιού κατά ... οθόνες"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Παράθυρο : Μετακίνηση"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Στην επόμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Στην προηγούμενη επιφάνεια εργασίας"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Κατά επιφάνεια εργασίας #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Στην επιφάνεια εργασίας..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Εμφάνιση κεντρικού μενού"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Εμφάνιση μενού αγαπημένων"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Εμφάνιση μενού όλων των εφαρμογών"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Εμφάνιση μενού πελατών"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Εμφάνιση μενού..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Εκτέλεση"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Εντολή"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Εφαρμογή"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Έξοδος"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Έξοδος τώρα"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s άρθρωμα"
+msgstr "Enlightenment : Λειτουργία"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Εναλλαγή σε λειτουργία πλήρους οθόνης"
+msgstr "Εναλλαγή σε λειτουργία παρουσίασης"
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Εναλλαγή σε κολλημένη λειτουργία"
+msgstr "Εναλλαγή σε λειτουργία εκτός σύνδεσης"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Σύστημα"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Κλείσιμο τώρα"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Αναστολή"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Αδρανοποίηση"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Κλείδωμα"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Καθαρισμός παραθύρων"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Γενικά : Ενέργειες"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Καθυστερημένη ενέργεια"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Ορισμός ως ταπετσαρία"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Σάρωση αρχείων επιφάνειας εργασίας ολοκληρώθηκε"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Σάρωση αρχείων επιφάνειας εργασίας"
 
@@ -652,41 +652,40 @@ msgstr "Σάρωση αρχείων επιφάνειας εργασίας"
 msgid "Color Selector"
 msgstr "Επιλογή χρώματος"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Εντάξει"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -697,7 +696,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -706,11 +705,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Ρυθμίσεις αναβαθμίστηκαν"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -722,7 +721,7 @@ msgstr ""
 "<br><br>Το αρχείο που παρουσιάστηκε το σφάλμα ήταν:<br>%s<br><br>Αυτό το "
 "αρχείο διαγράφηκε για να αποφευχθούν φθαρμένα δεδομένα. <br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -732,7 +731,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -741,7 +740,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -750,7 +749,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -758,11 +757,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Προβλήματα εγγραφής ρυθμίσεων του Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -770,12 +769,12 @@ msgstr "Προβλήματα εγγραφής ρυθμίσεων του Enlighte
 msgid "Advanced"
 msgstr "Προχωρημένα"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Βασικά"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -783,7 +782,7 @@ msgstr "Εφαρμογή"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Αρθρώματα"
 
@@ -792,27 +791,27 @@ msgstr "Αρθρώματα"
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Υποδοχέας %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Σφάλμα - δεν υπάρχει PAM υποστήριξη"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Δεν έχει υλοποιηθεί υποστήριξη PAM στο Enlightenment, έτσι<br>το κλείδωμα "
 "του desk είναι απενεργοποιημένο."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Κλείδωμα απέτυχε"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -821,15 +820,15 @@ msgstr ""
 "είτε το πληκτρολόγιο είτε το ποντίκι ή και τα δύο<br>και η αρπαγή δεν είναι "
 "δυνατόν να σπάσει."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Παρακαλώ εισάγετε τον κωδικό ξεκλειδώματος"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Σφάλμα συστήματος ταυτοποίησης"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -840,24 +839,25 @@ msgstr ""
 "περίοδο. Ο κωδικός σφάλματος ήταν  <hilight>%i</hilight>.<br>Αυτό είναι "
 "άσχημο και δεν θα έπρεπε να συμβαίνει. Παρακαλώ αναφέρετε αυτό το σφάλμα."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Ενεργοποίηση λειτουργίας παρουσίασης?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
+#, fuzzy
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Όχι, αλλά αύξησε το χρόνο λήξης"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Όχι, και σταμάτα να ρωτάς"
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
@@ -876,7 +876,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Επεξεργαστής καταχωρήσεων επιφάνειας εργασίας"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -921,7 +921,7 @@ msgstr "Κατηγορίες"
 msgid "Mime Types"
 msgstr "Τύποι mime"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -953,23 +953,23 @@ msgstr "Επιλογή εικονιδίου"
 msgid "Select an Executable"
 msgstr "Επιλογή ενός εκτελέσιμου"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Επικόλληση"
 
@@ -977,13 +977,13 @@ msgstr "Επικόλληση"
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Σφάλμα εκτέλεσης"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -991,11 +991,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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Σφάλμα εκκίνησης εφαρμογής"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1004,313 +1004,307 @@ msgstr ""
 "Το Enlightenment δεν κατάφερε να τρέξει την εφαρμογή:<br><br>%s<br><br>Η "
 "εφαρμογή απέτυχε να ξεκινήσει."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Σφάλμα εκτέλεσης εφαρμογής"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Η εκτέλεση του %s διακόπηκε απρόοπτα."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Ένας κωδικός εξόδου απο %i επιστράφηκε απο %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s διακόπηκε από ένα σήμα διακοπής."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s διακόπηκε από ένα σήμα εξόδου."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s διακόπηκε από ένα σήμα ματαίωσης."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s διακόπηκε από ένα σήμα τερματισμού."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s διακόπηκε απο το σήμα με αριθμό %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Καταγραφές σφαλμάτων"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Δεν υπήρξε μήνυμα σφάλματος."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Αποθήκευση αυτού του μηνύματος"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Αυτή η καταγραφή σφάλματος θα αποθηκευτεί ως %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Πληροφορίες σφάλματος"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Πληροφορίες σήματος σφάλματος"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Δεδομένα εξόδου"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Δεν υπήρξε έξοδος."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Ανύπαρκτη διαδρομή"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s δεν υπάρχει."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Σφάλμα προσάρτησης"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Αδυναμία σύνδεσης συσκευής"
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Σφάλμα προσάρτησης"
+msgstr "Σφάλμα αποπροσάρτησης"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Αδυναμία αποπροσάρτησης συσκευής"
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Σφάλμα"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Αρχεία"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Σύνδεσμος"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Ακύρωση"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Κληρονόμησε τις ρυθμίσεις γονέα"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Λειτουργία προβολής"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Ανανέωση προβολής"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Εμφάνιση κρυφών αρχείων"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Απομνημόνευση σειράς"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Ταξινόμηση τώρα"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Νέος κατάλογος"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "Αποπροσάρτηση"
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Σίγαση"
+msgstr "Προσάρτηση"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Χρήση προκαθορισμένων"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Εικονίδια πλέγματος"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Προσαρμοσμένα εικονίδια"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Λίστα"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Μέγεθος εικονιδίου (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Ορισμός ως ταπετσαρία"
+msgstr "Ορισμός ταπετσαρίας..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Όρισε περιεχόμενο..."
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Δημιουργία νέου καταλόγου"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Όνομα νέου καταλόγου:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Μετονομασία %s σε:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Μετονομασία αρχείου"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Προσπάθεια ξανά"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Όχι σε ολα"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Ναί σε όλα"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr ""
+msgstr "Το αρχείο υπάρχει ήδη, αντικατάσταση?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Παράβλεψη αυτού"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Παράβλεψη όλων"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Ένα σφάλμα προέκυψε κατα την εκτέλεση μιας λειτουργίας.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Επιβεβαίωση διαγραφής"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1323,144 +1317,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Ιδιότητες αρχείου"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Αρχείο:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Μέγεθος:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Τελευταία τΤροποποίηση:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Τύπος αρχείου:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Ιδιοκτήτης:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Ανάγνωση από άλλους"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Εγγραφή από άλλους"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Ανάγνωση από ιδιοκτήτη"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Εγγραφή από ιδιοκτήτη"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Προεπισκόπηση"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Εικόνα επισκόπησης"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Χρησιμοποίησε αυτό το εικονίδιο για αυτό τον τύπο αρχείων"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Πληροφορίες συνδέσμου"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Επιλογή εικόνας"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "'Άγνωστος όγκος"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Αφαιρούμενη συσκευή"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Αφαίρεση αυτού του συστατικού"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Απλό"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Ένθεμα"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Εμφάνιση"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Αυτόματη κύλιση περιεχομένων"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Δυνατότητα αλλαγής μεγέθους"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Αφαίρεση αυτού του συστατικού"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αυτού του Συστατικού"
 
@@ -1472,7 +1471,7 @@ msgstr ""
 "Ένα προηγούμενο στιγμιότυπο του Enlightenment είναι ακόμη ενεργό\n"
 "σε αυτή την οθόνη. Αναβολή εκκίνησης.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Κλειδώματα παραθύρου"
 
@@ -1508,21 +1507,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Στοίβαγμα"
 
@@ -1531,12 +1530,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Σκιασμένη κατάσταση"
 
@@ -1545,7 +1544,7 @@ msgid "Maximized state"
 msgstr "Μεγιστοποιημένη κατάσταση"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Κατάσταση πλήρους οθόνης"
 
@@ -1553,7 +1552,7 @@ msgstr "Κατάσταση πλήρους οθόνης"
 msgid "Lock me from changing:"
 msgstr "Κλείδωσε με από το να αλλάξω:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Στυλ περιγράμματος"
 
@@ -1601,115 +1600,116 @@ msgstr "Ξεκαρφίτσωμα από την επιφάνεια εργασία
 msgid "More..."
 msgstr "Περισσότερα..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Εικονιδιοποίηση"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Μεγιστοποίηση κάθετα"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Μεγιστοποίηση οριζόντια"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Απο-μεγιστοποίηση"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Συντόμευση πληκτρολογίου"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Στο μενού αγαπημένων"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Στον εκκινητή"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Περίγραμμα"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Παράλειψη"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Κατάσταση"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Ενθύμηση"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Ιδιότητες παραθύρου"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Πάντα στην κορυφή"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Πάντα από κάτω"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Επιλογή στυλ περιγράμματος"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Χρήση προκαθορισμένης ρύθμισης εικονιδίου του E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Χρήση εικονιδίου παρεχόμενου από την Εφαρμογή "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Χρήση εικονιδίου καθορισμένου από το χρήστη"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Σκιασμένο"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Πλήρης οθόνη"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Λίστα παραθύρων"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Διαχειριστής επιφανειών"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Γραμμή εργασιών"
 
@@ -1725,7 +1725,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Ιδιότητες ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -1817,11 +1817,11 @@ msgstr "Ιδιότητες NetWM"
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Παράλειψη γραμμής εργασιών"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Παράλειψη πίνακα σελίδων"
 
@@ -1829,15 +1829,15 @@ msgstr "Παράλειψη πίνακα σελίδων"
 msgid "Hidden"
 msgstr "Κρυφό"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Ενθύμηση παραθύρου"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1851,11 +1851,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1863,102 +1863,105 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Τίποτα"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Μέγεθος και θέση"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Κλειδώματα"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Μέγεθος, θέση και κλειδώματα"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Τα πάντα"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Ενθύμηση χρήσης"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Όνομα και κλάση παραθύρου"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Διαχειριστής παραθύρων"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Κατηγορία παραθύρου"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Ρόλος παραθύρου"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Τύπος παραθύρου"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Ρυθμίσεις για απομνημόνευση"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Ρύθμιση εικονιδίου"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Εικονική επιφάνεια εργασίας"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Τρέχουσα οθόνη"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Παράκαμψη λίστας παραθύρων (%w)"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Σφάλμα εκκίνησης εφαρμογής"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Εκκίνηση αυτού του προγράμματος κατά την σύνδεση"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Αλλαγή ρυθμίσεων εικονιδίου"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Εκκίνηση αυτού του προγράμματος κατά την σύνδεση"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Ρυθμίσεις"
@@ -1977,24 +1980,24 @@ msgstr "Ράφι"
 msgid "Module Settings"
 msgstr "Ρυθμίσεις αρθρώματος"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Διαθέσιμα αρθρώματα"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Φόρτωση αρθρώματος"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Φορτωμένα αρθρώματα"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Αποφόρτωση αρθρώματος"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2028,8 +2031,8 @@ msgstr "Αφαίρεση συστατικού"
 msgid "Toolbar Settings"
 msgstr "Ρυθμίσεις γραμμής εργαλείων"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Διάταξη"
 
@@ -2053,12 +2056,12 @@ msgid "Favorite Applications"
 msgstr "Αγαπημένες εφαρμογές"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Εφαρμογές"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2067,7 +2070,7 @@ msgstr "Εφαρμογές"
 msgid "Windows"
 msgstr "Παράθυρα"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Χαμένα παράθυρα"
 
@@ -2103,129 +2106,128 @@ msgstr "(Χωρίς εφαρμογές)"
 msgid "Set Virtual Desktops"
 msgstr "Όρισε εικονικές επιφάνειες εργασίας"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Χωρίς παράθυρα)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Χωρίς όνομα!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Χωρίς ράφια)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Ράφι #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Προσθήκη ραφιού"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Διαγραφή ραφιού"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Ρυθμίσεις ραφιού"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Πολύ μικρό"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Μικρό"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Πολύ μεγάλο"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Όρισε περιεχόμενο..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Πάνω από όλα"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Κάτω από τα παράθυρα"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Κάτω από τα πάντα"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Επέτρεψε στα παράθυρα να καλύπτουν το ράφι"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Συρρίκνωση στο μέγεθος περιεχομένου"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Στυλ"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Αυτόματη απόκρυψη"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Αυτόματη απόκρυψη του ραφιού"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Εμφάνιση με το κλικ του ποντικιού"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Χρονικό όριο απόκρυψης"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f δευτερόλεπτα"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Διάρκεια απόκρυψης"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Εμφάνιση σε όλες τις επιφάνειες εργασίας"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Εμφάνιση σε επιλεγμένες επιφάνειες εργασίας"
 
@@ -2415,7 +2417,7 @@ msgstr "Έναρξη πολυεθνικής υποστήριξης"
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2423,17 +2425,17 @@ msgstr ""
 "Το Enlightenment δεν μπορεί να ρυθμίσει την init οθόνη.\n"
 "Πιθανόν να μην έχετε αρκετή μνήμη;"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Δοκιμή υποστήριξης τύπων αρχείων"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2442,7 +2444,7 @@ msgstr ""
 "Ελέγξτε αν το Evas έχει\n"
 "υποστήριξη για φόρτωση PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2451,7 +2453,7 @@ msgstr ""
 "Ελέγξτε αν το Evas έχει\n"
 "υποστήριξη για φόρτωση JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2460,212 +2462,212 @@ msgstr ""
 "Ελέγξτε αν το Evas έχει\n"
 "υποστήριξη για φόρτωση EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Ρύθμιση οθονών"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Ρύθμιση προφύλαξης οθόνης"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίση την προφύλαξη οθόνης για τον X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Ρύθμιση κλειδώματος οθόνης"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Ρύθμιση χειρισμών συστήματος"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Ρύθμιση ενεργειών"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει το σύστημα δράσεων του."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Ρύθμιση συστήματος εκτέλεσης"
 
-#: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
-msgstr ""
-
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Ρύθμιση ενθυμήσεων"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Ρύθμιση FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Ρύθμιση συστήματος μηνυμάτων"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Εγκατέστησε το DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Το Enlightenment δεν μπορεί να εγκαταστήσι το dnd σύστημά του."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Ρύθμιση αρθρωμάτων"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Ρύθμιση ενθυμήσεων"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Ρύθμιση κλάσεων χρωμάτων"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Ρύθμιση Gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Ρύθμιση DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Το Enlightenment δεν μπορεί να ρυθμίσει τις DPMS ρυθμίσεις."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Ρύθμιση λειτουργιών εξοικονόμησης ενέργειας"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Ρύθμιση ταπετσαρίας"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Το Enlightenment δεν μπορεί να εγκαταστήσει στο σύστημα φόντου επιφάνειας "
 "εργασίας."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Ρύθμιση ποντικιού"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 "Το Enlightenment δεν μπορεί να διαμορφώσει τις ρυθμίσεις για το ποντίκι."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Ρύθμιση συνδυασμών"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Ρύθμιση άμεσων ειδοποιήσεων"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 "Το Enlightenment δεν μπορεί να εγκαταστήσει το σύστημα ειδοποιήσεων του."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Ρύθμιση ραφιών"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Ρύθμιση του δημιουργού επισκοπήσεων"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Ρύθμιση ταξινόμησης αρχείων"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Φόρτωση αρθρωμάτων"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2673,11 +2675,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2685,15 +2687,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Ρύθμιση ραφιών"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Σχεδόν ολοκληρώθηκε"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2702,22 +2704,22 @@ msgstr ""
 "Υπήρξε σφάλμα κατα τη φόρτωση του αρθρώματος με όνομα: %s<br>Κανένα άρθρωμα "
 "με όνομα %s δεν βρέθηκε<br>στους καταλόγους αρθρωμάτων.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Σφάλμα φόρτωσης αρθρώματος"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, 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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Το άρθρωμα δεν περιέχει όλες τις απαραίτητες λειτουργίες"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2725,12 +2727,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s άρθρωμα"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Θέλετε να αποφορτώσετε αυτό το άρθρωμα?<br>"
 
@@ -2741,11 +2743,11 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Επιθυμείτε σίγουρα την διαγραφή αυτού του ραφιού?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2753,19 +2755,19 @@ msgstr ""
 "Αιτήθηκε διαγραφή αυτού του ραφιού.<br><br>Είστε σίγουροι για τη διαγραφή "
 "του?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Τέλος μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Έναρξη μετακίνησης/αλλαγής μεγέθους αντικειμένων"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Αλλαγή περιεχομένων ραφιού"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Διέγραψε το ράφι"
 
@@ -2782,11 +2784,11 @@ msgstr "Έλεγχος δικαιωμάτων συστήματος"
 msgid "System Check Done"
 msgstr "Έλεγχος συστήματος ολοκληρώθηκε"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Προβλήματα αποσύνδεσης"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2796,109 +2798,109 @@ msgstr ""
 "<br>Θέλετε να ολοκληρώσετε την αποσύνδεση<br>χωρίς τον τερματισμό "
 "αυτών<br>των εφαρμογών?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Αποσύνδεση τώρα"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Περίμενε περισσότερο"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Ακύρωση αποσύνδεσης"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Αποσύνδεση σε εξέλιξη"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Το Enlightenment είναι απασχολημένο με ένα άλλο αίτημα"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "ΕΕΚ! Αυτό δεν θα έπρεπε να συμβαίνει"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Κλείσιμο"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Επανεκκινεί"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Αναστολή"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Αδρανοποιείται"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2914,88 +2916,88 @@ msgstr "Ορισμός ως Θέμα"
 msgid "Set Toolbar Contents"
 msgstr "Ορισμός περιεχομένων"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Αδύνατη η εξοδος - αθάνατα παράθυρα."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Στο μέλλον"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Στο τελευταίο λεπτό"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Χρόνια πριν"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Μήνες πριν"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Εβδομάδες πριν"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Ημέρες πριν"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Ώρες πριν"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Λεπτά πριν"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3015,51 +3017,51 @@ msgstr "Πάνω"
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Προσθήκη στα αγαπημένα"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Μετάβαση ένα κατάλογο πάνω"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Δικαιώματα:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Τροποποίηση:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Εσύ"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Προστατευμένο"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Μόνο για ανάγνωση"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Απαγόρευση"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Ανάγνωση-εγγραφή"
 
@@ -3075,57 +3077,57 @@ msgstr "Βασικές ρυθμίσεις"
 msgid "Show alert when battery is low"
 msgstr "Εμφάνιση προειδοποίησης όταν η μπαταρία τελειώνει"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Έλεγχος κάθε:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tick"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Εμφάνιση ειδοποίησης όταν η μπαταρία τελειώνει"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f λεπτά"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f δευτ."
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Ειδοποίηση"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Αυτόματη αναγνώριση"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3133,12 +3135,12 @@ msgstr "Αυτόματη αναγνώριση"
 msgid "Internal"
 msgstr "Εσωτερικό"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Υλικό"
 
@@ -3146,24 +3148,24 @@ msgstr "Υλικό"
 msgid "Battery"
 msgstr "Μπαταρία"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Χαμηλή στάθμη μπαταριάς!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Προτείνεται πηγή εναλλασσόμενου ρεύματος."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ΣΦΑΛΜΑ"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Μετρητής μπαταρίας"
 
@@ -3171,25 +3173,22 @@ msgstr "Μετρητής μπαταρίας"
 msgid "Clock"
 msgstr "Ρολόι"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Πάνελ ρυθμίσεων"
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Επανεκκινεί"
+msgstr "Παρουσίαση"
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Χρόνος απενεργοποίησης"
+msgstr "Εκτός σύνδεσης"
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Αρθρώματα"
+msgstr "Λειτουργίες"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3213,7 +3212,7 @@ msgid "Restart Applications"
 msgstr "Επανεκκίνηση εφαρμογών"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Όλες οι εφαρμογές"
 
@@ -3235,12 +3234,12 @@ msgstr "IBar άλλο"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Μενού"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Προκαθορισμένο στυλ περιγράμματος"
 
@@ -3248,14 +3247,14 @@ msgstr "Προκαθορισμένο στυλ περιγράμματος"
 msgid "Window Border Selection"
 msgstr "Επιλογή περιθωρίων παραθύρου"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3281,7 +3280,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3549,9 +3548,9 @@ msgid "Desktop Name"
 msgstr "Όνομα επιφάνειας εργασίας"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -3585,9 +3584,8 @@ msgid "Lock when X screensaver activates"
 msgstr "Κλέιδωμα όταν το X Screensaver ενεργοποιείται"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "Χρόνος μέχρι την εναλλαγή προφύλαξης οθόνης X"
+msgstr "Χρόνος μέχρι την ενεργοποίηση της προφύλαξης οθόνης"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3618,10 +3616,10 @@ msgstr "%1.0f λεπτά"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Προσωπικά αρχεία"
@@ -3653,8 +3651,8 @@ msgstr "Εμφάνιση στην ζώνη οθόνης #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3674,9 +3672,8 @@ msgid "Theme Wallpaper"
 msgstr "Ταπετσαρία θέματος"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Χρήση της ταπετσαρίας θέματος"
+msgstr "Tαπετσαρία χρήστη"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3759,9 +3756,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Αλλαγή ταπετσαρίας"
+msgstr "Αλλαγή ταπετσαρία"
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -3777,46 +3773,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Εικονικές επιφάνειες εργασίας"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Ρυθμίσεις διαλόγων"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Γενικές ρυθμίσεις"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Απενεργοποίηση διαλόγων επιβεβαίωσης"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Κανονικά παράθυρα"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Βασική λειτουργία"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Προχωρημένη λειτουργία"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Προκαθορισμένη λειτουργία διαλόγου"
 
@@ -3872,31 +3873,31 @@ msgstr "Ανάκτηση"
 msgid "Screen Resolution Settings"
 msgstr "Ρυθμίσεις ανάλυσης οθόνης"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Επαναφορά στη σύνδεση"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Περιστροφή"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Καθρέφτισμα"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Ελλειπή χαρακτηριστικά"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3905,11 +3906,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Δεν βρέθηκαν ρυθμοί ανανέωσης"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3964,7 +3965,7 @@ msgid "Power Management"
 msgstr "Διαχείριση ενέργειας"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3974,102 +3975,107 @@ msgstr "<Κανένα>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Προσθήκη αιχμής"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Διαγραφή αιχμής"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Τροποποίηση αιχμής"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Διαγραφή όλων"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Επαναφορά προκαθορισμένων συνδυασμών"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Παράμετροι ενέργειας"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Γενικές επιλογές"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f δευτερόλεπτα"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4229,7 +4235,7 @@ msgstr "Πυρήνας"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
-msgstr ""
+msgstr "Μπάρα Τίτλου"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
@@ -4364,18 +4370,17 @@ msgstr "Πολύ μεγάλο"
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ενεργοποίηση προσαρμοσμένων κλάσεων γραμματοσειρών"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Βασικό κείμενο προεπισκόπησης: 123: 我的天空!"
 
@@ -4383,38 +4388,53 @@ msgstr "Βασικό κείμενο προεπισκόπησης: 123: 我的天
 msgid "Font Classes"
 msgstr "Κλάσεις γραμματοσειρών"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Ενεργοποίηση κλάσης γραμματοσειράς"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Γραμματοσειρές"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Στυλ"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Προχωρημένο κείμενο προεπισκόπησης.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Συμβούλευση"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Αυτόματα"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Αναπλήρωση γραμματοσειρών"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Όνομα αναπλήρωσης"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Ενεργοποίηση αναπληρώσεων"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Προχωρημένο κείμενο προεπισκόπησης.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "Αναπλήρωση γραμματοσειρών"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4428,7 +4448,7 @@ msgstr "Θέματα εικονιδίων"
 msgid "Icon theme overrides general theme"
 msgstr "Υπερκάλυψη των εικονιδίων του θέματος"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Θέμα εικονιδίων"
 
@@ -4498,7 +4518,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Γλώσσα"
 
@@ -4670,7 +4690,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Περιθώριο κύλισης δείκτη"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Διάφορες επιλογές"
 
@@ -4846,24 +4866,24 @@ msgstr "Μέγεθος δείκτη"
 msgid "Mouse Cursor"
 msgstr "Δείκτης ποντικιού"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Ρυθμίσεις ποντικιού"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Πρωτεύον πλήκτρο ποντικιού"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Επιτάχυνση ποντικιού"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Επιτάχυνση"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4880,7 +4900,7 @@ msgid "Images"
 msgstr "Εικόνες"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Θέματα"
 
@@ -4980,33 +5000,33 @@ msgstr "%1.0f συλλογές"
 msgid "Performance"
 msgstr "Επιδόσεις"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Επιλογέας προφίλ"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Διαθέσιμα προφίλ"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Επιλογή ενός προφίλ"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Επανεκκίνηση"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Θέλετε να διαγράψετε το \"%s\" προφίλ.<br><br>Είστε σίγουροι?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Διαγραφή εντάξει?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Προσθήκη νέου προφίλ"
 
@@ -5171,23 +5191,23 @@ msgstr "Εκκίνηση"
 msgid "Theme Selector"
 msgstr "Επιλογέας θέματος"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Εισαγωγή..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Κατηγορίες θεμάτων"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Ορισμός"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Καθαρισμός όλων"
 
@@ -5243,38 +5263,38 @@ msgid "Wallpaper Settings"
 msgstr "Ρυθμίσεις ταπετσαρίας"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Χρήση της ταπετσαρίας θέματος"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Εικόνα..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Διαβάθμιση..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Online..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Που να τοποθετηθεί η ταπετσαρία"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Σε όλες τις επιφάνειες εργασίας"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Σε αυτή την επιφάνεια εργασίας"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Σε αυτή την οθόνη"
 
@@ -5295,14 +5315,14 @@ msgid "Fill Options"
 msgstr "Επιλογές γεμίσματος"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Οριζόντια"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Κάθετα"
 
@@ -5368,38 +5388,38 @@ msgstr "Χρήση αυθεντικού αρχείου"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Επιλογή μιας εικόνας"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Σφάλμα εισαγωγής εικόνας"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Το Enlightenment δεν μπόρεσε να εισάγει την εικόνα<br>λόγω σφαλμάτων "
 "μετατροπής."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Σφάλμα εισαγωγής ταπετσαρίας"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5407,7 +5427,7 @@ msgstr ""
 "Το Enlightenment δεν μπόρεσε να εισάγει την ταπετσαρία.<br><br>Είστε "
 "σίγουρος ότι είναι μια έγκυρη ταπετσαρία?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Ανταλλαγή φόντων"
 
@@ -5519,14 +5539,6 @@ msgstr "Προτίμησε εικονίδιο καθορισμένο από το
 msgid "Prefer application provided icon"
 msgstr "Προτίμησε το εικονίδιο που παρέχει η εφαρμογή"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Εσωτερικά παράθυρα"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Ενθύμιση εσωτερικών παραθύρων πάντα"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Ρυθμίσεις εστίασης"
@@ -5590,11 +5602,12 @@ msgstr ""
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
-msgstr ""
+msgstr "Ένα κλικ στο παράθυρο πάντα το ανυψώνει"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:210
+#, fuzzy
 msgid "A click in a window always focuses it"
-msgstr ""
+msgstr "Ένα κλικ στο παράθυρο πάντα το"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
@@ -5628,7 +5641,7 @@ msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
 msgid "Resistance between windows:"
-msgstr ""
+msgstr "Αντίσταση μεταξύ παραθύρων:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
 msgid "Resistance at the edge of the screen:"
@@ -5660,17 +5673,12 @@ msgid "Window Maximize Policy"
 msgstr "Πολιτική μεγιστοποίησης παραθύρου"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Έξυπνη επέκταση"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Επέκτεινε το παράθυρο"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Γέμισμα διαθέσιμου χώρου"
 
@@ -5678,19 +5686,19 @@ msgstr "Γέμισμα διαθέσιμου χώρου"
 msgid "Maximize Policy"
 msgstr "Πολιτική μεγιστοποίησης"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Κατευθύνσεις μεγιστοποίησης"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Και τα δύο"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Επέτρεψε μεταχείρηση του παραθύρου"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5719,59 +5727,69 @@ msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
 msgid "Raise Window"
-msgstr ""
+msgstr "Ανύψωση παραθύρου"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
 msgid "Raise when starting to move or resize"
-msgstr ""
+msgstr "Ανύψωση όταν μετακινείται ή αλλάζει μέγεθος"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Ενθυμίσεις παραθύρων"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Ενθύμιση εσωτερικών παραθύρων πάντα"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "Ενθύμιση εσωτερικών παραθύρων πάντα"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Διαγραφή ενθύμησης/σεων"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Χωρίς Όνομα>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Κλάση:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Χωρίς Κλάση>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Χωρίς Τίτλο>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Ρόλος:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Χωρίς Ρόλο>"
 
@@ -5784,25 +5802,27 @@ msgid "Show iconified windows"
 msgstr "Εμφάνιση εικονιδιοποιημένων παραθύρων"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:147
+#, fuzzy
 msgid "Show iconified windows from other desks"
-msgstr ""
+msgstr "Εμφάνιση εικονιδιοποιημένων παραθύρων από άλλες επιφάνειες εργασίας"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:151
 msgid "Show iconified windows from other screens"
-msgstr ""
+msgstr "Εμφάνιση εικονιδιοποιημένων παραθύρων από άλλες οθόνες"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:157
 msgid "Show windows from other desks"
-msgstr ""
+msgstr "Εμφάνιση παραθύρων από άλλες επιφάνειες εργασίας"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:159
 msgid "Show windows from other screens"
-msgstr ""
+msgstr "Εμφάνιση παραθύρων από άλλες οθόνες"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:163
 #: src/modules/conf_winlist/e_int_config_winlist.c:241
+#, fuzzy
 msgid "Selection Settings"
-msgstr ""
+msgstr "Ρυθμίσεις επιλογής"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:164
 #: src/modules/conf_winlist/e_int_config_winlist.c:242
@@ -6122,7 +6142,7 @@ msgid "Show Toolbar"
 msgstr "Εμφάνιση γραμμής εργαλείων"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Συμπεριφορά"
 
@@ -6132,101 +6152,101 @@ msgstr "Εμφάνισε εικονίδια HAL στην επιφάνεια ερ
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "Προσάρτηση τόμων κατά την σύνδεση"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Άνοιγμα διαχειριστή αρχείων κατά την προσάρτηση"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Στον γονικό κατάλογο"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Άλλη εφαρμογή..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Άνοιγμα"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Άνοιγμα με..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Γνωστές εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Καθορισμένες εφαρμογές"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Προσαρμοσμένη εντολή"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Διαγραφή αιχμής"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6253,17 +6273,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, fuzzy, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "%d επεμβάσεις"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Διαχειριστής αρχείων"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6289,7 +6309,7 @@ msgstr "Διαφάνεια"
 
 #: src/modules/gadman/e_mod_config.c:167
 msgid "Animations"
-msgstr ""
+msgstr "Κινούμενα γραφικά"
 
 #: src/modules/gadman/e_mod_config.c:168
 msgid "Background"
@@ -6301,19 +6321,19 @@ msgstr "Φόντο"
 msgid "Gadgets"
 msgstr "Συστατικά"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Ελεύθερο"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Πάντα στην επιφάνεια εργασίας"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Προσθήκη άλλων συστατικών"
 
@@ -6350,7 +6370,7 @@ msgstr "Επιλεγμένη πηγή μπάρας"
 msgid "Icon Labels"
 msgstr "Ετικέτα εικονιδίων"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Εμφάνιση ετικέτας εικονιδίου"
 
@@ -6411,43 +6431,43 @@ msgstr "Δημιουργία νέου εικονιδίου"
 msgid "Add Application"
 msgstr "Προσθήκη εφαρμογής"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Ρυθμίσεις IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Εμφάνιση ονόματος"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Εμφάνιση τίτλου"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Εμφάνιση κλάσης"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Εμφάνιση ονόματος εικονιδίου"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Εμφάνιση ετικέτας περιγράμματος"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Εμφάνιση παραθύρων από όλες τις οθόνες"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Εμφάνιση παραθύρων από την τρέχουσα επιφάνεια εργασίας"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Εμφάνιση παραθύρων από όλες τις επιφάνειες εργασίας"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Εμφάνιση παραθύρων από την ενεργή επιφάνεια εργασίας"
 
@@ -6467,11 +6487,11 @@ msgstr "Εναλλαγή επιφάνειας εργασίας με τη ροδ
 msgid "Show desktop names"
 msgstr "Εμφάνιση ονομάτων επιαφανειών εργασίας"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Ρυθμίσεις άμεσων ειδοποιήσεων"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Εμφάνιση ειδοποίησης κατα την αλλαγή"
 
@@ -6479,108 +6499,108 @@ msgstr "Εμφάνιση ειδοποίησης κατα την αλλαγή"
 msgid "Show popup for urgent windows"
 msgstr "Εμφάνιση ειδοποίησης για επείγοντα παράθυρα"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Επιλογή και ολίσθηση κουμπιού"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Κλικ για ορισμό"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Αντίσταση στο τράβηγμα"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Ύψος πλαισίου ειδοποίησης"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Ταχύτητα ειδοποίησης"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f δευτερόλεπτα"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Προσοχή"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Κουμπί %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6704,7 +6724,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Θερμοκρασία"
 
@@ -6716,15 +6736,15 @@ msgstr "Επόμενο"
 msgid "Welcome to Enlightenment"
 msgstr "Καλώς ορίσατε στο Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Επιλογή ενός"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Προφίλ"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6771,15 +6791,15 @@ msgstr "Κλικ για εστίαση παραθύρων"
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Επιλογή εικονιδίων για προσθήκη"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Γρήγορη εκκίνηση"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Επιλογή εφαρμογών"
 
@@ -6864,8 +6884,9 @@ msgid "Mixer Settings Updated"
 msgstr "Ρυθμίσεις μείκτη ανανεώθηκαν"
 
 #: src/modules/mixer/e_mod_main.c:602
+#, fuzzy
 msgid "Controls"
-msgstr ""
+msgstr "Έλεγχοι"
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -6901,18 +6922,32 @@ msgstr "Συγκεκριμένη συσκευή"
 msgid "Networks"
 msgstr "Δίκτυα"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Σύστημα"
+msgstr ""
+
+#~ msgid "Window name and class"
+#~ msgstr "Όνομα και κλάση παραθύρου"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Εσωτερικά παράθυρα"
+
+#~ msgid "Expand the window"
+#~ msgstr "Επέκτεινε το παράθυρο"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Επέτρεψε μεταχείρηση του παραθύρου"
+
+#~ msgid "idle"
+#~ msgstr "αδρανές"
 
 #~ msgid "Mount of device failed"
 #~ msgstr "Αποτυχία προσάρτησης συσκευής"
diff --git a/po/enlightenment.pot b/po/enlightenment.pot
index 0ff8333..d3b1690 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: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\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,28 +20,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr ""
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr ""
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr ""
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -67,563 +67,563 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr ""
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr ""
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr ""
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr ""
 
@@ -631,41 +631,40 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr ""
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -676,7 +675,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -685,11 +684,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -697,7 +696,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -707,7 +706,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -716,7 +715,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -725,7 +724,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -733,11 +732,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -745,12 +744,12 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr ""
 
@@ -758,7 +757,7 @@ msgstr ""
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr ""
 
@@ -767,39 +766,39 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -807,22 +806,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -843,7 +842,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -888,7 +887,7 @@ msgstr ""
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr ""
 
@@ -920,23 +919,23 @@ msgstr ""
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr ""
 
@@ -944,331 +943,331 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr ""
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1279,144 +1278,148 @@ msgstr ""
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1426,7 +1429,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr ""
 
@@ -1460,21 +1463,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr ""
 
@@ -1483,12 +1486,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr ""
 
@@ -1497,7 +1500,7 @@ msgid "Maximized state"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr ""
 
@@ -1505,7 +1508,7 @@ msgstr ""
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr ""
 
@@ -1553,115 +1556,116 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1677,7 +1681,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr ""
 
@@ -1769,11 +1773,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1781,15 +1785,15 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1803,11 +1807,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1815,102 +1819,101 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:541
-msgid "Match only one window"
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr ""
@@ -1929,24 +1932,24 @@ msgstr ""
 msgid "Module Settings"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -1980,8 +1983,8 @@ msgstr ""
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2005,12 +2008,12 @@ msgid "Favorite Applications"
 msgstr ""
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2019,7 +2022,7 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr ""
 
@@ -2055,129 +2058,128 @@ msgstr ""
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2354,242 +2356,242 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
+#: src/bin/e_main.c:824
+msgid "Setup FM"
 msgstr ""
 
 #: src/bin/e_main.c:829
-msgid "Setup FM"
+msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:834
-msgid "Enlightenment cannot initialize the File manager.\n"
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
 msgstr ""
 
 #: src/bin/e_main.c:849
-msgid "Setup Message System"
+msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
 #: src/bin/e_main.c:854
-msgid "Enlightenment cannot set up its msg system."
+msgid "Setup DND"
 msgstr ""
 
 #: src/bin/e_main.c:859
-msgid "Setup DND"
+msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:864
-msgid "Enlightenment cannot set up its dnd system."
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:869
-msgid "Setup Grab Input Handling"
+msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
 #: src/bin/e_main.c:874
-msgid "Enlightenment cannot set up its input grab handling system."
+msgid "Setup Modules"
 msgstr ""
 
 #: src/bin/e_main.c:879
-msgid "Setup Modules"
+msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
 #: src/bin/e_main.c:884
-msgid "Enlightenment cannot set up its module system."
+msgid "Setup Remembers"
 msgstr ""
 
 #: src/bin/e_main.c:889
-msgid "Setup Color Classes"
+msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
 #: src/bin/e_main.c:894
-msgid "Enlightenment cannot set up its color class system."
+msgid "Setup Color Classes"
 msgstr ""
 
 #: src/bin/e_main.c:899
-msgid "Setup Gadcon"
+msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
 #: src/bin/e_main.c:904
-msgid "Enlightenment cannot set up its gadget control system."
+msgid "Setup Gadcon"
 msgstr ""
 
 #: src/bin/e_main.c:909
-msgid "Setup DPMS"
+msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
 #: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2597,11 +2599,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2609,37 +2611,37 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, 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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2647,12 +2649,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
@@ -2663,29 +2665,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2702,120 +2704,120 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2831,88 +2833,88 @@ msgstr ""
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -2932,51 +2934,51 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -2992,57 +2994,57 @@ msgstr ""
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3050,12 +3052,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3063,24 +3065,24 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3088,20 +3090,20 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr ""
 
@@ -3127,7 +3129,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3149,12 +3151,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3162,14 +3164,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3195,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3463,9 +3465,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
@@ -3531,10 +3533,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr ""
@@ -3566,8 +3568,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3688,46 +3690,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -3783,31 +3790,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3816,11 +3823,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3875,7 +3882,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3885,102 +3892,107 @@ msgstr ""
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4275,18 +4287,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4294,37 +4305,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4339,7 +4362,7 @@ msgstr ""
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr ""
 
@@ -4407,7 +4430,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr ""
 
@@ -4577,7 +4600,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr ""
 
@@ -4753,24 +4776,24 @@ msgstr ""
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4787,7 +4810,7 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr ""
 
@@ -4887,33 +4910,33 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5076,23 +5099,23 @@ msgstr ""
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5145,38 +5168,38 @@ msgid "Wallpaper Settings"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5197,14 +5220,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr ""
 
@@ -5269,40 +5292,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5414,14 +5437,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr ""
@@ -5554,17 +5569,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr ""
 
@@ -5572,19 +5582,19 @@ msgstr ""
 msgid "Maximize Policy"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5623,49 +5633,57 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6016,7 +6034,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6032,95 +6050,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6146,16 +6164,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6193,19 +6211,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6242,7 +6260,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -6301,43 +6319,43 @@ msgstr ""
 msgid "Add Application"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -6357,11 +6375,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6369,108 +6387,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6594,7 +6612,7 @@ msgstr ""
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr ""
 
@@ -6606,15 +6624,15 @@ msgstr ""
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6661,15 +6679,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6791,14 +6809,14 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
diff --git a/po/eo.gmo b/po/eo.gmo
index 9b2d89b..b0f314e 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index c09841d..b201275 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-05-16 19:05+0000\n"
 "Last-Translator: Olivier <eliovir at nospam.gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -28,28 +28,29 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Pri Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Fermi"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
+#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -87,45 +88,45 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ĉu vi cestas, ke vi deziras mortigi tiun fenestron?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Jes"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Ĉu vi cestas, ke vi deziras eliri ? "
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vi petis eliri na Enlightenment.<br><br>Ĉu vi certas ke vi volas eliri ?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Ĉu vi estas certa, ke vi volas adiaŭi?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Vi baldaŭ adiaŭos.<br><br>Ĉu vi certas ke vi volas agi tiel ?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Ĉu vi cestas, ke vi deziras estingi ? "
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -133,11 +134,11 @@ msgstr ""
 "Vi petis estingi vian komputilon.<br><br>Ĉu vi certas ke vi volas estingi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Ĉu vi cestas, ke vi deziras relanĉi ? "
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -145,18 +146,18 @@ msgstr ""
 "Vi petis relanĉi vian komputilon.<br><br>Ĉu vi certas ke vi volas relanĉi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Vi petis paŭzi vian komputilon.<br><br>Ĉu vi certas ke vi volas paŭzi ?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Ĉu vi cestas, ke vi deziras diskodormi ? "
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -164,494 +165,494 @@ msgstr ""
 "Vi petis diskodormi vian komputilon.<br><br>Ĉu vi certas ke vi volas dormigi "
 "ĝin ?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Fenestro : Agoj"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Movi"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Regrandigi"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menuo"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Fenestra Menuo"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Plialtigi"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Malplialtigi"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Mortigi"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Fenestro : stato"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Inversigi Fiksan Modon"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Inversigi Piktograman Modon"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Inversigi Plenekranan Modon"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksimumigi"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maksimumigi Vertikale"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maksimumigi Horizontale"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maksimumigi Plenekrane"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimumiga Modo \"Inteligenta\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimumiga Modo \"Ekspansia\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimumiga Modo \"Pleniga\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Baskulo de Subvolva Modo"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Baskulo de Suprvolva Modo"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Baskulo de Maldesktrvolva Modo"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Baskulo de Dekstrvolva Modo"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Inversigo de Ombriga Modo"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Inversigi Senrandan Staton"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Inversigi Pinglatan Staton"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Labortablo"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Labortabla Åœango al maldekstro"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Labortabla Åœango al dekstro"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Labortabla Åœango al supro"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Labortabla Åœango al subo"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Labortabla Åœango LaÅ­..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Vidigi la Labortablon"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Vidigi la breton"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Labortabla Åœango por..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Labortabla Åœango Linie..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "InterŜanĝi kun la 0-a Labortablo"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "InterŜanĝi kun 1-a Labortablo"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "InterŜanĝi kun 2-a Labortablo"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "InterŜanĝi kun 3-a Labortablo"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "InterŜanĝi kun 4-a Labortablo"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "InterŜanĝi kun 5-a Labortablo"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "InterŜanĝi kun 6-a Labortablo"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "InterŜanĝi kun 7-a Labortablo"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "InterŜanĝi kun 8-a Labortablo"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "InterŜanĝi kun 9-a Labortablo"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "InterŜanĝi kun 10-a Labortablo"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "InterŜanĝi kun 11-a Labortablo"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "InterŜanĝi kun la Labortablo..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Labortabla Ŝango al maldekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Labortabla Ŝango al dekstro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Labortabla Ŝango al supro (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Labortabla Ŝango al subo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Labortabla Ŝango Laŭ...(Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Labortabla Ŝango por... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Labortabla Ŝango Linie... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Labortabla Åœango direkcien..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "InterŜanĝi kun la 0-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "InterŜanĝi kun 1-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "InterŜanĝi kun 2-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "InterŜanĝi kun 3-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "InterŜanĝi kun 4-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "InterŜanĝi kun 5-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "InterŜanĝi kun 6-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "InterŜanĝi kun 7-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "InterŜanĝi kun 8-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "InterŜanĝi kun 9-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "InterŜanĝi kun 10-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "InterŜanĝi kun 11-a Labortablo (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "InterŜanĝi kun la Labortablo... (Ĉiuj ekranoj)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Ekrano"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Sendi Muson al 0-a Ekrano"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Sendi Muson al 1-a Ekrano"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Sendi Muson al Ekrano..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Sendi Muson ĝis la proksima ekrano"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Sendi muson ĝis la antaŭa ekrano"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Sendi muson ĝis la antaŭa/proksima ekranoj..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Fenestro : Movado"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Äœis Sekvonta Labortablo"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Äœis AntaÅ­a Labortablo"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "LaÅ­ Labortablo #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Al Labortablo..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Montri ĉefMenuon"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Montri Preferatajn Menuon"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Vidigi \"Ĉiuj Aplikaĵoj\" Menuon"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Vidigi Klientan Menuon"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Vidigi Menuon..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Lanĉi"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplikaĵo"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Eliri"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Eliri nun"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Reĝimo"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Inversigi la prezentan reĝimon"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Inversigi la senkonektan reĝimon"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistemo"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Elsaluti"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Kurentmalŝalti nun"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Kurentmalŝalti"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Relanĉi"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "PaÅ­zi"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Diskodormi"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Åœlosi"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Purigi Fenestrojn"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Ĝeneraĵoj : Agoj"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Malfruata agado"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Difini kiel Tapeton"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Legado de labortablaj dosieroj farita"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Legado de labortabla dosiero"
 
@@ -659,41 +660,40 @@ msgstr "Legado de labortabla dosiero"
 msgid "Color Selector"
 msgstr "Koloro-elektilo"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Konfirmi"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -711,7 +711,7 @@ msgstr ""
 "fiksos<br>tion aldonante ĝin en. Vi povas agordi de nove aferojn aktuale laŭ "
 "via<br>ŝato. Pardonon pro la momenta problemeto en via agordo.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -725,11 +725,11 @@ msgstr ""
 "estas malbone kaj<br>kiel antaÅ­zorgo via agordo estis restaÅ­rita per "
 "defaŭltoj.<br>Bonvolu pardoni por la ĝeno.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Ĝisdatiĝis agordoj"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -741,7 +741,7 @@ msgstr ""
 "<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti difektadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -757,7 +757,7 @@ msgstr ""
 "okazis, estis:<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti "
 "difektadon de donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -770,7 +770,7 @@ msgstr ""
 "<br><br>La dosiero kie la eraro okazis estis:<br>%s<br><br>Ĉi tiu dosiero "
 "estis forigata por eviti difektadon de donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -784,7 +784,7 @@ msgstr ""
 "<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti difektadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -796,11 +796,11 @@ msgstr ""
 "estis:<br>%s<br><br>Ĉi tiu dosiero estis forigata por eviti difektadon de "
 "donitaĵoj.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemoj de skribo de Enlightenment-agordo"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -808,12 +808,12 @@ msgstr "Problemoj de skribo de Enlightenment-agordo"
 msgid "Advanced"
 msgstr "Plidetale"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Baze"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Apliki"
 
@@ -821,7 +821,7 @@ msgstr "Apliki"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduloj"
 
@@ -830,25 +830,25 @@ msgstr "Moduloj"
 msgid "Extensions"
 msgstr "Etendiloj"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Ujo %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Eraro - neniu subteno de PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "Neniu subteno de PAM estis konstruita en Enlightement, "
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Åœloso Malsukcesis"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -856,15 +856,15 @@ msgstr ""
 "Labortabla Ŝloso malsukcesis ĉar kelka aplikaĵo ekkaptis<br>aŭ la klavaron "
 "aŭ la muson aŭ ambaŭ<br>kaj ĝia ekkapto ne eblas rompiĝi."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Bonvolu entajpi vian malŝlosan pasvorton"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Eraro de la AÅ­tentiga Sistemo"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -875,11 +875,11 @@ msgstr ""
 "sesion. La erara kodo estis <hilight>%i</hilight>.<br>Tio estas malbone kaj "
 "ne devus okazi. Bonvolu raporti tiun cimon."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Ebligi la prezentan reĝimon"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -889,11 +889,11 @@ msgstr ""
 "<b>prezentan reĝimon</b> kaj dumtempe malebligi la ekrankurtenon, ŝlosilon "
 "kaj energiŝparadon?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Ne, sed pligrandigi la tempolimon"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Ne, kaj ĉesi tiun peton"
 
@@ -920,7 +920,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Redaktilo de Labortabla Enigo"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -965,7 +965,7 @@ msgstr "Kategorioj"
 msgid "Mime Types"
 msgstr "MIME-typoj"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opcioj"
 
@@ -997,23 +997,23 @@ msgstr "Elekti Piktogramon"
 msgid "Select an Executable"
 msgstr "Elekti Lanĉeblon"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Forviŝi"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Eltondi"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopii"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Alglui"
 
@@ -1021,24 +1021,24 @@ msgstr "Alglui"
 msgid "Select All"
 msgstr "Elekti Ĉion"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Lanĉa Eraro"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Eraro dum lanĉo de aplikaĵo"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1047,314 +1047,314 @@ msgstr ""
 "Enlightenment ne povas lanĉi tiun aplikaĵon :<br><br>%s><br><br>La aplikaĵo "
 "malsukcesis komenci."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Eraro dum lanĉo de Aplikaĵo"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s haltis ruladon senatendite."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Elirsignala kodo %i sendita el %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s interrompiĝis per InterrompSignalo."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s interrompiĝis per ElirSignalo."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s interrompiĝis per ĉesigSignalo."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s interrompiĝis per glitpunkta eraro."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s interrompiĝis per Neinterrompebla Mortiga Signalo"
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s interrompiĝis per Segmenta Misfunkcio."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s interrompiĝis per Rompita Dukto."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s interrompiĝis per FiniĝSignalo."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s interrompiĝis per Busa Eraro."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s interrompiĝis per Signala Numero %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Eraraj Protokoloj"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Nenio erara mesaĝo ĉeestas."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Konservi Tiun Mesaĝon"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Erara Informaĵo"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Erara Signala informaĵo"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Eligitaj Datumoj"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Neniu eligo ĉeestas"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Neekzistanta vojo"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s ne ekzistas."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "Eraro de surmeto"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Eraro de surmeto"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "Eraro"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosieroj"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Ligo"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Ĉesigi"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Heredas gepatrajn agordojn"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Vidiga Modo"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Refreŝigi Rigardon"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Vidigi Kaŝitajn Dosierojn"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Memorigi Ordon"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Tuj Ordigi"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nova Dosierujo"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renomi"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "Muti"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Ecoj"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Uzi defaŭltaĵon"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Kradaj Piktogramoj"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Piktogramaj Difinitaj de uzanto"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listo"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Piktograma grandeco (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Difini tapeton..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Difini kovron..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Forviŝi"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Krei novan dosierujon"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nova Nomo de Dosierujo:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomi %s al:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renomi Dosieron"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Reprovi"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Eraro"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Ne por ĉiuj"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Jes por ĉiuj"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Averto"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 "La dosiero jam ekzistas. Ĉu vi volas anstataŭigi ĝin?<br><hilight>%s</"
 "hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Malatenti tiun ĉi"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Malatenti ĉiujn"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Eraro okazis dum efektivado de funkciado.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Konfirmi Forviŝon"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1367,144 +1367,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Dosieraj Ecoj"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Dosiero:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Grando:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Laste Ŝanĝita:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Dosiera Typo:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permesoj"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Proprietulo :"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Aliaj povas legi"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Aliaj povas skribi"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Proprietulo povas legi"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Proprietulo povas skribi"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "AntaÅ­vido"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "DefaÅ­lta"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Bildeto"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Difinita de uzanto"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Uzi tiun piktogramon por ĉiuj tiaj dosieroj"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Ligila Informaĵo"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Elekti bildon"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nekonata Datumportilo"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Demetebla Aparato"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Forviŝi tiun vanaĵon"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Plata"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Eniga"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "AÅ­tomate rulumi enhavojn"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Regrandigebla"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Komenci movon/regrandigon de ĉi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Forviŝi tiun vanaĵon"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Ĉesi movon/regrandigon ĉi tiun vanaĵon"
 
@@ -1516,7 +1521,7 @@ msgstr ""
 "Antaŭa lanĉo de Enlightenment daŭre estas aktiva\n"
 " sur ĉi tiu ekrano. Haltiganta komencon.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Fenestraj ŝlosoj"
 
@@ -1550,21 +1555,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Stako"
 
@@ -1573,12 +1578,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Volva stato"
 
@@ -1587,7 +1592,7 @@ msgid "Maximized state"
 msgstr "Grandegita stato"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Plenekraneco"
 
@@ -1595,7 +1600,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Randa stilo"
 
@@ -1643,115 +1648,116 @@ msgstr "Malpingli de la Labortablo"
 msgid "More..."
 msgstr "Pli..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Bildsimboligi"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Grandegigi vertikale"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Grandegigi horizontale"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Malgrandegigi"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Fulmoklavo"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "En la menuon de preferaĵoj"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "En la lanĉilon"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Rando"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Preterpasi"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Åœtato"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Memori"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Fenestraj Ecoj"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Ĉiam Supre"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normala"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Ĉiam Malsupre"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Elekti Randan Stilon"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Uzi la defauxltan piktograman agordon"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Uzi donitan piktogramon de la aplikaĵo"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Uzi Piktogramon Definitan de Uzanto"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Volvita"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Glugita"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Plenekrana"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Fenestrolisto"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Vokilo"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Taskopleto"
 
@@ -1767,7 +1773,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Ecoj"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titolo"
 
@@ -1859,11 +1865,11 @@ msgstr "NetWM Ecoj"
 msgid "Modal"
 msgstr "Modala"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Preterpasi la Taskopleton"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Forlasi Vokilon"
 
@@ -1871,15 +1877,15 @@ msgstr "Forlasi Vokilon"
 msgid "Hidden"
 msgstr "Kaŝita"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Fenestra Memoro"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Fenestraj ecoj ne estas unua kongrueco"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1902,11 +1908,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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Neniu kongrueca eco fiksita"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1918,114 +1924,105 @@ msgstr ""
 "ĝin</hilight>.<br><br>Vi devas defini almenaŭ 1 manieron por memorigi tiun "
 "fenestron."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Vi estas provanta demandi Enlightenment-on pri memorigo de apliko<br>de ecoj "
-"(kiel grandeco, loko, randa stilo, ktp) al<br>fenestro kiu <hilight>ne havas "
-"unikajn ecojn</hilight>.<br><br>Tio signifas ke ĝi havigas ecojn de Nomo/"
-"Klaso,  NedaÅ­ro, Rolo, ktp<br>kun pli ol 1 alia fenestro en la ekrano kaj "
-"memorado<br>de ecoj por ĉi tiu fenestro koncernos ĉiuj aliajn<br>kiu "
-"kongruas kun tiuj ecoj.<br><br>Vi povus deziri ebligi, la "
-"elekton<hilight>Kongrui nur unu fenestro</hilight> se<br>vi nur intencas unu "
-"okazoj de ĉi tiu fenestro modifenda, kun<br>kromaj okazoj ne modifendaj."
-"<br><br>Tio estas nur averto en la okazo ke vi ne intencas tian okazajxon."
-"<br>Se vi volis tion, simple alklaku la butonoj <hilight>Apliki</hilight> aÅ­ "
-"<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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nenio"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Grandeco kaj Pozicio"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "ŝlosoj"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Grandeco, Pozicio kaj ŝlosoj"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Ĉio"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Memori uzante"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Fenestra nomo kaj klaso"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Fenestradministrilo"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Fenestra Klaso"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Fenestro Grado"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Fenestra tipo"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Nedaureco"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Memorendaj Ecoj"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Piktograma Prefero"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuala Labortablo"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktuala Ekreno"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Forviŝi el Fenestrolisto"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Eraro dum lanĉo de aplikaĵo"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Kongruas nur unu fenestron"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Restarigi tiun programon dum ensaluto"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Ĉiam fokusigi dum komenco"
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Ŝanĝi Piktogramajn Ecojn"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Restarigi tiun programon dum ensaluto"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Agordoj"
@@ -2044,24 +2041,24 @@ msgstr "Breto"
 msgid "Module Settings"
 msgstr "Modulaj Agordoj"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Disponeblaj Moduloj"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Ŝarĝi Modulon"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Ŝarĝitaj Moduloj"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Malŝarĝi Modulon"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2095,8 +2092,8 @@ msgstr "Forviŝi Vanaĵon"
 msgid "Toolbar Settings"
 msgstr "Agordoj de ilbreto"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Aranĝo"
 
@@ -2123,12 +2120,12 @@ msgid "Favorite Applications"
 msgstr "Preferataj Aplikaĵoj"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2137,7 +2134,7 @@ msgstr "Aplikaĵoj"
 msgid "Windows"
 msgstr "Fenestroj"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Mislokitaj fenestroj"
 
@@ -2173,129 +2170,128 @@ msgstr "(Neniu aplikaĵo)"
 msgid "Set Virtual Desktops"
 msgstr "Difini virtualajn labortablojn"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Neniu Fenestro)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Neniu nomo!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Neniu Breto)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Breto numero"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Aldoni Breton"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Forviŝi Breton"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Bretaj Agordoj"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Malgrandega"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Malgranda"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Meza"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Granda"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandega"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Difini enhavon.."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Supre ĉio"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Malsupre Fenestroj"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Malsupre ĉio"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Permesi pozicigon de fenestroj super la breton"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Åœrumpi al Enhava Grandeco"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f rastumeroj"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Stiloj"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Aŭtomata Kaŝo"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Aŭtomate kaŝi la breton"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Vidigi dum muso en"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Vidigi dum musa alklako"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Tempolimo de kaŝo"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundoj"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Kaŝi daŭron"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Vidigi en ĉiuj Labortabloj"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Vidigi en elektitaj Labortabloj"
 
@@ -2539,7 +2535,7 @@ msgstr "Komencante eltenon de internaciigo"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne povas difini sian \"intl\"-sistemon."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2547,11 +2543,11 @@ msgstr ""
 "Enlightenment ne eblas difini komencan ekranon.\n"
 "Eble memoro ne sufiĉas?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Provado de elteno de formato"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2559,7 +2555,7 @@ msgstr ""
 "Laŭ Enlightenment, Evas ne povas krei bufro-areaĵon. Bonvolu kontroli\n"
 "ke Evas enhavas eltenon de programa bufrilo-modulo.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2567,7 +2563,7 @@ msgstr ""
 "Laŭ Enlightenment, Evas ne povas ŝargi la PNG-dosierojn.\n"
 "Kontrolu ke Evas enhavas eltenon de PNG-ŝargilo.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2575,7 +2571,7 @@ msgstr ""
 "Laŭ Enlightenment, Evas ne povas ŝargi JPEG-dosierojn.\n"
 "Kontrolu ke Evas enhavas eltenon de JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2583,7 +2579,7 @@ msgstr ""
 "Laŭ Enlightenment, Evas ne povas ŝargi EET-dosierojn.\n"
 "Kontrolu ke Evas enhavas eltenon de EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2593,11 +2589,11 @@ msgstr ""
 "ĉu Evas eltenas \"fontconfig\"\n"
 "kaj la sistema \"fontconfig\" difinas iun tiparon 'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Agordi Ekranojn"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2606,192 +2602,192 @@ msgstr ""
 "de\n"
 "via sistemo malsukcesis. Eble alia fenestradministrilo funkcias?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Ebligi ekrankurtenon"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne povas agordi la ekrankurtenon."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Agodi Labortablan Åœloson"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ne povas difini sian sistemon de ekran-ŝloso."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Agordado de Vojoj"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Agordi Sistemajn Kontrolojn"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne eblas difini sisteman komandan sistemon.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Agordi Agadojn"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne povas difini sian agadan sistemon."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Agordi la sistemon de lanĉo"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne povas difini sian lanĉeblan sistemon."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Agordi Memorojn"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ne povas difini memorigajn agordojn."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Agordi FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne povas difini la dosiera administrilo.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Agordi Mesaĝan Sistemon"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne povas difini sian \"msg\"-sistemon."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Agordi Åœovon kaj Demeton"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne povas difini sian \"dnd\"-sistemon."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "Agordi traktadon de enigo-aparato"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment ne povas difini sian sistemon de kapto de enigo."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Agordi Modulojn"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne povas difini sian sistemon de moduloj."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Agordi Memorojn"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne povas difini memorigajn agordojn."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Agordi Kolorajn Klasojn"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne povas difini sian sistemon de koloro-klasoj."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Elekti Gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ne povas difini sian sistemon de kontrolo de vanaĵoj."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Agordi DPMS (administrado de energi-ŝparo de ekrano)"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne povas difini la DPMS-agordojn."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Agordi la energiŝparajn reĝimojn"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment ne povas difini siajn energiŝparajn reĝimojn."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Agordi Tapeton"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne povas difini sian tapetan sistemon."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Agordi Muson"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne povas difini la agordojn de muso."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Agordi Bindojn"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne povas difini sian bindan sistemon."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Agordi Åœprucfenestrojn"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne povas difini sian spruĉajan sistemon."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Agordi Bretojn"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ne eblas difini sian bretan sistemon."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Agordi Bildetilo"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne povas eki la Miniaturon sistemon.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Agordi la ordigadon de dosieroj"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne povas difini sian sistemon de dosiera ordigo."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Åœargi Modulojn"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2803,11 +2799,11 @@ msgstr ""
 "de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
 "nove."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment fuŝis frue dum komenco kaj restartiĝis."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2819,15 +2815,15 @@ msgstr ""
 "de via agordo. La modulo de agordo<br> permesos elekti viajn modulojn de "
 "nove."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Agordi Bretojn"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "PreskaÅ­ Finita"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2836,11 +2832,11 @@ msgstr ""
 "Okazis eraro dum ŝarĝo de la modulo %s<br>Neniu modulo nomata %s povas esti "
 "trovita en la<br>dosierujoj de modula serĉo.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Eraro dum ŝarĝo de Modulo"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2849,11 +2845,11 @@ msgstr ""
 "Okazis eraro dum ŝargo de modulo nomata:%s<br>La plena vojo de tiu modulo "
 "estas:<br>%s<br>La eraro raportata estis:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modulo ne enhavas ĉiujn bezonatajn funkciojn"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2864,12 +2860,12 @@ msgstr ""
 "minimumeversion de modulo-API %i.<br>La modulo-API bezonata de Enlightenment "
 "estas: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment-a \"%s\" Modulo"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "ĉu vi volas malŝarĝi tiun modulon ?<br>"
 
@@ -2883,30 +2879,30 @@ msgstr ""
 "<b>prezentan reĝimon</b> kaj dumtempe malebligi la ekrankurtenon, ŝlosilon "
 "kaj energiŝparadon?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ĉu vi estas certa, ke vi deziras forviŝi tiun breton ?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "Vi petis foriviŝi tiun breton.<br><br>Ĉu vi certas ke vi volas foriviŝi ĝin ?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Halti Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Komenci Movadon/GrandecŜanĝon de Elementoj"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Difini la bretan enhavon"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Forviŝi tiun Breton"
 
@@ -2923,11 +2919,11 @@ msgstr "Kontrolado de sistemaj permesoj"
 msgid "System Check Done"
 msgstr "Kontrolo de sistemo finita."
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Elsalutaj malfacilecoj"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2936,38 +2932,38 @@ msgstr ""
 "Elsaluto daŭras tro longtempe. Kelkaj<br>aplikaĵoj rifuzas fermi.<br>Ĉu vi "
 "volas fini la elsaluton<br>iel sen fermi tiujn ĉi<br>aplikaĵojn unue ?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Elsaluti nun"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Atendu pli longtempe"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Rezigni Elsaluton"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Elsalutante"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Elsalutante.<br><hilight>Bonvolu atendi.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment estas okupata de alia peto"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "Elsalutante.<br>Vi ne povas plenumi aliajn sistemajn agojn ĝis tio finiĝos."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2975,7 +2971,7 @@ msgstr ""
 "Kurentmalŝaltante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
 "agadojn<br>antaÅ­ estingo ekis."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2983,7 +2979,7 @@ msgstr ""
 "Restartigante.<br>Vi ne povas fari aliajn sistemajn agadoj<br>antaÅ­ la "
 "relanĉo ekos."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2991,7 +2987,7 @@ msgstr ""
 "SistempaÅ­zigante.<br>Vi ne povas fari iujn ajn aliajn sistemajn "
 "agadoj<br>antaÅ­ la paÅ­zigo ekos."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2999,55 +2995,55 @@ msgstr ""
 "Diskdormigante.<br>Vi ne povas plenumi aliajn sistemajn agojn<br>ĝis tio "
 "finiĝos."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "HUJ! Tio ne devus okazi"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "La kurentmalŝalto malsukcesis."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "La restartigo malsukcesis."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Diskodormigo malsukcesis."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Diskdormigo de via sistemo malsukcesis."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Kurentmalŝalti"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kurentmalŝalto.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Restartigante"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Restartigante.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Dormigante"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Dormigante.<br><hilight>Bonvolu atendi</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Diskdormigante"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Diskdormigante.<br><hilight>Bonvolu atendi.</hilight>"
 
@@ -3063,11 +3059,11 @@ msgstr "Difini kiel Etoson"
 msgid "Set Toolbar Contents"
 msgstr "Difini la ilobretan enhavon"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Ne eblas foriri - nemortigitaj fenestroj."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3077,77 +3073,77 @@ msgstr ""
 "Enlightenment ne permesos sin ĉesigi ĝis tiujn fenestoj<br>estos fermitaj aŭ "
 "kies la ŝlosilo foriĝis.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Je futuro"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Je lasta minuto"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "AntaÅ­ %li Jaroj"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "AntaÅ­ %li Monatoj"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "AntaÅ­ %li Semajnoj"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "AntaÅ­ %li Tagoj"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "AntaÅ­ %li Horoj"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "AntaÅ­ %li minutoj"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nekonata"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3167,51 +3163,51 @@ msgstr "Supren"
 msgid "Down"
 msgstr "Suben"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Aldoni al Preferata Menuo"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Rajtoj :"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modifita:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Vi"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protektita"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Nurlega"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lege skribe"
 
@@ -3227,57 +3223,57 @@ msgstr "Basaj Agordoj"
 msgid "Show alert when battery is low"
 msgstr "Montri antaÅ­gardon kiam baterio estas baznivela"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Inspekti je ĉiuj:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tempunuoj"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Äœisdatigante"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Montri averton kiam baterio estas baznivela"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Avertii kiam baterio estas je:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minutoj"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "AÅ­tomate forigi post..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sekundoj"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Averto"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "AÅ­tomate detekti"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3285,12 +3281,12 @@ msgstr "AÅ­tomate detekti"
 msgid "Internal"
 msgstr "Interna"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Aparataro"
 
@@ -3298,24 +3294,24 @@ msgstr "Aparataro"
 msgid "Battery"
 msgstr "Baterio"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Via baterio estas baznivela!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Alterna kurento estas rekomendita."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "Neaplikebla"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ERARO"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Baterio-mesurilo"
 
@@ -3323,20 +3319,20 @@ msgstr "Baterio-mesurilo"
 msgid "Clock"
 msgstr "Horloĝo"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Panelo de agordoj"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Prezentaĵo"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Senkonekte"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Reĝimoj"
 
@@ -3362,7 +3358,7 @@ msgid "Restart Applications"
 msgstr "Aplikaĵoj post relanĉo"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Ĉiuj Aplikaĵoj"
 
@@ -3384,12 +3380,12 @@ msgstr "Aliaj de IBar"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menuoj"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Defauxlta Randa Stilo"
 
@@ -3397,14 +3393,14 @@ msgstr "Defauxlta Randa Stilo"
 msgid "Window Border Selection"
 msgstr "Fenestra Randa Areo"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Memori tiun randon pri tiu fenestro je proksima foje ĝi aperos"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3430,7 +3426,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3698,9 +3694,9 @@ msgid "Desktop Name"
 msgstr "Labortabla Nomo"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nomo:"
 
@@ -3766,10 +3762,10 @@ msgstr "%1.0f minutoj"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Persona"
@@ -3801,8 +3797,8 @@ msgstr "Montri en ekrana zono #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3923,46 +3919,51 @@ msgstr "%.2f panorama faktoro laÅ­ Y-akso"
 msgid "Virtual Desktops"
 msgstr "Virtualaj Labortabloj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Agordoj de Dialogoj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Äœeneralaj Agordoj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Malebligi Konfirmo de Dialogoj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normala fenestroj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Defaŭlta reĝimo de dialogo de agordoj"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Baza Modo"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Plidetala Modo"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Modo de DefaÅ­lta Dialogo"
 
@@ -4030,31 +4031,31 @@ msgstr "Restarigi"
 msgid "Screen Resolution Settings"
 msgstr "Agordoj de Ekrana Distingivo"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "RestaÅ­ri dum ensalutado"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Aktualigi"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Turno"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Spegulado"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Mankaj Funkcioj"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4067,11 +4068,11 @@ msgstr ""
 "la elteno de tiu<br> kromaĵo. Ankaŭ povas okazi la konstruo de la iama "
 "<hilight>ecore</hilight><br> ne trovis la eltenon de XRandr."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Neniu ofteco de aktualigo trovita"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4131,7 +4132,7 @@ msgid "Power Management"
 msgstr "Administrado de potenco"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4139,79 +4140,85 @@ msgid "<None>"
 msgstr "<Neniom>"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+#, fuzzy
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 "Bonvolu elekti randon,<br>aŭ klaku <hilight>Fermi</hilight> por ĉesigi."
 "<br><br>Por ŝanĝi la tempolimon de tiu agado,<br>uzu la ŝovilon."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Agordoj de Edje-Bindoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Edje-Bindoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Alduni \"Edje\""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Forviŝi \"Edje\""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Ŝanĝi \"Edje\""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Forviŝi Ĉion"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "RestaÅ­rigu la apriorajn bindojn"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ago"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Agaj Parametroj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Äœeneralaj opcioj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permesas ebligadon de fulmklavoj kun plenekranaj fenestroj."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Sekvenco de Edje-fulmklavoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekundoj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Eraro de Edje-Bindo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4221,27 +4228,27 @@ msgstr ""
 "\"<br><hilight>%s</hilight>\".<br>Bonvolu elekti alian bindadon de Edje-"
 "sekvenco."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "KTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "MAJUSKL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "VIN"
 
@@ -4538,18 +4545,17 @@ msgstr "Tre Granda"
 msgid "%d pixels"
 msgstr "%d rastrumeroj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Aktivigi Proprajn Tiparajn Klasojn"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Baza antaŭrigardo teksto: 123: 我的天空!"
 
@@ -4557,38 +4563,53 @@ msgstr "Baza antaŭrigardo teksto: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Piktogramaj Klasoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Aktivigi Tiparan Klason"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Tiparoj"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Stiloj"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Teksto de Detala Antaŭrigardo: 我真的会写中文ĉĝĥĵŝŭ"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Aludado"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bajtkodo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "AÅ­tomata"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Alternativaj Tiparoj"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Alternativa Nomo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Aktivigi Alternativecojn"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Teksto de Detala Antaŭrigardo: 我真的会写中文ĉĝĥĵŝŭ"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "Alternativaj Tiparoj"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4602,7 +4623,7 @@ msgstr "Piktogramaj Etosoj"
 msgid "Icon theme overrides general theme"
 msgstr "Piktograma Etoso anstataŭigas ĝeneralan etoson"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Piktograma Etoso"
 
@@ -4673,7 +4694,7 @@ msgstr ""
 "\"Enlightenment\" ne eblas importi la agordon<br>ĉar okazis eraro dum kopio."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Lingvo"
 
@@ -4849,7 +4870,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Aŭtomatkuluma Kursora Marĝeno"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Diversaj opcioj"
 
@@ -5028,24 +5049,24 @@ msgstr "Kursora Grandeco"
 msgid "Mouse Cursor"
 msgstr "Musa kursoro"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Agordo de muso"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Mano de muso"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Akcelado de la muso"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Plirapidigo"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Sojlo"
 
@@ -5062,7 +5083,7 @@ msgid "Images"
 msgstr "Bildoj"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Etosoj"
 
@@ -5162,35 +5183,35 @@ msgstr "%1.0f aroj"
 msgid "Performance"
 msgstr "Seanco"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Aspekta Elektilo"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Uzeblaj aspektoj"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Elekti profilon"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Restarigo"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 "Vi petis foriviŝi tiun profilon \"%s\".<br><br>Ĉu vi certas ke vi volas "
 "foriviŝi ĝin?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Forviŝi Bone?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Aldoni Novan Aspekton"
 
@@ -5355,23 +5376,23 @@ msgstr "Komenco"
 msgid "Theme Selector"
 msgstr "Etosa Elektilo"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr "Enporti..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Enrete..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Etosaj Kategorioj"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Atribui"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Forviŝi ĉion"
 
@@ -5427,38 +5448,38 @@ msgid "Wallpaper Settings"
 msgstr "Tapetaj Agordoj"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Uzi Etosan Tapeton"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Bildo..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Kolortransiro..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Enrete..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Kie enmeti la Tapeton"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Ĉiuj Labortabuloj"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Tiu ĉi labortablo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Tiu Ekrano"
 
@@ -5479,14 +5500,14 @@ msgid "Fill Options"
 msgstr "Plenigi Opciojn"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontale"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertikale"
 
@@ -5551,36 +5572,36 @@ msgstr "Uzi originan dosieron"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Elekti Bildon..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Bilda Importada Eraro"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "\"Enlightenment\" ne eblas importi bildon<br>kial okazis eraroj dum konverto."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Tapeta Importada Eraro"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5588,7 +5609,7 @@ msgstr ""
 "\"Enlightenment\" ne eblas importi tapeton.<br>Ĉu vi certas ke tiu tapeto "
 "validas?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Interŝanĝi tapetojn"
 
@@ -5700,14 +5721,6 @@ msgstr "Preferi Piktogramon Definitan de Uzanto"
 msgid "Prefer application provided icon"
 msgstr "Preferi aplikaĵan provizatan piktogramon"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Internaj Fenestroj"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Ĉiam memori internajn fenestrojn"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Fokusaj Agordoj"
@@ -5840,17 +5853,12 @@ msgid "Window Maximize Policy"
 msgstr "Strategio de maksimumigo de fenestroj"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Inteligenta malvolvo"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Malvolvi la fenestron"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Plenigi disponeblan  spacon"
 
@@ -5858,19 +5866,19 @@ msgstr "Plenigi disponeblan  spacon"
 msgid "Maximize Policy"
 msgstr "Strategio de maksimumigo"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Maksimumigi direkcien"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "AmbaÅ­"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Permesi fenestran manuzon"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Aŭtomate movi/regrandigi dei fenestroj dum aŭtokaŝo de breto"
 
@@ -5909,49 +5917,59 @@ msgstr "Altigi dum komenco de movado aÅ­ regrandigado"
 msgid "Raise when clicking to focus"
 msgstr "Altigi dum klakado por fokusigi"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Fenestraj memoroj"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Ĉiam memori internajn fenestrojn"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "Ĉiam memori internajn fenestrojn"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Forigi memoro(j)n"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detaloj"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Neniu nomo>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Klaso:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Neniu klaso>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titolo:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Neniu titolo>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Rolo;"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Neniu rolo>"
 
@@ -6323,7 +6341,7 @@ msgid "Show Toolbar"
 msgstr "Vidigi Ilobreton"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Konduto"
 
@@ -6339,95 +6357,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Iri al Patra Dosierujo"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Alia aplikaĵo..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Malfermi"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Malfermi per..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Konataj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Specialaj Aplikaĵoj"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Propran komandon"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Forviŝi \"Edje\""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "La restartigo malsukcesis."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6454,17 +6472,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "%d agoj"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Administrilo"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "Aktualaj operacioj en EFM"
 
@@ -6502,19 +6520,19 @@ msgstr "Fono"
 msgid "Gadgets"
 msgstr "Akcesoraĵoj"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Libera"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Ĉiam surlabortable"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Dum klakado supre"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Aldonu aliajn akcesoraĵojn"
 
@@ -6551,7 +6569,7 @@ msgstr "Fonto de Elektita Listelo"
 msgid "Icon Labels"
 msgstr "Piktogramaj Etikedoj"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Montri Piktograman Etikedon"
 
@@ -6612,43 +6630,43 @@ msgstr "Krei novan piktogramon"
 msgid "Add Application"
 msgstr "Aldoni Aplikaĵon"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Agordoj de IBar"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Vidiga Nomo"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Vidiga Titolo"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Vidiga Klaso"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Vidigi Piktograman Nomon"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Etikedo de ekrana rando"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Montri fenestrojn de ĉiuj ekranoj"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Montri fenestrojn de nuna ekrano"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Montri fenestrojn de ĉiuj labortabloj"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Montri fenestrojn de nuna labortablo"
 
@@ -6668,11 +6686,11 @@ msgstr "Labortabla Åœango dum musa radado"
 msgid "Show desktop names"
 msgstr "Vidigi labortablajn nomojn"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Agordoj de ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Vidigi ŝprucfenestron dum ŝanĝo de labortablo"
 
@@ -6680,69 +6698,69 @@ msgstr "Vidigi ŝprucfenestron dum ŝanĝo de labortablo"
 msgid "Show popup for urgent windows"
 msgstr "Montri ŝprucfenestron por urĝaj fenestroj"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Elekti kaj ŝovi butonon"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Klaki por difini"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Butono ŝovi kaj demeti"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Demeti la tutan labortablon"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Alto de la ŝprucfenestro de klavo-agadoj"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f rastrumeroj"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Rezistado al ŝovoj"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Alteco de la tabulpaĝilo-ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Rapideco de ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekundoj"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Agordoj de urĝaj fenestroj"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Vidigi ŝprucfenestron dum urĝa fenestro"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Ŝprucfenestro por urĝa fenestro  fiksiĝas en la ekrano"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Kapto de la butono de la tabulpaĝilo"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6750,11 +6768,11 @@ msgstr ""
 "Tajpu musan butonon<br>Tajpu <hilight>Eskapa</hilight> por ĉesigi. <br>Aŭ "
 "<hilight>Foriga</hilight> por reŝargi la butonon."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Atentu"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6764,29 +6782,29 @@ msgstr ""
 "ĝi estas jam kaptata de interna kodo<br> por la kuntekstaj menuoj. Tiu "
 "butono nur funkcias en<br> la ŝprucfenestro"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Butono %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Vidigi la ŝprucfenestron de tabulpaĝilo"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Åœprucfenestr dekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Åœprucfenestr maldekstren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Åœprucfenestr supren de labortablo"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Åœprucfenestr malsupren de labortablo"
 
@@ -6910,7 +6928,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperaturo"
 
@@ -6922,15 +6940,15 @@ msgstr "Sekva"
 msgid "Welcome to Enlightenment"
 msgstr "Bonvenon en Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Elekti iun"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profilo"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6980,15 +6998,15 @@ msgstr "Klaki por fokusigi fenestrojn"
 msgid "Mouse over focuses windows"
 msgstr "Supra muso fokusigas fenestrojn"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Elektu piktogramojn aldonendajn"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Rapida lanĉo"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Elekti aplikaĵojn"
 
@@ -7112,18 +7130,59 @@ msgstr "Speciala aparato"
 msgid "Networks"
 msgstr "Retoj"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Alia taskopleto ekzistas"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Nu unu akcesoraĵo de taskopleto povas esti kaj alia jam ekzistas."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Taskopleto"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Vi estas provanta demandi Enlightenment-on pri memorigo de apliko<br>de "
+#~ "ecoj (kiel grandeco, loko, randa stilo, ktp) al<br>fenestro kiu "
+#~ "<hilight>ne havas unikajn ecojn</hilight>.<br><br>Tio signifas ke ĝi "
+#~ "havigas ecojn de Nomo/Klaso,  NedaÅ­ro, Rolo, ktp<br>kun pli ol 1 alia "
+#~ "fenestro en la ekrano kaj memorado<br>de ecoj por ĉi tiu fenestro "
+#~ "koncernos ĉiuj aliajn<br>kiu kongruas kun tiuj ecoj.<br><br>Vi povus "
+#~ "deziri ebligi, la elekton<hilight>Kongrui nur unu fenestro</hilight> "
+#~ "se<br>vi nur intencas unu okazoj de ĉi tiu fenestro modifenda, "
+#~ "kun<br>kromaj okazoj ne modifendaj.<br><br>Tio estas nur averto en la "
+#~ "okazo ke vi ne intencas tian okazajxon.<br>Se vi volis tion, simple "
+#~ "alklaku la butonoj <hilight>Apliki</hilight> aÅ­ <hilight>OK</"
+#~ "hilight><br>kaj viaj agordoj estos akceptataj. Alklaku <hilight>Rezigni</"
+#~ "hilight> se vi<br> ne certas kaj nenio estos influata."
+
+#~ msgid "Window name and class"
+#~ msgstr "Fenestra nomo kaj klaso"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Internaj Fenestroj"
+
+#~ msgid "Expand the window"
+#~ msgstr "Malvolvi la fenestron"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Permesi fenestran manuzon"
+
 #~ msgid "idle"
 #~ msgstr "senokupa"
 
diff --git a/po/es.gmo b/po/es.gmo
index 470c182..4866cc3 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 25dacfb..af13010 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,40 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-06-05 18:05+0000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-07-19 16:59+0000\n"
 "Last-Translator: DiegoJ <diegojromerolopez at gmail.com>\n"
 "Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Acerca de Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -51,15 +53,6 @@ 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-2008, por el equipo de desarrollo de Enlightenment."
-"<br><br>Esperamos que disfrute usando este software tanto como lo hicimos "
-"escribriéndolo.<br><br>Este software se distribuye tal cual sin garantía "
-"explícita o implicada. Este software es manejado por condiciones de "
-"licencia, asi que por favorvea los archivos COPYING y COPYING-PLAIN "
-"instalados en susistema.<br><br>Enlightenment esta bajo <hilight>INTENSO "
-"DESARROLLO</hilight> y probablemente no sea estable. Muchas caracteristicas "
-"estan incompletas o puede que incluso aun no existan, también puede tener "
-"muchos fallos. Ha sido  <hilight>¡ADVERTIDO!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -80,566 +73,566 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "¿Está seguro de que quiere matar esta ventana?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sí"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "¿Está seguro de que quiere salir?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Eligió salir de Enlightenment.<br><br>¿Está seguro de que quiere salir?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "¿Está seguro de que desea terminar la sesión?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Está a punto de desconectarse. <br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "¿Está seguro de que quiere apagar?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Pidió apagar su equipo.<br><br>¿Está seguro de querer hacerlo?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "¿Está seguro de que quiere reiniciar?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Pidió reiniciar su equipo.<br><br>¿Está seguro de que quiere reiniciarlo?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Pidió suspender su equipo.<br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "¿Está seguro de que quiere hibernar?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "Pidió hibernar su equipo.<br><br>¿Está seguro de que quiere hacerlo?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Ventana: Acciones"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menú"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menú de ventana"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Levantar"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Bajar"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Terminar"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Ventana: Estado"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Activar/Desactivar modo pegajoso"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Activar/Desactivar modo iconificado"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Activar/Desactivar modo a pantalla completa"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximizar a pantalla completa"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de maximizado \"inteligente\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de maximizado \"expandido\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de maximizado \"llenado\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra superior"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra inferior"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra izquierda"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra derecha"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Activar/Desactivar modo de sombra"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Activar/Desactivar estado sin bordes"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Activar/Desactivar estado fijo"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Voltear Escritorio al lado Izquierdo"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Voltear Escritorio al lado Derecho"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Voltear Escritorio para Arriba"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Voltear escritorio hacia abajo"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Voltear el escritorio por..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Mostrar escritorio"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Mostrar el contenedor"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Voltear el escritorio a..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Voltear el escritorio linealmente..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Cambiar al escritorio 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Cambiar al escritorio 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Cambiar al escritorio 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Cambiar al escritorio 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Cambiar al escritorio 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Cambiar al escritorio 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Cambiar al escritorio 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Cambiar al escritorio 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Cambiar al escritorio 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Cambiar al escritorio 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Cambiar al escritorio 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Cambiar al escritorio 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Cambiar al escritorio..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Voltear escritorio Izquierda (todas las pantallas)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Voltear escritorio derecha (todas las pantallas)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Voltear escritorio arriba (todas las pantallas)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Voltear escritorio abajo (todas las pantallas)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Voltear escritorio por... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Voltear escritorio a... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Voltear escritorio linealmente... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Girar el escritorio en dirección..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Cambiar al escritorio 0 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Cambiar al escritorio 1 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Cambiar al escritorio 2 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Cambiar al escritorio 3 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Cambiar al escritorio 4 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Cambiar al escritorio 5 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Cambiar al escritorio 6 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Cambiar al escritorio 7 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Cambiar al escritorio 8 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Cambiar al escritorio 9 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Cambiar al escritorio 10 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Cambiar al escritorio 11 (todas las pantallas)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Cambiar al escritorio... (todas las pantallas)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar ratón a la pantalla 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar ratón a la pantalla 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Enviar ratón a la pantalla..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar ratón 1 pantalla adelante"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar ratón 1 pantalla atrás"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar ratón adelante/atrás pantallas..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Ventana: moviendo"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Al escritorio siguiente"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Al escritorio anterior"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Por escritorio #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Al escritorio..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Mostrar menú principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Mostrar menú de favoritos"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Mostrar menú con todas las aplicaciones"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Mostrar menú de clientes"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Mostrar menú..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Lanzar"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Ejecutar"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplicación"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Salir"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Salir ahora"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Modo"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Activar/Desactivar modo presentación"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr ""
+msgstr "Activar/Desactivar modo desconexión"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Cerrar sesión"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Apagar ahora"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Apagar"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Bloquear"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Limpiar ventanas"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Acciones : Genéricas"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Acción retardada"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Poner como fondo de escritorio"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Escaneo de archivos de escritorio completado"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Escanear archivos del escritorio"
 
@@ -647,41 +640,40 @@ msgstr "Escanear archivos del escritorio"
 msgid "Color Selector"
 msgstr "Selector de color"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Aceptar"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -701,7 +693,7 @@ msgstr ""
 "reconfigurar las cosas a su<br>gusto. Disculpe por las dificultades creadas "
 "en su configuración.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -716,11 +708,11 @@ msgstr ""
 "precaución, su configuración ha sido restaurada a los<br>valores por "
 "defecto. Disculpe por las molestias.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Opciones mejoradas"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -732,7 +724,7 @@ msgstr ""
 "error es: <br>%s<br><br>. El fichero en cuestión ha sido borrado para evitar "
 "corrupción de datos.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -748,7 +740,7 @@ msgstr ""
 "<br><br>El archivo donde ocurrió el error es: <br>%s<br><br>Dicho archivo ha "
 "sido borrado para evitar corrupción de datos.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -761,7 +753,7 @@ msgstr ""
 "ser reemplazado.<br><br>El achivo donde ocurrió el error es:<br>%s<br><br> "
 "Dicho archivo ha sido eliminado para evitar corrupción de datos.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -775,7 +767,7 @@ msgstr ""
 "error es:<br>%s<br><br> Dicho archivo ha sido eliminado para evitar "
 "corrupción de datos.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -787,11 +779,11 @@ msgstr ""
 "ocurrió el error es:<br>%s<br><br> Dicho archivo ha sido eliminado para "
 "evitar corrupción de datos.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemas de escritura en las preferencias de Elightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -799,12 +791,12 @@ msgstr "Problemas de escritura en las preferencias de Elightenment"
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Básica"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -812,7 +804,7 @@ msgstr "Aplicar"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Módulos"
 
@@ -821,27 +813,27 @@ msgstr "Módulos"
 msgid "Extensions"
 msgstr "Complementos"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Contenedor %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Error - no hay soporte para PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "No hay soporte PAM dentro de Enlightenment, así<br>que el bloqueo del "
 "escritorio está deshabilitado."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Falló el bloqueo"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -849,15 +841,15 @@ msgstr ""
 "El bloqueo del escritorio falló porque alguna aplicación<br>ha capturado al "
 "ratón, al teclado o a ambos<br>y su captura no puede ser desactivada."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Introduzca su contraseña para desbloquear"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Error del sistema de autentificación"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -868,22 +860,25 @@ msgstr ""
 "autentificación. El código de error fue <hilight>%i</hilight>.<br>Esto es "
 "malo y no debería estar pasando. Por favor, avise de este error."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "¿Activar modo presentación?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Desbloqueó el escritorio demasiado rápido.<br><br>¿Quiere activar el modo "
+"<b>presentación</b> y desactivar  temporalmente el salvapantallas, el "
+"bloqueo y ahorro de energía?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "No, pero incrementar el tiempo de vencimiento"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "No, y parar de preguntar"
 
@@ -910,7 +905,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de entrada de escritorio"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -955,7 +950,7 @@ msgstr "Categorías"
 msgid "Mime Types"
 msgstr "Tipos MIME"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opciones"
 
@@ -987,23 +982,23 @@ msgstr "Elegir un icono"
 msgid "Select an Executable"
 msgstr "Elegir un ejecutable"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Pegar"
 
@@ -1011,24 +1006,24 @@ msgstr "Pegar"
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Error de ejecución"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Error de ejecución de aplicación"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1037,309 +1032,309 @@ msgstr ""
 "Enlightenment no pudo ejecutar la aplicación:<br><br>%s<br><br>La aplicación "
 "falló al iniciarse."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Error de ejecución de la aplicación"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s dejó de funcionar inesperadamente."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Se devolvió el código de salida %i desde %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, 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:450
+#: src/bin/e_exec.c:483
 #, 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:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s fue interrumpido por una señal de abortar."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s fue interrumpido por un error de coma flotante."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s fue interrumpido por una señal de matar ininterrumpible."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s fue interrumpido por una tubería rota."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s fue interrumpido por un error de Bus."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Informe de errores"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "No hubo mensaje de error"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Guardar el mensaje"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Información de error"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Información de señal de error"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Información de salida"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "No hubo salida"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Direccion inexistente"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s no existe."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr ""
+msgstr "Error al montar"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "No se puede montar el dispositivo"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr ""
+msgstr "Error al desmontar"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "No se puede desmontar el dispositivo"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr ""
+msgstr "Error al expulsar"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "No se puede expulsar el dispositivo"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i archivos"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Enlace"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Abortar"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Heredar configuración del padre"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modo de vista"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Actualizar vista"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Mostrar archivos ocultos"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Recordar orden"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Ordenar ahora"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nuevo directorio"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renombrar"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "Desmontar"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr ""
+msgstr "Montar"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
-msgstr ""
+msgstr "Expulsar"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propiedades"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Usar por defecto"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Iconos de malla"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Iconos personalizados"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Tamaño de icono (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Poner como fondo..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Crear un nuevo directorio"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nombre del nuevo directorio:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renombrar %s a:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renombrar archivo"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Reintentar"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Error"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "No a todos"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Sí a todos"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "El archivo ya existe, ¿desea sobrescribirlo? <br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorar éste"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Ocurrió un error mientras se finalizaba la operación.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmar eliminación"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "¿Está seguro de que quiere eliminar<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1352,144 +1347,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Propiedades del archivo"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Archivo:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Última modificación:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tipo de archivo:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permisos:"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Propietario:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Otros pueden leer"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Otros pueden escribir"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "El propietario puede leer"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "El propietario puede escribir"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personalizado"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Usar este icono para los archivos de este tipo"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Información del enlace"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Elija una imagen"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volumen desconocido"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Dispositivo extraíble"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Recorte"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Desplazar el contenido automáticamente"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Puede cambiar de tamaño"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Comenzar a mover/cambiar tamaño de este gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Eliminar este gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/cambiar tamaño del dispositivo"
 
@@ -1501,7 +1500,7 @@ msgstr ""
 "Una instancia previa de Enlightenment está activa todavía\n"
 "en esta pantalla. Abortando el inicio.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Bloqueos de ventanas"
 
@@ -1536,21 +1535,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Apilamiento"
 
@@ -1559,12 +1558,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:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Pegajosidad"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Estado de fijación"
 
@@ -1573,7 +1572,7 @@ msgid "Maximized state"
 msgstr "Estado maximizado"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Estado de pantalla completa"
 
@@ -1581,7 +1580,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Estilo del borde"
 
@@ -1629,115 +1628,116 @@ msgstr "Despegar del escritorio"
 msgid "More..."
 msgstr "Más..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimizar"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximizado vertical"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximizado horizontal"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Acceso rápido de teclado"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Al menú de Favoritos"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Al lanzador"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Borde"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Omitir"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Estado"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Recordar"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propiedades de ventana"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Siempre arriba"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Siempre debajo"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Elegir estilo del borde"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Usar las preferencias de iconos de e17 de forma predeterminada"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Usar icono de la aplicación "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Usar los iconos definidos por el usuario"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Sombreado"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Pegajoso"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista de ventanas"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Paginador"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Barra de tareas"
 
@@ -1753,7 +1753,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propiedades de ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Título"
 
@@ -1845,11 +1845,11 @@ msgstr "Propiedades de NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Ignorar la barra de tareas"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Ignorar paginador"
 
@@ -1857,15 +1857,15 @@ msgstr "Ignorar paginador"
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Recordar ventana"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Las propiedades de la ventana no son únicas"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1890,11 +1890,11 @@ msgstr ""
 "configuración será aceptada. Presione <hilight>Cancelar</hilight> si "
 "no<br>está seguro y no se cambiará nada."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "No hay un conjunto de propiedades similares"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1906,115 +1906,101 @@ msgstr ""
 "especificar cómo recordarlas</hilight>.<br><br>Debe especificar al menos una "
 "forma de recordar para esta ventana."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Le está pidiendo a Enlightenment que recuerde aplicar a una "
-"ventana<br>propiedades (como el tamaño, lugar, estilo del borde, etc.)"
-"<br>que <hilight>no tienen propiedades únicas</hilight> <br><br>Esto "
-"significa que comparte el nombre/clase, tiempo, rol, etc., con más de una "
-"ventana en la pantalla y que las propiedades<br>recordadas para esta ventana "
-"se aplicarán a todas las otras ventanas<br>que compartan estas propiedades."
-"<br><br>Quizá quiera habilitar la opción <hilight>Coincidir sólo una "
-"ventana</hilight> si<br>quiere que sólo una instancia de esta ventana sea "
-"modificada, sin que <br>las otras instancias sean modificadas.<br><br>Esta "
-"es sólo una advertencia en caso de que no quiera que esto ocurra .<br>Si lo "
-"quiere, simplemente pulse el botón <hilight>Aplicar</hilight> o "
-"<hilight>Aceptar</hilight><br>y su configuración serán aceptadas. Pulse "
-"<hilight>Cancelar</hilight> si<br>no está seguro y nada será afectado."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Tamaño y posición"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Bloqueos"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Tamaño, posición y bloqueos"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Todo"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Recordar usos"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nombre y clase de la ventana"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Rol de la ventana"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tipo de ventana"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Tiempo"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propiedades para recordar"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Preferencia de iconos"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Escritorios virtuales"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Pantalla actual"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Omitir lista de ventanas"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Coincidir sólo una ventana"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Iniciar este programa al identificarse"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Siempre enfocar al iniciar"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Iniciar este programa al identificarse"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Preferencias"
@@ -2033,24 +2019,24 @@ msgstr "Contenedor"
 msgid "Module Settings"
 msgstr "Opciones de módulo"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Módulos disponibles"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Cargar módulo"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Módulos cargados"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Descargar módulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2084,8 +2070,8 @@ msgstr "Eliminar gadget"
 msgid "Toolbar Settings"
 msgstr "Preferencias de barra de herramientas"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Diseño"
 
@@ -2112,12 +2098,12 @@ msgid "Favorite Applications"
 msgstr "Aplicaciones favoritas"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2126,7 +2112,7 @@ msgstr "Aplicaciones"
 msgid "Windows"
 msgstr "Ventanas"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Ventanas perdidas"
 
@@ -2162,129 +2148,128 @@ msgstr "(Sin aplicaciones)"
 msgid "Set Virtual Desktops"
 msgstr "Asignar escritorios virtuales"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Sin ventanas)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "¡Sin nombre!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Sin contenedores)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Contenedor #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Agregar un contenedor"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Eliminar un contenedor"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Opciones del contenedor"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Diminuto"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medio"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Enorme"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Asignar contenidos..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Sobre todo"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Debajo de las ventanas"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Debajo de todo"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Permitir a las ventanas superponerse al contenedor"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Ajustar al tamaño del contenido"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f píxeles"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Ocultar automáticamente"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Ocultar el contenedor automáticamente"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Mostrar cuando el ratón esté dentro"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Mostrar al apretar el botón del ratón"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Tiempo para ocultar"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Ocultar duración"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Mostrar en todos los escritorios"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Mostrar en escritorios específicos"
 
@@ -2505,7 +2490,7 @@ msgstr "Iniciando soporte internacional"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment no puede iniciar su sistema internacional"
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2513,11 +2498,11 @@ msgstr ""
 "Enlightenment no puede iniciar su pantalla de inicio.\n"
 "¿Quizás no tiene suficiente memoria?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Probando el soporte del formato"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2526,7 +2511,7 @@ msgstr ""
 "Verifique\n"
 "si Evas tiene el soporte del motor de búfer por software.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2535,7 +2520,7 @@ msgstr ""
 "Evas tiene soporte\n"
 "para cargar imágenes PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2544,7 +2529,7 @@ msgstr ""
 "Evas tiene soporte\n"
 "para cargar imágenes JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2553,7 +2538,7 @@ msgstr ""
 "Evas tiene soporte\n"
 "para cargar imágenes EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2563,11 +2548,11 @@ msgstr ""
 "que Evas tiene soporte\n"
 "para fontconfig  y el sistema fontconfig define una fuente 'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Configurar pantallas"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2576,194 +2561,194 @@ msgstr ""
 "sus pantallas.\n"
 "¿Quizás hay otro manejador de ventanas ejecutándose?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Preparando salvapantallas"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment no puede configurar el salvapantallas de X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Configurar bloqueo de escritorio"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment no puede configurar su sistema para bloquear el escritorio."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Configurando rutas"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Configurar controles del sistema"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment no puede iniciar el sistema de órdenes del sistema.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Configurar acciones"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment no puede iniciar su sistema de acciones."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Preparando el sistema de ejecución"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment no puede iniciar su sistema de ejecución."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Configuración de memoria"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment no puede iniciar su sistema de recuerdos."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Preparando FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment no puede inicializar el manejador de archivos.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Preparando el sistema de mensajes"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment no puede iniciar sus sistema de mensajes."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Preparando DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment no puede iniciar su sistema de dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment no puede iniciar su sistema de manejadores de apropiación de "
 "entradas."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Configurar módulos"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment no puede iniciar su sistema de módulos."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Configuración de memoria"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment no puede iniciar su sistema de recuerdos."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Configurar clases de color"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment no puede iniciar su sistema de clases de color."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Configurar control de dispositivos"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment no puede configurar sus sistema de control."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Preparando DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment no puede configurar las opciones de DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Configurar modos de ahorro de energía"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment no puede configurar los modos de ahorro de energía."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Preparando el fondo de escritorio"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment no puede iniciar su sistema fondo de escritorio."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Configurar ratón"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenement no puede configurar las preferencias del ratón."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Preparando vinculos"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment no puede iniciar su sistema de vínculos."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Preparando Ventanas emergentes"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment no puede iniciar su sitema de ventanas emergentes."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Configurar contenedores"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment no puede configurar su sistema de contenedores."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Preparando el miniaturizador"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment no puede iniciar el sistema de miniaturas.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Preparando el orden de archivos"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 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:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Cargar módulos"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2775,11 +2760,11 @@ msgstr ""
 "cualquier problema<br> de los módulos en su configuración. El diálogo de "
 "configuración<br>de módulos le permitirá elegir nuevamente<br>sus módulos."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment se bloqueó al comenzar y fue reiniciado."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2791,15 +2776,15 @@ msgstr ""
 "cualquier problema<br> de los módulos en su configuración. El diálogo de "
 "configuración<br>de módulos le permitirá elegir nuevamente<br>sus módulos."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Configurar contenedores"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Casi terminado"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2808,11 +2793,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Error cargando un Módulo"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2824,11 +2809,11 @@ msgstr ""
 "El error producido fué:\n"
 "%s"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Los módulos no contienen todas las funciones necesarias"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2839,12 +2824,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s de Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "¿Quiere deshabilitar este módulo?"
 
@@ -2855,29 +2840,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Está seguro de que quiere borara este contenedor?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Eligió borrar este contenedor.<br><br>¿Está seguro de querer borrarlo?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Comenzar mover/cambiar tamaño de los elementos"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr ""
+msgstr "Asignar contenidos del estante"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Borrar el contenedor"
 
@@ -2894,11 +2879,11 @@ msgstr "Comprobando permisos del sistema"
 msgid "System Check Done"
 msgstr "Comprobación del sistema terminada"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problemas al salir"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2908,31 +2893,31 @@ msgstr ""
 "niegan a cerrarse.<br>¿Quiere terminar de salir<br>sin cerrar estas "
 "aplicaciones<br>antes?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Salir ya"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Esperar más"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Cancelar salida"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Salida en progreso"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Saliendo.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment está ocupado con otra petición"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2940,7 +2925,7 @@ msgstr ""
 "Saliendo.<br>No puede realizar otras acciones de sistema<br>cuando se está "
 "cerrando sesión."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2948,7 +2933,7 @@ msgstr ""
 "Apagando.<br>No puede ejecutar acciones de sistema<br>una vez que el proceso "
 "de apagado ha comenzado."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2956,7 +2941,7 @@ msgstr ""
 "Reiniciando.<br>No puede ejecutar acciones de sistema<br>después de comenzar "
 "un reinicio."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2964,7 +2949,7 @@ msgstr ""
 "Suspendiendo.<br>No puede ejecutar acciones de sistema<br>después de "
 "comenzar una suspensión."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2972,55 +2957,55 @@ msgstr ""
 "Hibernando.<br>No puede ejecutar acciones de sistema<br>después de comenzar "
 "una hibernación."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "¡EEK! Esto no debería pasar"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "El apagado falló."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "El reinicio falló."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "La suspensión falló."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "La hibernación falló."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Apagar."
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Apagando.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Reiniciando"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Reiniciando.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Suspendiendo"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspendiendo.<br><hilight>Espere, por favor.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernando"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernando.<br><hilight>Espere, por favor.</hilight>"
 
@@ -3036,11 +3021,11 @@ msgstr "Elegir como tema"
 msgid "Set Toolbar Contents"
 msgstr "Seleccionar contenido de barra de herramientas"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "No se puede salir - ventanas inmortales"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3051,77 +3036,77 @@ msgstr ""
 "ventanas<br>hayan sido cerradas o se les haya quitado el bloqueo de ciclo de "
 "vida.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "En el futuro"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "En el último minuto"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "hace %li años"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "hace %li meses"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "hace %li semanas"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "hace %li días"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "hace %li horas"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "hace %li minutos"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3141,51 +3126,51 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Añadir a favoritos"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Subir un directorio"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permisos:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Usted"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Sólo lectura"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lectura-Escritura"
 
@@ -3201,57 +3186,57 @@ msgstr "Configuración básica"
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta cuando la batería esté baja"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Comprobar cada:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f ticks"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Sondeo"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Mostrar alerta de batería baja"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Mostrar alerta cuando:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Auto descartar en..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f seg"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Alerta"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Auto Detectar"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3259,12 +3244,12 @@ msgstr "Auto Detectar"
 msgid "Internal"
 msgstr "Interna"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3272,24 +3257,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Batería"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "¡Bateria baja!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Se recomienda corriente directa."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Medidor de batería"
 
@@ -3297,20 +3282,20 @@ msgstr "Medidor de batería"
 msgid "Clock"
 msgstr "Reloj"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Panel de opciones"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Presentación"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Modos"
 
@@ -3336,7 +3321,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar aplicaciones"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Todas las aplicaciones"
 
@@ -3358,12 +3343,12 @@ msgstr "Otro iBar"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menúes"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Estilo del borde predeterminado"
 
@@ -3371,14 +3356,14 @@ msgstr "Estilo del borde predeterminado"
 msgid "Window Border Selection"
 msgstr "Selección del borde de la ventana"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Recordar los bordes para esta ventana la próxima vez que aparezca"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3404,7 +3389,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3499,7 +3484,7 @@ msgstr "Título del borde"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Settings Dialog Title"
-msgstr ""
+msgstr "Título del diálogo de preferencias"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3672,9 +3657,9 @@ msgid "Desktop Name"
 msgstr "Nombre del ecritorio"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -3685,7 +3670,7 @@ msgstr "Fondo de pantalla del escritorio"
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
 msgid "Set"
-msgstr ""
+msgstr "Asiganr"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
@@ -3740,10 +3725,10 @@ msgstr "%1.0f minutos"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personal"
@@ -3775,8 +3760,8 @@ msgstr "Mostrar en la zona de la pantalla #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3898,46 +3883,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Escritorios virtuales"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Opciones de diálogo"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Opciones generales"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Deshabilitar diálogos de confirmación"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Ventanas normales"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Modo básico"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Modo avanzado"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Modo de diálogo predeterminado"
 
@@ -4005,31 +3995,31 @@ msgstr "Restaurar"
 msgid "Screen Resolution Settings"
 msgstr "Opciones de resolución de la pantalla"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaurar al inicio"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotación"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Espejando"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Características faltantes"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4043,11 +4033,11 @@ msgstr ""
 "también pasara que en el momento<br> en el que se compilase <hilight>ecore</"
 "hilight> no se detectase<br> el soporte para XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "No se encontraron tasas de refresco"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4107,7 +4097,7 @@ msgid "Power Management"
 msgstr "Manejo de la energía"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4117,78 +4107,80 @@ msgstr "<None>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Por favor, seleccione un borde,<br>o haga click en <hilight>Cerrar</hilight> "
-"para abortar.<br><br>Para cambiar el retardo de esta acción,<br>use el "
-"deslizador:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Preferencias de vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Agregar Borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Eliminar Borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Modificar Borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Borrar todas"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Restaurar atajos predeterminados"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parámetros de la acción"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Opciones Generales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Permitir activación de vinculaciones en ventallas a pantalla completa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Secuencia de vinculaciones de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f segundos"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Error de vinculación de borde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4197,27 +4189,27 @@ msgstr ""
 "La combinación de teclas que eligió ya se está usando por <br>la "
 "acción<hilight>%s</hilight>.<br>Por favor, elija otra combinación de teclas."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "Super"
 
@@ -4515,18 +4507,17 @@ msgstr "Realmente grande"
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Habilitar clases de fuentes personalizadas"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Previsualización básica de texto: 123: 我的天空!"
 
@@ -4534,38 +4525,50 @@ msgstr "Previsualización básica de texto: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Clases de fuentes"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Habilitar clases de fuente"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Previsualización avanzada de texto.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Sugiriendo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Fuentes de apoyo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nombre del apoyo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Habilitar apoyos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Previsualización avanzada de texto.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4579,7 +4582,7 @@ msgstr "Temas de iconos"
 msgid "Icon theme overrides general theme"
 msgstr "El tema de iconos sobrescribe el tema general"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema de icono"
 
@@ -4650,7 +4653,7 @@ msgstr ""
 "Enlightenment n pudo importar la configuración<br>por un error de copia."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Idioma"
 
@@ -4824,7 +4827,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Autodesplazar margen del cursor"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Otras opciones"
 
@@ -5003,24 +5006,24 @@ msgstr "Tamaño del cursor"
 msgid "Mouse Cursor"
 msgstr "Cursor del mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Opciones del mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Localización de la mano"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Aceleración del mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Aceleración"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Umbral"
 
@@ -5037,7 +5040,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:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temas"
 
@@ -5137,33 +5140,33 @@ msgstr "%1.0f colecciones"
 msgid "Performance"
 msgstr "Rendimiento"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Selector de perfiles"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Perfiles disponibles"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Seleccionar un perfil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Quiere eliminar el perfil \"%s\".<br><br>¿Está seguro?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "¿Borrar OK?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Agregar perfil nuevo"
 
@@ -5327,23 +5330,23 @@ msgstr "Inicio"
 msgid "Theme Selector"
 msgstr "Selector de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Importar..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " En linea..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Categoría de temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Asignar"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Limpiar todo"
 
@@ -5399,38 +5402,38 @@ msgid "Wallpaper Settings"
 msgstr "Opciones de fondo de pantalla"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Usar el fondo de pantalla del tema"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Imagen..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradiente..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "En linea..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Donde ubicar el fondo de pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Todos los escritorios"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Este escritorio"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Esta pantalla"
 
@@ -5451,14 +5454,14 @@ msgid "Fill Options"
 msgstr "Opciones de llenado"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5523,38 +5526,38 @@ msgstr "Usar archivo original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Elija una imagen..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Error al importar imagen"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment no pudo importar la imagen<br>porque hubo errores de "
 "conversión."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Error importando el fondo de pantalla"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5562,7 +5565,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Intercambiar papel tapiz"
 
@@ -5674,14 +5677,6 @@ msgstr "Ícono definido por el usuario"
 msgid "Prefer application provided icon"
 msgstr "Preferir el icono proveído por la aplicación"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Ventanas internas"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Siempre recordar las ventanas internas"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Opciones de foco"
@@ -5815,17 +5810,12 @@ msgid "Window Maximize Policy"
 msgstr "Política de maximizado de ventanas"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expansión inteligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Expandir la ventana"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Llenar el espacio disponible"
 
@@ -5833,19 +5823,19 @@ msgstr "Llenar el espacio disponible"
 msgid "Maximize Policy"
 msgstr "Política de maximizado"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Direcciones de maximado"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Ambos"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Permitir manejo de ventanas"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Mover/redimensionar ventanas automáticamente cuando se esconda el contenedor"
@@ -5887,49 +5877,57 @@ msgstr "Levantar cuando se empieza a mover o cambiar el tamaño"
 msgid "Raise when clicking to focus"
 msgstr "Levantar cuando se elija para foco"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Memoria de la ventana"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Memoria (s) de borrado"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detalles"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<No Name>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Clase:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<No Class>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titulo:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<No Title>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Papel:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<No Role>"
 
@@ -6302,7 +6300,7 @@ msgid "Show Toolbar"
 msgstr "Mostrar barra de herramientas"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Comportamiento"
 
@@ -6312,101 +6310,101 @@ msgstr "Mostrar los iconos HAL del escritorio"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "Montar volúmenes al insertar"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Abrir gestor de archivos al montar"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Ir al directorio padre"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Otra aplicación..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Abrir con..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Aplicaciones conocidas"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Aplicaciones específicas"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Comando personalizado"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Copia abortada"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Eliminación borrada"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
-msgstr ""
+msgstr "Abortada la operación desconocida del esclavo"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "Copia de %s completada"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "Copiando %s (tiempo estimado: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "Moviendo %s (tiempo estimado: %d s)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
-msgstr ""
+msgstr "Eliminación completada"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr ""
+msgstr "Eliminando archivos..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6415,33 +6413,33 @@ msgstr ""
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
 msgid "(no information)"
-msgstr ""
+msgstr "(sin información)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
 #, c-format
 msgid "File: %s"
-msgstr ""
+msgstr "Archivo: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "De: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "A: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "Procesando %d operación(es)"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr ""
+msgstr "El gestor de archivos está ocioso"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "Inf. de la operación EFM"
 
@@ -6479,19 +6477,19 @@ msgstr "Fondo"
 msgid "Gadgets"
 msgstr "Herramientas"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Libre"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Siempre sobre el escritorio"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Al presionar arriba"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Agregar otras herramientas"
 
@@ -6528,7 +6526,7 @@ msgstr "Fuente de la barra seleccionada"
 msgid "Icon Labels"
 msgstr "Etiquetas del icono"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Mostrar etiqueta del icono"
 
@@ -6589,43 +6587,43 @@ msgstr "Crear Un Icono Nuevo"
 msgid "Add Application"
 msgstr "Añadir Aplicación"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Configuraciones de IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Mostrar nombre"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Mostrar título"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Mostrar clase"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Mostrar nombre del icono"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Mostrar Información del Borde"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Mostrar ventanas de todas las pantallas"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Mostrar ventanas de la pantalla actual"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Mostrar ventanas de todos los escritorios"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Mostrar ventanas del escritorio activo"
 
@@ -6645,11 +6643,11 @@ msgstr "Cambiar de escritorios con la rueda del mouse"
 msgid "Show desktop names"
 msgstr "Mostrar los nombres de los escritorios"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Opciones del paginador emergente"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Mostrar emergente al cambiar de escritorio"
 
@@ -6657,69 +6655,69 @@ msgstr "Mostrar emergente al cambiar de escritorio"
 msgid "Show popup for urgent windows"
 msgstr "Mostrar emergente en ventanas urgentes"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Botón para Elegir y Desplazar"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Pulsa para establecer"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Botón de Arrastrar y Soltar"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Arrastrar escritorios completos"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Acción de teclado altura de emerger"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Resistencia al arrastre"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Altura del paginador emergente"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Velocidad a que emerge"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Opciones urgentes de ventanas"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Mostrar menú emergente en ventana urgente"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Emerge al pegarse en la pantalla ventanas urgentes"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Botón para obtener del Paginador"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6727,11 +6725,11 @@ msgstr ""
 "Presione un botón del mouse.<br>Presione <hilight>Escape</hilight> para "
 "abortar<br>o <hilight>Supr</hilight> para restaurar el botón."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Atención"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6741,29 +6739,29 @@ msgstr ""
 "ya esta tomado por un<br>código interno para menús contextuales. <br>Este "
 "botón solo funciona en lo Emergente"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Botón %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Mostrar Paginador Emergente"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Emerger Escritorio Derecha"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Emerger Escritorio Izquierda"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Emerger Escritorio Arriba"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Emerger Escritorio Abajo"
 
@@ -6887,7 +6885,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6899,15 +6897,15 @@ msgstr "Siguiente"
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenido a Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Seleccione uno"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6957,15 +6955,15 @@ msgstr "Clic sobre ventana el hace tomar el foco"
 msgid "Mouse over focuses windows"
 msgstr "Ratón sobre ventana le hace tomar el foco"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Selecciones los Iconos a Agregar"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Inicio rápido"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Seleccione Aplicaciones"
 
@@ -7090,18 +7088,21 @@ msgstr "Dispositivo especifico"
 msgid "Networks"
 msgstr "Redes"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Otra bandeja del sistema sale"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Sólo puede haber un gadget en la bandeja de sistema y ya existe otro."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Bandeja de sistema"
 
+#~ msgid "Window name and class"
+#~ msgstr "Nombre y clase de la ventana"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar escritorios virtuales"
 
@@ -7126,11 +7127,14 @@ msgstr "Bandeja de sistema"
 #~ msgid "Configure Heading"
 #~ msgstr "Configurar encabezamiento"
 
-#~ msgid "Scaling Factors"
-#~ msgstr "Factores de escala"
+#~ msgid "Internal Windows"
+#~ msgstr "Ventanas internas"
 
-#~ msgid "Personal scaling factor"
-#~ msgstr "Factor de escala personal"
+#~ msgid "Expand the window"
+#~ msgstr "Expandir la ventana"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Permitir manejo de ventanas"
 
 #~ msgid "Custom Grid Icons"
 #~ msgstr "Iconos de malla personalizados"
@@ -7138,12 +7142,44 @@ msgstr "Bandeja de sistema"
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Iconos de malla inteligentes personalizados"
 
+#~ msgid "Scaling Factors"
+#~ msgstr "Factores de escala"
+
+#~ msgid "Personal scaling factor"
+#~ msgstr "Factor de escala personal"
+
 #~ msgid "Mount of device failed"
 #~ msgstr "Fallo al montar dispositivo"
 
-#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
 #~ msgstr ""
-#~ "Cambiar de escritorios cuando el mouse llegue al borde de la pantalla"
+#~ "Le está pidiendo a Enlightenment que recuerde aplicar a una "
+#~ "ventana<br>propiedades (como el tamaño, lugar, estilo del borde, etc.)"
+#~ "<br>que <hilight>no tienen propiedades únicas</hilight> <br><br>Esto "
+#~ "significa que comparte el nombre/clase, tiempo, rol, etc., con más de una "
+#~ "ventana en la pantalla y que las propiedades<br>recordadas para esta "
+#~ "ventana se aplicarán a todas las otras ventanas<br>que compartan estas "
+#~ "propiedades.<br><br>Quizá quiera habilitar la opción <hilight>Coincidir "
+#~ "sólo una ventana</hilight> si<br>quiere que sólo una instancia de esta "
+#~ "ventana sea modificada, sin que <br>las otras instancias sean modificadas."
+#~ "<br><br>Esta es sólo una advertencia en caso de que no quiera que esto "
+#~ "ocurra .<br>Si lo quiere, simplemente pulse el botón <hilight>Aplicar</"
+#~ "hilight> o <hilight>Aceptar</hilight><br>y su configuración serán "
+#~ "aceptadas. Pulse <hilight>Cancelar</hilight> si<br>no está seguro y nada "
+#~ "será afectado."
 
 #~ msgid "Defined Command"
 #~ msgstr "Comando Definido"
@@ -7163,44 +7199,114 @@ msgstr "Bandeja de sistema"
 #~ msgid "Desktop Lock"
 #~ msgstr "Bloquear Escritorio"
 
-#~ msgid "Shutting down of your system failed."
-#~ msgstr "Falló el apagado de su sistema"
+#~ msgid ""
+#~ "Configuration data needed upgrading. Your old configuration<br>has been "
+#~ "wiped and a new set of defaults initialized. This<br>will happen "
+#~ "regularly during development, so don't report a<br>bug. This simply means "
+#~ "Enlightenment needs new configuration<br>data by default for usable "
+#~ "functionality that your old<br>configuration simply lacks. This new set "
+#~ "of defaults will fix<br>that by adding it in. You can re-configure things "
+#~ "now to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+#~ msgstr ""
+#~ "Los datos de configuración necesitan ser actualizados. "
+#~ "Tu<br>configuración 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>"
 
-#~ msgid "Rebooting your system failed."
-#~ msgstr "Falló el reinicio de su sistema"
+#~ msgid ""
+#~ "Your configuration is NEWER than Enlightenment. This is very<br>strange. "
+#~ "This should not happen unless you downgraded<br>Enlightenment or copied "
+#~ "the configuration from a place where<br>a newer version of Enlightenment "
+#~ "was running. This is bad and<br>as a precaution your configuration has "
+#~ "been now restored to<br>defaults. Sorry for the inconvenience.<br>"
+#~ msgstr ""
+#~ "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 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>"
 
-#~ msgid "Suspend of your system failed."
-#~ msgstr "Falló la suspensión de su sistema"
+#~ msgid "Desktop %i, %i"
+#~ msgstr "Escritorio %i, %i"
 
-#~ msgid "Shutting down"
-#~ msgstr "Apagando"
+#~ msgid "Configuration Upgraded"
+#~ msgstr "Configuración Actualizada"
 
-#~ msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
-#~ msgstr "Apagando su computadora.<br><hilight>Espere por favor</hilight>"
+#~ 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 ""
+#~ "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>"
 
-#~ msgid "Rebooting"
-#~ msgstr "Reiniciando"
+#~ msgid ""
+#~ "Enlightenment's configuration files are too big<br>for the file system "
+#~ "they are being saved to.<br>This error is very strange as the files "
+#~ "should<br>be extremely small. Please check the settings<br>for your home "
+#~ "directory.<br><br>The file where the error occured was:<br>%s<br><br>This "
+#~ "file has been deleted to avoid corrupt data.<br>"
+#~ msgstr ""
+#~ "Los archivos de configuración de Enlightenment son muy grandes<br>para el "
+#~ "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 la corrupción de los datos.<br>"
 
-#~ msgid "Advanced Settings"
-#~ msgstr "Configuraciones avanzadas"
+#~ msgid ""
+#~ "An output error occured when writing the configuration<br>files for "
+#~ "Enlightenment. Your disk is having troubles<br>and possibly needs "
+#~ "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 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 la "
+#~ "corrupción de datos.<br>"
 
-#~ msgid "%1.0f percent"
-#~ msgstr "%1.0f por ciento"
+#~ msgid ""
+#~ "Enlightenment cannot write its configuration file<br>because it ran out "
+#~ "of space to write the file.<br>You have either run out of disk space or "
+#~ "have<br>gone over your quota limit.<br><br>The file where the error "
+#~ "occured 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>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 la corrupción de los datos.<br>"
 
 #~ msgid ""
-#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
-#~ "this profile?"
+#~ "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 ""
-#~ "Pidio borrar  \"%s\".<br><br>¿Está seguro de querer borrar este perfil?"
+#~ "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>"
 
-#~ msgid "Are you sure you want to delete this profile?"
-#~ msgstr "¿Está seguro de querer borrar este perfil?"
+#~ msgid "Enlightenment Configuration Write Problems"
+#~ msgstr "Problemas en la escritura de la configuración de Enlightenment"
 
-#~ msgid "Plain Profile"
-#~ msgstr "Perfil plano"
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
 
-#~ msgid "Clone Current Profile"
-#~ msgstr "Clonar el perfil actual"
+#~ msgid "Toolbar Configuration"
+#~ msgstr "Configuración de la barra de herramientas"
 
 #~ msgid "Lock Screen"
 #~ msgstr "Bloquear pantalla"
@@ -7208,169 +7314,173 @@ msgstr "Bandeja de sistema"
 #~ msgid "Logout"
 #~ msgstr "Salir"
 
-#~ msgid "Desktop %i, %i"
-#~ msgstr "Escritorio %i, %i"
-
-#~ msgid "Configuration Upgraded"
-#~ msgstr "Configuración Actualizada"
-
-#~ msgid "Configuration"
-#~ msgstr "Configuración"
-
-#~ msgid "Toolbar Configuration"
-#~ msgstr "Configuración de la barra de herramientas"
-
 #~ msgid "Shelf Configuration"
 #~ msgstr "Configuración del contenedor"
 
-#~ msgid "Enlightenment Configuration"
-#~ msgstr "Configuración de Enlightenment"
-
-#~ msgid "Items"
-#~ msgstr "Elementos"
+#~ msgid ""
+#~ "Options:\n"
+#~ "\t-display DISPLAY\n"
+#~ "\t\tConnect to display named DISPLAY.\n"
+#~ "\t\tEG: -display :1.0\n"
+#~ "\t-fake-xinerama-screen WxH+X+Y\n"
+#~ "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+#~ "\t\tgiven the geometry. Add as many as you like. They all\n"
+#~ "\t\treplace the real xinerama screens, if any. This can\n"
+#~ "\t\tbe used to simulate xinerama.\n"
+#~ "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
+#~ "+800+0\n"
+#~ "\t-profile CONF_PROFILE\n"
+#~ "\t\tUse the configuration profile CONF_PROFILE instead of the user "
+#~ "selected default or just \"default\".\n"
+#~ "\t-good\n"
+#~ "\t\tBe good.\n"
+#~ "\t-evil\n"
+#~ "\t\tBe evil.\n"
+#~ "\t-psychotic\n"
+#~ "\t\tBe psychotic.\n"
+#~ msgstr ""
+#~ "Opciones:\n"
+#~ "\t-display DISPLAY\n"
+#~ "\t\tConecta al display DISPLAY.\n"
+#~ "\t\tEJ: -display :1.0\n"
+#~ "\t-fake-xinerama-screen WxH+X+Y\n"
+#~ "\t\tAñade una pantalla xinerama FALSA (en lugar de la real)\n"
+#~ "\t\tdada una geometría. Añade todas las que quieras. Todas\n"
+#~ "\t\tellas reemplazan las pantallas xinerama reales, si existen. Esto se\n"
+#~ "\t\tpuede usar para simular xinerama.\n"
+#~ "\t\tEJ: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
+#~ "+800+0\n"
+#~ "+0\n"
+#~ "\t-profile CONF_PROFILE\n"
+#~ "\t\tUsar el perfil de la configuración CONF_PROFILE en lugar del del "
+#~ "usuario elija el predeterminado o sólo \"default\".\n"
+#~ "\t-good\n"
+#~ "\t\tSea bueno.\n"
+#~ "\t-devil\n"
+#~ "\t\tSer un demonio.\n"
+#~ "\t-psychotic\n"
+#~ "\t\tSer psicótico.\n"
 
-#~ msgid "Configuration Panel"
-#~ msgstr "Panel de configuración"
+#~ msgid "Shutting down of your system failed."
+#~ msgstr "Falló el apagado de su sistema"
 
-#~ msgid "Default Configuration Dialogs Mode"
-#~ msgstr "Modo de configuración de diálogos predeterminado"
+#~ msgid "Rebooting your system failed."
+#~ msgstr "Falló el reinicio de su sistema"
 
-#~ msgid "Input Method Configuration"
-#~ msgstr "Configuración del método de entrada"
+#~ msgid "Suspend of your system failed."
+#~ msgstr "Falló la suspensión de su sistema"
 
-#~ msgid "Language Configuration"
-#~ msgstr "Configuración del idioma"
+#~ msgid "Shutting down"
+#~ msgstr "Apagando"
 
-#~ msgid "Keyboard & Mouse"
-#~ msgstr "Mouse y teclado"
+#~ msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
+#~ msgstr "Apagando su computadora.<br><hilight>Espere por favor</hilight>"
 
-#~ msgid "Search Path Configuration"
-#~ msgstr "Configuración de la ruta de búsqueda"
+#~ msgid "Rebooting"
+#~ msgstr "Reiniciando"
 
-#~ msgid "Dropshadow Configuration"
-#~ msgstr "Configuración de la sombra"
+#~ msgid "Battery Monitor Configuration"
+#~ msgstr "Configuración del monitor de batería"
 
-#~ msgid "Fileman Configuration Updated"
-#~ msgstr "Configuración de Fileman actualizada"
+#~ msgid "Advanced Settings"
+#~ msgstr "Configuraciones avanzadas"
 
-#~ msgid "IBar Configuration"
-#~ msgstr "Configuración del IBar"
+#~ msgid "%1.0f percent"
+#~ msgstr "%1.0f por ciento"
 
-#~ msgid "IBox Configuration"
-#~ msgstr "Configuración de iBox"
+#~ msgid "Dismiss alert automatically"
+#~ msgstr "Omitir alerta automaticamente"
 
-#~ msgid "Pager Configuration"
-#~ msgstr "Configuración del paginador"
+#~ msgid "Dismiss alert after:"
+#~ msgstr "Omitir alerta despues de:"
 
-#~ msgid "Virtual Desktops Configuration"
-#~ msgstr "Configuración de Escritorios virtuales"
+#~ msgid "Enlightenment Configuration"
+#~ msgstr "Configuración de Enlightenment"
 
-#~ msgid "Temperature Configuration"
-#~ msgstr "Configuración de temperatura"
+#~ msgid "Items"
+#~ msgstr "Elementos"
 
-#~ msgid "Back"
-#~ msgstr "Atrás"
+#~ msgid "Configuration Panel"
+#~ msgstr "Panel de configuración"
 
-#~ msgid "Choose Language"
-#~ msgstr "Escoja el idioma"
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr ""
+#~ "Cambiar de escritorios cuando el mouse llegue al borde de la pantalla"
 
-#~ msgid "X reports there are no root windows and %i screens!\n"
-#~ msgstr "¡X informa que no hay ventanas raíz y %i pantallas!\n"
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr ""
+#~ "Cambiar de escritorios cuando el mouse llegue al borde de la pantalla"
 
-#~ msgid "Disable this splash screen in the future?"
-#~ msgstr "¿Quiere deshabilitar esta pantalla en el futuro?"
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr ""
+#~ "Tiempo para que el mouse esté en el borde antes de cambiar de escritorio"
 
-#~ msgid "Theme Bug Detected"
-#~ msgstr "Error detectado en el tema"
+#~ msgid "Default Configuration Dialogs Mode"
+#~ msgstr "Modo de configuración de diálogos predeterminado"
 
 #~ msgid ""
-#~ "The theme you are using for your init splash<br>has a bug. It does not "
-#~ "respond to signals when<br>startup is complete. You should use an "
-#~ "init<br>splash theme that is correctly made or fix the<br>one you use."
+#~ "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 %d Hz "
+#~ "will be restored in %d seconds."
 #~ msgstr ""
-#~ "El tema que usa para su pantalla de inicio<br>tiene un  bug. No responde "
-#~ "a 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."
-
-#~ msgid "Init"
-#~ msgstr "Inicio"
-
-#~ msgid "Window Manipulation"
-#~ msgstr "Manejo de ventanas"
-
-#~ msgid "When moving or resizing windows, resist at the boundaries"
-#~ msgstr "Resistir los límites cuando se mueve o cambia de tamaño una ventana"
-
-#~ msgid "Both directions"
-#~ msgstr "Ambas direcciones"
+#~ "¿Ésto se ve bien? Pulse <hilight>Si</hilight> si es así, o No si no lo es."
+#~ "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d at %d Hz "
+#~ "será restaurada en %d segundos."
 
-#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
+#~ 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 %d Hz "
+#~ "will be restored <hilight>IMMEDIATELY</hilight>."
 #~ msgstr ""
-#~ "Enlightenment no puede configurar las opciones de aceleración del mouse."
-
-#~ msgid "Mouse Acceleration Settings"
-#~ msgstr "Opciones de aceleración del Mouse"
-
-#~ msgid "Add To Favorites Menu"
-#~ msgstr "Agregar al menú favoritos"
+#~ "¿Ésto se ve bien? Presione <hilight>Si</hilight> si es así, o No si no lo "
+#~ "es.<br>Si no presiona un botón, la vieja resolución de <br>%dx%d a %d Hz "
+#~ "será restaurada <hilight>INMEDIATAMENTE</hilight>."
 
 #~ msgid ""
-#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
-#~ "switch to an AC source."
+#~ "Your X Display Server is missing support for<br>the <hilight>XRandr</"
+#~ "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
+#~ "resolutions without<br>the support of this extension. It could also "
+#~ "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was "
+#~ "no XRandr support detected."
 #~ msgstr ""
-#~ "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"
+#~ "A su servidor X le falta el soporte para<br>la extensión <hilight>XRandr</"
+#~ "hilight> (Redimensionamiento y rotación de X).<br>No puede cambiar las "
+#~ "resoluciones de pantalla sin<br>esta extensión. También puede ser que al "
+#~ "momento<br>en que <hilight>ecore</hilight> fue compilado, <br>no se haya "
+#~ "detectado el soporte de XRandr."
 
-#~ msgid "Charging"
-#~ msgstr "Cargando"
+#~ msgid "Timer(s)"
+#~ msgstr "Temporizador(es)"
 
-#~ msgid "NO INFO"
-#~ msgstr "Sin información"
+#~ msgid "Input Method Configuration"
+#~ msgstr "Configuración del método de entrada"
 
-#~ msgid "NO BAT"
-#~ msgstr "Sin Batería"
+#~ msgid "Select an Input Method Configuration..."
+#~ msgstr "Seleccione una configuración de método de entrada..."
 
-#~ msgid "Urgent window"
-#~ msgstr "Ventana urgente"
+#~ msgid "Language Configuration"
+#~ msgstr "Configuración del idioma"
 
-#~ msgid "Error - Invalid Button"
-#~ msgstr "Error - Botón inválido"
+#~ msgid "Keyboard & Mouse"
+#~ msgstr "Mouse y teclado"
 
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr ""
-#~ "Cambiar de escritorios cuando el mouse llegue al borde de la pantalla"
+#~ msgid "Search Path Configuration"
+#~ msgstr "Configuración de la ruta de búsqueda"
 
-#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgid ""
+#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
+#~ "this profile?"
 #~ msgstr ""
-#~ "Tiempo para que el mouse esté en el borde antes de cambiar de escritorio"
-
-#~ msgid "Application Categories"
-#~ msgstr "Categorías de aplicaciones"
+#~ "Pidio borrar  \"%s\".<br><br>¿Está seguro de querer borrar este perfil?"
 
-#~ msgid "Drag whole desktop (Move all windows of a desktop)"
-#~ msgstr ""
-#~ "Arrastrar todo el escritorio (mover todas las ventanas de un escritorio)"
+#~ msgid "Are you sure you want to delete this profile?"
+#~ msgstr "¿Está seguro de querer borrar este perfil?"
 
-#~ msgid "Dismiss alert automatically"
-#~ msgstr "Omitir alerta automaticamente"
+#~ msgid "Plain Profile"
+#~ msgstr "Perfil plano"
 
-#~ msgid "Dismiss alert after:"
-#~ msgstr "Omitir alerta despues de:"
+#~ msgid "Clone Current Profile"
+#~ msgstr "Clonar el perfil actual"
 
 #~ msgid "Choose a website from list..."
 #~ msgstr "Escoga un sitio web de la lista..."
@@ -7402,6 +7512,53 @@ msgstr "Bandeja de sistema"
 #~ msgid "[%s] Getting feed..."
 #~ msgstr "[%s] Obteniendo entradas..."
 
+#~ msgid "Dropshadow Configuration"
+#~ msgstr "Configuración de la sombra"
+
+#~ msgid ""
+#~ "Fileman Module Configuration data needed upgrading. Your old "
+#~ "configuration<br>has been wiped and a new set of defaults initialized. "
+#~ "This<br>will happen regularly during development, so don't report "
+#~ "a<br>bug. This simply means Fileman module needs new "
+#~ "configuration<br>data by default for usable functionality that your "
+#~ "old<br>configuration simply lacks. This new set of defaults will "
+#~ "fix<br>that by adding it in. You can re-configure things now to "
+#~ "your<br>liking. Sorry for the hiccup in your configuration.<br>"
+#~ msgstr ""
+#~ "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>"
+
+#~ msgid "Fileman Configuration Updated"
+#~ msgstr "Configuración de Fileman actualizada"
+
+#~ msgid "IBar Configuration"
+#~ msgstr "Configuración del IBar"
+
+#~ msgid "IBox Configuration"
+#~ msgstr "Configuración de iBox"
+
+#~ msgid "Pager Configuration"
+#~ msgstr "Configuración del paginador"
+
+#~ msgid "Virtual Desktops Configuration"
+#~ msgstr "Configuración de Escritorios virtuales"
+
+#~ msgid "Temperature Configuration"
+#~ msgstr "Configuración de temperatura"
+
+#~ msgid "X reports there are no root windows and %i screens!\n"
+#~ msgstr "¡X informa que no hay ventanas raíz y %i pantallas!\n"
+
+#~ msgid "Disable this splash screen in the future?"
+#~ msgstr "¿Quiere deshabilitar esta pantalla en el futuro?"
+
 #~ msgid "Enlightenment cannot set up its app system."
 #~ msgstr "Enlightenment no puede iniciar su sistema de aplicaciones"
 
@@ -7414,21 +7571,55 @@ msgstr "Bandeja de sistema"
 #~ msgid "About..."
 #~ msgstr "Acerca..."
 
+#~ msgid "Window Manipulation"
+#~ msgstr "Manejo de ventanas"
+
 #~ msgid "Window list skip"
 #~ msgstr "Omitir de la lista de ventanas"
 
 #~ msgid "Window"
 #~ msgstr "Ventana"
 
-#~ msgid "Window Name"
-#~ msgstr "Nombre de la ventana"
-
 #~ msgid "Window Title"
 #~ msgstr "Título de la ventana"
 
 #~ msgid "Misc"
 #~ msgstr "Misc"
 
+#~ msgid "When moving or resizing windows, resist at the boundaries"
+#~ msgstr "Resistir los límites cuando se mueve o cambia de tamaño una ventana"
+
+#~ 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 "NO INFO"
+#~ msgstr "Sin información"
+
+#~ msgid "NO BAT"
+#~ msgstr "Sin Batería"
+
+#~ 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 "Enlightenment Battery Module"
 #~ msgstr "Módulo de batería de Enlightenmen"
 
@@ -7787,206 +7978,52 @@ msgstr "Bandeja de sistema"
 #~ msgid "Check Very Slow (60 sec)"
 #~ msgstr "Chequeo muy lento (60 seg.)"
 
-#~ msgid ""
-#~ "Configuration data needed upgrading. Your old configuration<br>has been "
-#~ "wiped and a new set of defaults initialized. This<br>will happen "
-#~ "regularly during development, so don't report a<br>bug. This simply means "
-#~ "Enlightenment needs new configuration<br>data by default for usable "
-#~ "functionality that your old<br>configuration simply lacks. This new set "
-#~ "of defaults will fix<br>that by adding it in. You can re-configure things "
-#~ "now to your<br>liking. Sorry for the hiccup in your configuration.<br>"
-#~ msgstr ""
-#~ "Los datos de configuración necesitan ser actualizados. "
-#~ "Tu<br>configuración 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>"
-
-#~ msgid ""
-#~ "Your configuration is NEWER than Enlightenment. This is very<br>strange. "
-#~ "This should not happen unless you downgraded<br>Enlightenment or copied "
-#~ "the configuration from a place where<br>a newer version of Enlightenment "
-#~ "was running. This is bad and<br>as a precaution your configuration has "
-#~ "been now restored to<br>defaults. Sorry for the inconvenience.<br>"
-#~ msgstr ""
-#~ "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 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>"
-
-#~ 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 ""
-#~ "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>"
+#~ msgid "Back"
+#~ msgstr "Atrás"
 
-#~ msgid ""
-#~ "Enlightenment's configuration files are too big<br>for the file system "
-#~ "they are being saved to.<br>This error is very strange as the files "
-#~ "should<br>be extremely small. Please check the settings<br>for your home "
-#~ "directory.<br><br>The file where the error occured was:<br>%s<br><br>This "
-#~ "file has been deleted to avoid corrupt data.<br>"
-#~ msgstr ""
-#~ "Los archivos de configuración de Enlightenment son muy grandes<br>para el "
-#~ "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 la corrupción de los datos.<br>"
+#~ msgid "Choose Language"
+#~ msgstr "Escoja el idioma"
 
-#~ msgid ""
-#~ "An output error occured when writing the configuration<br>files for "
-#~ "Enlightenment. Your disk is having troubles<br>and possibly needs "
-#~ "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 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 la "
-#~ "corrupción de datos.<br>"
+#~ msgid "Theme Bug Detected"
+#~ msgstr "Error detectado en el tema"
 
 #~ msgid ""
-#~ "Enlightenment cannot write its configuration file<br>because it ran out "
-#~ "of space to write the file.<br>You have either run out of disk space or "
-#~ "have<br>gone over your quota limit.<br><br>The file where the error "
-#~ "occured was:<br>%s<br><br>This file has been deleted to avoid corrupt "
-#~ "data.<br>"
+#~ "The theme you are using for your init splash<br>has a bug. It does not "
+#~ "respond to signals when<br>startup is complete. You should use an "
+#~ "init<br>splash theme that is correctly made or fix the<br>one you use."
 #~ msgstr ""
-#~ "Enlightenment no puede escribir su archivo de configuración<br>porque se "
-#~ "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 la corrupción de los datos.<br>"
+#~ "El tema que usa para su pantalla de inicio<br>tiene un  bug. No responde "
+#~ "a 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."
 
-#~ 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 ""
-#~ "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>"
+#~ msgid "Init"
+#~ msgstr "Inicio"
 
-#~ msgid "Enlightenment Configuration Write Problems"
-#~ msgstr "Problemas en la escritura de la configuración de Enlightenment"
+#~ msgid "Both directions"
+#~ msgstr "Ambas direcciones"
 
-#~ msgid ""
-#~ "Options:\n"
-#~ "\t-display DISPLAY\n"
-#~ "\t\tConnect to display named DISPLAY.\n"
-#~ "\t\tEG: -display :1.0\n"
-#~ "\t-fake-xinerama-screen WxH+X+Y\n"
-#~ "\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
-#~ "\t\tgiven the geometry. Add as many as you like. They all\n"
-#~ "\t\treplace the real xinerama screens, if any. This can\n"
-#~ "\t\tbe used to simulate xinerama.\n"
-#~ "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
-#~ "+800+0\n"
-#~ "\t-profile CONF_PROFILE\n"
-#~ "\t\tUse the configuration profile CONF_PROFILE instead of the user "
-#~ "selected default or just \"default\".\n"
-#~ "\t-good\n"
-#~ "\t\tBe good.\n"
-#~ "\t-evil\n"
-#~ "\t\tBe evil.\n"
-#~ "\t-psychotic\n"
-#~ "\t\tBe psychotic.\n"
+#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
 #~ msgstr ""
-#~ "Opciones:\n"
-#~ "\t-display DISPLAY\n"
-#~ "\t\tConecta al display DISPLAY.\n"
-#~ "\t\tEJ: -display :1.0\n"
-#~ "\t-fake-xinerama-screen WxH+X+Y\n"
-#~ "\t\tAñade una pantalla xinerama FALSA (en lugar de la real)\n"
-#~ "\t\tdada una geometría. Añade todas las que quieras. Todas\n"
-#~ "\t\tellas reemplazan las pantallas xinerama reales, si existen. Esto se\n"
-#~ "\t\tpuede usar para simular xinerama.\n"
-#~ "\t\tEJ: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
-#~ "+800+0\n"
-#~ "+0\n"
-#~ "\t-profile CONF_PROFILE\n"
-#~ "\t\tUsar el perfil de la configuración CONF_PROFILE en lugar del del "
-#~ "usuario elija el predeterminado o sólo \"default\".\n"
-#~ "\t-good\n"
-#~ "\t\tSea bueno.\n"
-#~ "\t-devil\n"
-#~ "\t\tSer un demonio.\n"
-#~ "\t-psychotic\n"
-#~ "\t\tSer psicótico.\n"
+#~ "Enlightenment no puede configurar las opciones de aceleración del mouse."
 
-#~ msgid "Battery Monitor Configuration"
-#~ msgstr "Configuración del monitor de batería"
+#~ msgid "Mouse Acceleration Settings"
+#~ msgstr "Opciones de aceleración del Mouse"
 
-#~ 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 %d Hz "
-#~ "will be restored in %d seconds."
-#~ msgstr ""
-#~ "¿Ésto se ve bien? Pulse <hilight>Si</hilight> si es así, o No si no lo es."
-#~ "<br>Si no presiona un botón, la vieja resolución de <br>%dx%d at %d Hz "
-#~ "será restaurada en %d segundos."
+#~ msgid "Add To Favorites Menu"
+#~ msgstr "Agregar al menú favoritos"
 
-#~ 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 %d Hz "
-#~ "will be restored <hilight>IMMEDIATELY</hilight>."
-#~ msgstr ""
-#~ "¿Ésto se ve bien? Presione <hilight>Si</hilight> si es así, o No si no lo "
-#~ "es.<br>Si no presiona un botón, la vieja resolución de <br>%dx%d a %d Hz "
-#~ "será restaurada <hilight>INMEDIATAMENTE</hilight>."
+#~ msgid "Application Categories"
+#~ msgstr "Categorías de aplicaciones"
 
-#~ msgid ""
-#~ "Your X Display Server is missing support for<br>the <hilight>XRandr</"
-#~ "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
-#~ "resolutions without<br>the support of this extension. It could also "
-#~ "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was "
-#~ "no XRandr support detected."
+#~ msgid "Drag whole desktop (Move all windows of a desktop)"
 #~ msgstr ""
-#~ "A su servidor X le falta el soporte para<br>la extensión <hilight>XRandr</"
-#~ "hilight> (Redimensionamiento y rotación de X).<br>No puede cambiar las "
-#~ "resoluciones de pantalla sin<br>esta extensión. También puede ser que al "
-#~ "momento<br>en que <hilight>ecore</hilight> fue compilado, <br>no se haya "
-#~ "detectado el soporte de XRandr."
-
-#~ msgid "Timer(s)"
-#~ msgstr "Temporizador(es)"
+#~ "Arrastrar todo el escritorio (mover todas las ventanas de un escritorio)"
 
-#~ msgid "Select an Input Method Configuration..."
-#~ msgstr "Seleccione una configuración de método de entrada..."
+#~ msgid "Urgent window"
+#~ msgstr "Ventana urgente"
 
-#~ msgid ""
-#~ "Fileman Module Configuration data needed upgrading. Your old "
-#~ "configuration<br>has been wiped and a new set of defaults initialized. "
-#~ "This<br>will happen regularly during development, so don't report "
-#~ "a<br>bug. This simply means Fileman module needs new "
-#~ "configuration<br>data by default for usable functionality that your "
-#~ "old<br>configuration simply lacks. This new set of defaults will "
-#~ "fix<br>that by adding it in. You can re-configure things now to "
-#~ "your<br>liking. Sorry for the hiccup in your configuration.<br>"
-#~ msgstr ""
-#~ "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>"
+#~ msgid "Error - Invalid Button"
+#~ msgstr "Error - Botón inválido"
 
 #~ msgid "App name"
 #~ msgstr "Nombre del programa"
diff --git a/po/fi.gmo b/po/fi.gmo
index 840b9a4..e63947d 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index c0c666a..b0e3f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,46 +1,48 @@
 # Enlightenment (e17) CVS, Finnish translation
 # This file is put in the public domain.
 # Jani Väyrynen <janivayrynen at gmail.com>, 2008.
-#
+# Jussi Aalto <jta_lnx at dnainternet.net>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment (e17) CVS\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+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"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-08 13:02+0000\n"
+"Last-Translator: Jussi Aalto <jta_lnx at dnainternet.net>\n"
+"Language-Team: Finnish <fi at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+"Language: fi\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Tietoa Enlightenmentista"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Sulje"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -49,19 +51,19 @@ 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 ""
-"Oikeudet %copy; 1999-2007, Englightenmentin kehitystiimi.<br><br>Toivomme "
-"että nautit tämän ohjelmiston käyttämisestä yhtä paljon kuin me pidimme sen "
-"kirjoittamisesta.<br><br>Tämä ohjelmisto tarjotaan sellaisenaan ilman "
-"minkäänlaistatakuuta. Tämä ohjelmisto on lisenssin alainen, joten katso "
-"COPYING- ja COPYING-PLAIN-lisenssitiedostot, jotka on asennettu "
-"järjestelmääsi.<br><br>Enlightenment on <hilight>RASKAAN KEHITYKSEN</"
-"hilight> alla eikä ole vakaa. Monet ominaisuudet ovat keskeneräisiä tai "
-"eivät edes olemassa ja saattavat sisältää useita bugeja. Sinua on "
-"<hilight>VAROITETTU!</hilight>"
+"Tekijänoikeudet %copy; 1999-2009, Englightenmentin kehitystiimi."
+"<br><br>Toivomme että nautit tämän ohjelmiston käyttämisestä yhtä paljon "
+"kuin me nautimme sen kirjoittamisesta.<br><br>Tämä ohjelmisto tarjotaan "
+"sellaisenaan ilman minkäänlaista takuuta. Tämä ohjelmisto on lisenssin "
+"alainen, joten lue COPYING- ja COPYING-PLAIN-lisenssitiedostot, jotka on "
+"asennettu järjestelmääsi.<br><br>Enlightenment on <hilight>RASKAAN "
+"KEHITYKSEN</hilight> alla eikä ole vakaa. Monet ominaisuudet ovat "
+"keskeneräisiä tai eivät edes olemassa ja saattavat sisältää useita bugeja. "
+"Sinua on <hilight>VAROITETTU!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
-msgstr "Tiimi"
+msgstr "<title>Tiimi</title>"
 
 #: src/bin/e_actions.c:345
 #, c-format
@@ -78,55 +80,55 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Haluatko varmasti tappaa tämän ikkunan?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ei"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Haluatko varmasti poistua?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vaadit Enlightenmentista poistumista.<br><br>Haluatko varmasti poistua?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Haluatko varmasti uloskirjautua?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Olet uloskirjautumassa.<br><br>Haluatko varmasti tehdä tämän?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Haluatko varmasti sammuttaa?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Vaadit tietokoneesi sammuttamista.<br><br>Haluatko varmasti sammuttaa?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Haluatko varmasti uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -134,7 +136,7 @@ msgstr ""
 "Vaadit tietokoneesi uudelleenkäynnistämistä.<br><br>Haluatko varmasti "
 "uudelleenkäynnistää?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -142,11 +144,11 @@ msgstr ""
 "Vaadit tietokoneesi asettamista valmiustilaan.<br><br>Haluatko varmasti "
 "asettua valmiustilaan?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Haluatko varmasti asettua lepotilaan?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -154,567 +156,535 @@ msgstr ""
 "Vaadit koneesi asettamista lepotilaan.<br><br>Haluatko varmasti asettua "
 "lepotilaan?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Ikkuna : Toiminnot"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Siirrä"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Muuta kokoa"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Valikko"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Ikkunavalikko"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Nosta"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Laske"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Tapa"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Ikkuna : Tila"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Tarttuva tila"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Ikonisoitu tila"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksimoi"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
-msgstr "Maksimoi leveyssuunnasa"
+msgstr "Maksimoi leveyssuunnassa"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maksimoi Koko ruudun -tila"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimointitila \"Älykäs\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimointitila \"Laajennus\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimointitila \"Täyttö\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Varjo ylhäällä"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Varjo alhaalla"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Varjo vasemmalla"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Varjo oikealla"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Varjo"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Kehyksetön tila"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Kiinnitetty tila"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Vaihda vasemmanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Vaihda oikeanpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Vaihda yläpuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Vaihda alapuoleiseen työpöytään"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Vaihda työpöytä..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Näytä työpöytä"
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "Näytä työpöytä"
+msgstr "Näytä hylly"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Vaihda työpöytä lineaarisesti..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
-msgstr "vaihda työpöytään 0"
+msgstr "Vaihda työpöytään 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
-msgstr "vaihda työpöytään 1"
+msgstr "Vaihda työpöytään 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
-msgstr "vaihda työpöytään 2"
+msgstr "Vaihda työpöytään 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
-msgstr "vaihda työpöytään 3"
+msgstr "Vaihda työpöytään 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
-msgstr "vaihda työpöytään 4"
+msgstr "Vaihda työpöytään 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
-msgstr "vaihda työpöytään 6"
+msgstr "Vaihda työpöytään 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
-msgstr "vaihda työpöytään 6"
+msgstr "Vaihda työpöytään 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
-msgstr "vaihda työpöytään 7"
+msgstr "Vaihda työpöytään 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
-msgstr "vaihda työpöytään 8"
+msgstr "Vaihda työpöytään 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
-msgstr "vaihda työpöytään 9"
+msgstr "Vaihda työpöytään 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
-msgstr "vaihda työpöytään 10"
+msgstr "Vaihda työpöytään 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
-msgstr "vaihda työpöytään 11"
+msgstr "Vaihda työpöytään 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
-msgstr "vaihda työpöytään..."
+msgstr "Vaihda työpöytään..."
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Vaihda vasemmanpuoleiseen työpöytään"
+msgstr "Vaihda vasemmanpuoleiseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2644
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Vaihda oikeanpuoleiseen työpöytään"
+msgstr "Vaihda oikeanpuoleiseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Vaihda yläpuoleiseen työpöytään"
+msgstr "Vaihda yläpuoliseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Vaihda alapuoleiseen työpöytään"
+msgstr "Vaihda alapuoliseen työpöytään (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2650
-#, fuzzy
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Vaihda työpöytä..."
+msgstr "Vaihda työpöytä... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2656
-#, fuzzy
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Vaihda työpöytään..."
+msgstr "Vaihda työpöytään... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2662
-#, fuzzy
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Vaihda työpöytä lineaarisesti..."
+msgstr "Vaihda työpöytä lineaarisesti (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Vaihda työpöytään..."
+msgstr "Vaihda työpöytää suunnassa..."
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "vaihda työpöytään 0"
+msgstr "Vaihda työpöytään 0 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "vaihda työpöytään 1"
+msgstr "Vaihda työpöytään 1 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "vaihda työpöytään 2"
+msgstr "Vaihda työpöytään 2 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "vaihda työpöytään 3"
+msgstr "Vaihda työpöytään 3 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "vaihda työpöytään 4"
+msgstr "Vaihda työpöytään 4 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "vaihda työpöytään 6"
+msgstr "Vaihda työpöytään 5 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "vaihda työpöytään 6"
+msgstr "Vaihda työpöytään 6 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "vaihda työpöytään 7"
+msgstr "Vaihda työpöytään 7 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "vaihda työpöytään 8"
+msgstr "Vaihda työpöytään 8 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "vaihda työpöytään 9"
+msgstr "Vaihda työpöytään 9 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "vaihda työpöytään 10"
+msgstr "Vaihda työpöytään 10 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "vaihda työpöytään 11"
+msgstr "Vaihda työpöytään 11 (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "vaihda työpöytään..."
+msgstr "Vaihda työpöytään... (Kaikki näytöt)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Näyttö"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Lähetä hiiri näytölle 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Lähetä hiiri näytölle 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Lähetä hiiri näytölle..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Lähetä hiiri ruudun verran eteenpäin"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Lähetä hiiri ruudun verran taaksepäin"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Lähetä hiiri eteenpäin/taaksepäin..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
-msgstr "Ikkuna : Siiretään"
+msgstr "Ikkuna : Siirtäminen"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Seuraavalle työpöydälle"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Edelliselle työpöydälle"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Työpöydältä #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Työpöydälle..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Näytä päävalikko"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Näytä Suosikkisovellukset-valikko"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Näytä Kaikki sovellukset -valikko"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Näytä Asiakkaat-valikko"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Näytä valikko..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Käynnistä"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komento"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Sovellus"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Poistu"
 
-#: src/bin/e_actions.c:2803
-#, fuzzy
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr "Poistu"
+msgstr "Poistu nyt"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenmentin %s-moduuli"
+msgstr "Enlightenment : Tila"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Koko ruudun -tila"
+msgstr "Esitystilaan vaihto"
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Varjo"
+msgstr "Offline-tilaan vaihto"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Järjestelmä"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Uloskirjaudu"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
-msgstr ""
+msgstr "Sammuta nyt"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
-msgstr ""
+msgstr "Sammuta"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Valmiustila"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Lepotila"
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "Lukot"
+msgstr "Lukitse"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Siivoa ikkunat"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Ikkuna : Toiminnot"
+msgstr "Yleiset : Toiminnot"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "Valitut sovellukset"
+msgstr "Viivästetty toiminto"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Aseta taustakuvaksi"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Työpöytätiedostojen skannaus valmis"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Työpöytätiedostojen skannaus"
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "Profiilin valitsin"
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "Värivalitsin"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
-#, fuzzy
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -724,16 +694,15 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Asetustiedot tarvitsivat päivittämistä, Vanhat asetuksesi on poistettu<br>ja "
-"uudet asetukset on asetettu. Tämä tulee tapahtumaan<br>säännöllisesti "
-"kehitystyön aikana, joten älä ilmoita virheestä.<br>Tämä tarkoittaa "
-"yksinertaisesti sitä että Enlightenment tarvitsee<br>uudet asetustiedot "
+"Asetustiedot tarvitsivat päivittämistä. Vanhat asetukset on poistettu<br>ja "
+"uudet asetukset on asetettu. Tätä tulee tapahtumaan<br>säännöllisesti "
+"kehitystyön aikana, joten älä tee vikailmoitusta.<br>Tämä tarkoittaa "
+"yksinkertaisesti sitä että Enlightenment tarvitsee<br>uudet asetustiedot "
 "toiminnoille, jotka yksinkertaisesti puuttuvat<br>vanhasta. Uudet asetukset "
 "korjaavat tämän lisäämällä nämä uudet<br>ominaisuudet. Voit tehdä haluamasi "
 "asetukset uudelleen.<br>Olemme pahoillamme häiriöstä.<br>"
 
-#: src/bin/e_config.c:775
-#, fuzzy
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -741,31 +710,29 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Asetuksesi ovat UUDEMMAT kuin Enlightenment. Tämä on erittäin omituista,"
-"<br>eikä näin pitäisi tapahtua ellet ole vaihtanut Enlightenmentia "
-"vanhempaan<br>versioon, tai kopioinut asetuksia paikasta, jossa oli käytössä "
-"uudempi versio<br>Enlightenmentista. Tämä on huono asia, ja varokeinona "
-"asetuksesi on nytpalautettu<br> oletusasetuksiin. Olemme pahoillamme "
-"häiriöstä.<br>"
+"Asetuksesi ovat UUDEMMAT kuin Enlightenment. Tämä on erittäin<br>omituista, "
+"eikä näin pitäisi tapahtua ellet ole vaihtanut<br>Enlightenmentia vanhempaan "
+"versioon, tai kopioinut asetuksia paikasta,<br>jossa oli käytössä uudempi "
+"versio Enlightenmentista. Tämä on<br>huono asia, ja varokeinona asetuksesi "
+"on nyt palautettu<br> oletusasetuksiin. Olemme pahoillamme häiriöstä.<br>"
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "Työpöydän asetukset"
+msgstr "Asetukset päivitetty"
 
-#: src/bin/e_config.c:1773
-#, fuzzy, c-format
+#: src/bin/e_config.c:1763
+#, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings 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 ""
-"Ilmeni virhe tallennettaessa Enlightenmentin<br>asetuksia levylle.Virhettä "
-"ei voitu tunnistaa<br><br>Tiedosto, jossa virhe ilmeni,oli:<br>%"
+"Tallennettaessa Enlightenmentin asetuksia levylle<br> ilmeni virhe. Virhettä "
+"ei voitu<br>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:1784
-#, fuzzy, c-format
+#: src/bin/e_config.c:1774
+#, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
 "being saved to.<br>This error is very strange as the files should<br>be "
@@ -775,55 +742,54 @@ msgid ""
 msgstr ""
 "Enlightenmentin asetustiedostot ovat liian suuria<br>tiedostojärjestelmälle, "
 "jolle ne on tallennettu.<br>Tämä virhe on hyvin omituinen, koska tiedostojen "
-"pitäisi<br>olla erittäin pieniä. Voisitko tarkistaa<br>kotikansiosi "
-"asetukset.<br><br>Tiedosto, jossa virhe ilmeni, oli:<br>%s<br><br>Tämä "
-"tiedosto on poistettu korruptoituneen datan välttämiseksi.<br>"
+"tulisi<br>olla erittäin pieniä. Tarkista<br>kotikansiosi 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:1797
-#, fuzzy, c-format
+#: src/bin/e_config.c:1787
+#, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
 "Enlightenment. Your disk is having troubles<br>and possibly needs "
 "replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Tulostusvirhe ilmeni kirjoitettaessa asetus<br>tiedostoja Enlightenmentille. "
-"Kovalevyssäsi on ongelmia,<br>ja se pitää mahdollisesti vaihtaa."
+"Enlightenmentin asetustiedostoja kirjoitettaessa ilmeni<br>tallennusvirhe. "
+"Kiintolevyllä on ongelmia,<br>ja se pitää mahdollisesti vaihtaa."
 "<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:1808
-#, fuzzy, c-format
+#: src/bin/e_config.c:1798
+#, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
 "to write the file.<br>You have either run out of disk space or have<br>gone "
 "over your quota limit.<br><br>The file where the error occured was:<br>%"
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Enlightenment ei voi kirjoittaa asetustiedostoaan,<br>koska sille ei ole "
-"tarpeeksi tilaa kirjoittaa tiedostoa.<br>Joko sinun levytilasi on lopussa "
-"tai olet ylittänyt levytilakiintiösi.<br><br>Tiedosto, jossa virhe ilmeni, "
-"oli:<br>%s<br><br>Tämä tiedosto on poistettu korruptoituneen datan "
+"Enlightenment ei voi tallentaa asetustiedostoaan,<br>koska levyllä ei ole "
+"tarpeeksi tilaa tiedoston kirjoittamiseen.<br>Levytila on joko lopussa "
+"tai<br> olet ylittänyt levytilakiintiösi.<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:1820
-#, fuzzy, c-format
+#: src/bin/e_config.c:1810
+#, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings 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 ""
-"Enlightenmentin asetustiedosto<br>sulkeutui juuri kun sitä oltiin "
+"Enlightenmentin asetustiedosto<br>suljettiin juuri kun sitä oltiin "
 "kirjoittamassa. Tämä on hyvin epätavallista.<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:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Enlightenmentin asetusten kirjoitusongelmat"
+msgstr "Ongelmia Enlightenmentin asetusten kirjoituksessa"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -831,12 +797,12 @@ msgstr "Enlightenmentin asetusten kirjoitusongelmat"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Perusasetukset"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Käytä"
 
@@ -844,7 +810,7 @@ msgstr "Käytä"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduulit"
 
@@ -853,27 +819,27 @@ msgstr "Moduulit"
 msgid "Extensions"
 msgstr "Lisäosat"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Säiliö %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Virhe - ei PAM-tukea"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM-tukea ei rakennettu Enlightenmentiin, joten<br>työpöydän lukitus on "
 "poistettu käytöstä."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Lukitseminen epäonnistui"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -881,15 +847,15 @@ msgstr ""
 "Työpöydän lukitseminen epäonnistui, koska jokin sovellus<br>on kaapannut "
 "joko näppäimistön, hiiren tai molemmat<br>ja kaappausta on mahdoton rikkoa."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Syötä lukituksen avaava salasanasi, kiitos"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Todennusjärjestelmän virhe"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -900,24 +866,27 @@ msgstr ""
 "todennusistunnon aloittamisessa. Virhekoodi oli <hilight>%i</hilight>.\n"
 "Tämä on paha juttu, eikä tätä pitäisi tapahtua. Raportoi tämä bugi, kiitos."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Aktivoidaanko esitystila?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Työpöydän lukitus poistettiin käytöstä liian nopeasti.<br><br>Otetaanko "
+"käyttöön <b>esitys</b>tila ja poistetaan näytönsäästäjä, näytön lukitus ja "
+"virransäästötila tilapäisesti käytöstä?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Ei, mutta lisää aikaviivettä"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Ei, äläkä kysele enää"
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
@@ -941,7 +910,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Työpöydän alkioeditori"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -967,7 +936,7 @@ msgstr "Kommentti"
 
 #: src/bin/e_eap_editor.c:512
 msgid "General"
-msgstr "Yleiset 6?"
+msgstr "Yleiset"
 
 #: src/bin/e_eap_editor.c:515
 msgid "Generic Name"
@@ -980,13 +949,13 @@ msgstr "Ikkunan luokka"
 
 #: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
 msgid "Categories"
-msgstr "Kategoriat"
+msgstr "Luokat"
 
 #: src/bin/e_eap_editor.c:528
 msgid "Mime Types"
 msgstr "Mime-tyypit"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Valinnat"
 
@@ -1018,23 +987,23 @@ msgstr "Valitse kuvake"
 msgid "Select an Executable"
 msgstr "Valitse suoritettava ohjelma"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Poista"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Liitä"
 
@@ -1042,24 +1011,24 @@ msgstr "Liitä"
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Ajovirhe"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Ohjelman ajovirhe"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1068,322 +1037,309 @@ msgstr ""
 "Enlightenment ei voinut suorittaa sovellusta:<br><br>%s<br><br>Sovelluksen "
 "käynnistys epäonnistui."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Sovelluksen suoritusvirhe"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "Sovelluksen %s suoritus loppui odottamatta."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Lopetuskoodi %i palautettiin sovelluksesta %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s keskeytyi keskeytyssignaaliin."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s keskeytyi lopetussignaaliin."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s keskeytyi poikkeussignaaliin."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s keskeytyi liukulukuvirheeseen."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s keskeytyi segmentointivirheeseen."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s keskeytyi rikkoutuneeseen putkeen."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s keskeytyi terminaatiosignaaliin."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s keskeytyi väylävirheeseen."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s keskeytyi signaaliin %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Virhelogit"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Virheviestiä ei ollut."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Tallenna tämä viesti"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Virheinfo"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Virhesignaalin info"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Tulosteen data"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Tulostetta ei ollut."
 
-#: src/bin/e_fm.c:941
-#, fuzzy
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
-msgstr "Puuttuva polku"
+msgstr "Virheellinen polku"
 
-#: src/bin/e_fm.c:945
-#, fuzzy, c-format
+#: src/bin/e_fm.c:949
+#, c-format
 msgid "%s doesn't exist."
-msgstr "%s ei ole olemassa"
+msgstr "Polkua %s ei ole."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Ajovirhe"
+msgstr "Liitosvirhe"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Laitetta ei voida liittää"
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Ajovirhe"
+msgstr "Irrotusvirhe"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Laitetta ei voida irrottaa"
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Ajovirhe"
+msgstr "Virhe poistettaessa"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i tiedostoa"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr "Lineaarinen"
+msgstr "Tee linkki"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "Tietoa"
+msgstr "Keskeytä"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "Valinnan asetukset"
+msgstr "Käytä ylemmän tason asetuksia"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Näkymän tila"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Päivitä näkymä"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Näytä piilotiedostot"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Muista järjestys"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Lajittele nyt"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Uusi hakemisto"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Valikon kohteiden tekstit"
+msgstr "Liitä"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Käytä oletusta"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Ruudukoidut kuvakkeet"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Mukautetut kuvakkeet"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listaa"
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Kuvakkeen koko"
+msgstr "Kuvakkeen koko (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Aseta taustakuvaksi"
+msgstr "Aseta taustakuva..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Hyllyn sisältö"
+msgstr "Aseta peitto..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Poista käytöstä"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Luo uusi hakemisto"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Uuden hakemiston nimi:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Uudelleennimeä %s:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Uudelleennimeä tiedosto"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
-#, fuzzy
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
-msgstr "Käynnistä uudelleen"
+msgstr "Yritä uudelleen"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
-#, fuzzy
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
-msgstr "Ajovirhe"
+msgstr "Virhe"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
-msgstr ""
+msgstr "Ei kaikkiin"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
-msgstr ""
+msgstr "Kyllä kaikkiin"
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Aloitetaan"
+msgstr "Varoitus"
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Haluatko varmasti poistaa tiedoston<br><hilight>%s</hilight> ?"
+msgstr ""
+"Tiedosto on jo olemassa, haluatko korvata sen?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
-msgstr ""
+msgstr "Ohita tämä"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
-msgstr ""
+msgstr "Ohita kaikki"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
-msgstr ""
+msgstr "Toimintoa suoritettaessa tapahtui virhe.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Vahvista poisto"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1396,144 +1352,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Tiedoston ominaisuudet"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Koko:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Viimeksi muokattu:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tiedostotyyppi"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Omistaja"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Muut saavat lukea"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Muut saavat kirjoittaa"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Omistaja saa lukea"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Omistaja saa kirjoittaa"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Oletus"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Pikkukuva"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Käytä tätä kuvaketta kaikille tämän tyypin tiedostoille"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr "Linkin info"
+msgstr "Linkin tiedot"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Valitse kuva"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu Tt"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu Gt"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu Mt"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu Kt"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu t"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Tuntematon tilavuus"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
-msgstr "Irroitettava laita"
+msgstr "Irroitettava laite"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Siirrä tämä vempain"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Paljas"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Upotettu"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Vieritä sisältöä automaattisesti"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Koko muutettavissa"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Vempain: siirrä/muuta kokoa"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Poista tämä vempain"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Vempain: lopeta siirtäminen/koon muuttaminen"
 
@@ -1545,7 +1505,7 @@ msgstr ""
 "Enlightenmentin edellinen istunto on yhä aktiivinen\n"
 "tällä näytöllä. Keskeytetään käynnistys.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Ikkunalukot"
 
@@ -1579,21 +1539,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Pinoutuminen"
 
@@ -1602,12 +1562,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Varjostuksen tila"
 
@@ -1616,7 +1576,7 @@ msgid "Maximized state"
 msgstr "Maksimoinnin tila"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Koko näytön -tila"
 
@@ -1624,7 +1584,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Kehyksen tyyli"
 
@@ -1649,9 +1609,8 @@ msgid "Edit Icon"
 msgstr "Muokkaa kuvaketta"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "Lisää sovellus"
+msgstr "Lisää sovellus..."
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1670,125 +1629,121 @@ msgid "Unpin from Desktop"
 msgstr "Irrota työpöydältä"
 
 #: src/bin/e_int_border_menu.c:131
-#, fuzzy
 msgid "More..."
-msgstr "Tuo..."
+msgstr "Lisää..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Ikonisoi"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maksimoi korkeussuunnassa"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maksimoi leveyssuunnassa"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Poista maksimointi"
 
-#: src/bin/e_int_border_menu.c:485
-#, fuzzy
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
-msgstr "Lisää näppäimistötoiminto"
+msgstr "Pikanäppäin"
 
-#: src/bin/e_int_border_menu.c:491
-#, fuzzy
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
-msgstr "Suosikkisovellukset-valikko"
+msgstr "Suosikkisovelluksiin"
 
-#: src/bin/e_int_border_menu.c:496
-#, fuzzy
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
-msgstr "Lisää käynnistimeen"
+msgstr "Käynnistimeen"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Kehys"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Ohita"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Tila"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Muista"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Ikkunan ominaisuudet"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Aina päällä"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Aina alla"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Valitse kehyksen tyyli"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Käytä E17:n oletuskuvakeasetuksia"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "Käytä sovelluksen tarjoamaa kuvaketta"
+msgstr "Käytä sovelluksen tarjoamaa kuvaketta "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Käytä käyttäjän määrittämää kuvaketta"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Varjostettu"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Tarttuva"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Koko näyttö"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Ikkunalista"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Sivuttaja"
 
-#: src/bin/e_int_border_menu.c:1083
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
-msgstr "Ohita tehtäväpalkki"
+msgstr "Tehtäväpalkki"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1802,7 +1757,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:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Otsikko"
 
@@ -1894,11 +1849,11 @@ msgstr "NetWM:n ominaisuudet"
 msgid "Modal"
 msgstr "Malli"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Ohita tehtäväpalkki"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Ohita Sivuttaja"
 
@@ -1906,15 +1861,15 @@ msgstr "Ohita Sivuttaja"
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Ikkunamuisti"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Ikkunan ominaisuudet eivät ole ainutlaatuiset"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1932,18 +1887,18 @@ msgstr ""
 "ainutlaatuisia ominaisuuksia</hilight>.<br><br>Tämä tarkoittaa sitä, että se "
 "jakaa Nimen/Luokan, vaihtuman, roolin jne. ominaisuuden<br>yhden tai "
 "useamman ruudunikkunan kanssa ja ominaisuuksien<br>muistaminen tälle "
-"ikkunalle pätee kaikille muilleikkunoille,<br>jotka sopivat näihin "
+"ikkunalle pätee kaikille muille ikkunoille,<br>jotka sopivat näihin "
 "ominaisuuksiin.<br><br>Tämä on vain varoitus siinä tapauksessa, ettet "
 "tarkoittanut tätä tapahtuvaksi.<br>Jos tarkoitit, paina yksinkertaisesti "
 "<hilight>Käytä</hilight>- tai <hilight>OK</hilight>-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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
-msgstr "Ei tunnistettavia ominaisuukia asetettuna"
+msgstr "Ei tunnistettavia ominaisuuksia asetettuna"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1951,124 +1906,108 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 "Yrität pyytää Enlightenmentia muistamaan käyttämään<br>ominaisuuksia (kuten "
-"koko, sijainti, kehystyyli etc.) ikkunaan<br><hilight>määrittämättä, kuinka "
+"koko, sijainti, kehystyyli jne.) ikkunaan<br><hilight>määrittämättä, kuinka "
 "se tulisi muistaa</hilight>.<br><br>Sinun täytyy määrittää ainakin yksi "
 "tapa, jolla ikkuna muistetaan."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Yrität pyytää Enlightenmentia muistamaan käyttämään<br>ominaisuuksia (kuten "
-"koko, sijainti, kehyksen tyyli etc.) ikkunaan<br>, jolla <hilight>ei ole "
-"ainutlaatuisia ominaisuuksia</hilight>.<br><br>Tämä tarkoittaa sitä, että se "
-"jakaa Nimen/Luokan, vaihtuman, roolin jne. ominaisuuden<br>yhden tai "
-"useamman ruudunikkunan kanssa ja ominaisuuksien<br>muistaminen tälle "
-"ikkunalle pätee kaikille muilleikkunoille,<br>jotka sopivat näihin "
-"ominaisuuksiin.<br><br>Voit luultavasti haluta hyväksyä "
-"<hilight>Yhteensovita vain yksi ikkuna</hilight> -ominaisuuden, jos<br> "
-"haluat vain yhden instanssin tästä ikkunasta muokattavaksi "
-"muiden<br>jäädessä muokkaamatta.<br><br> Tämä on vain varoitus siinä "
-"tapauksessa, ettet tarkoittanut tätä tapahtuvaksi.<br>Jos tarkoitit, paina "
-"yksinkertaisesti <hilight>Käytä</hilight>- tai <hilight>OK</hilight>-"
-"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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Ei mitään"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Koko ja sijainti"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Lukot"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Koko, sijainti ja lukot"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Kaikki"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Muista"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Ikkunan nimi ja luokka"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Ikkunan nimi"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Ikkunan luokka"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Ikkunan rooli"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Ikkunan tyyppi"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Vaihtuma"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Muistettavat ominaisuudet"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Kuvakkeen ominaisuudet"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuaalityöpöytä"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Nykyinen näyttö"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ohita ikkunalista"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Sovellustiedosto tai nimi (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Sovita vain yksi ikkuna"
 
-#: src/bin/e_int_border_remember.c:546
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr "Aktivoi aina aloitettaessa"
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Pidä nykyiset ominaisuudet"
+
+#: src/bin/e_int_border_remember.c:766
 msgid "Start this program on login"
 msgstr "Aloita tämä ohjelma sisäänkirjauduttaessa"
 
-#: src/bin/e_int_border_remember.c:550
-msgid "Always focus on start"
-msgstr "Aktivoi aina aloitettassa"
-
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "Työpöydän asetukset"
+msgstr "Asetukset"
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
@@ -2077,32 +2016,31 @@ msgid "File Manager"
 msgstr "Tiedostonhallinta"
 
 #: src/bin/e_int_config_modules.c:44
-#, fuzzy
 msgid "Shelf"
-msgstr "Hylly #"
+msgstr "Hylly"
 
 #: src/bin/e_int_config_modules.c:120
 msgid "Module Settings"
 msgstr "Moduulien asetukset"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Käytettävissä olevat moduulit"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Ota moduuli käyttöön"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Käytössä olevat moduulit"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Poista moduuli käytöstä"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2133,12 +2071,11 @@ msgid "Remove Gadget"
 msgstr "Poista vempain"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "Ponnahduksen setukset"
+msgstr "Työkalurivin asetukset"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Asettelu"
 
@@ -2165,12 +2102,12 @@ msgid "Favorite Applications"
 msgstr "Suosikkisovellukset"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2179,7 +2116,7 @@ msgstr "Sovellukset"
 msgid "Windows"
 msgstr "Ikkunat"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Kadonneet ikkunat"
 
@@ -2212,134 +2149,131 @@ msgid "(No Applications)"
 msgstr "(Ei sovelluksia)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Virtuaalityöpöydät"
+msgstr "Määritä virtuaalityöpöydät"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Ei ikkunoita)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Ei nimeä!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Ei hyllyjä)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Hylly #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Lisää hylly"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Poista hylly"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Hyllyn asetukset"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pieni"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
-msgstr "Keskiarvoinen"
+msgstr "Keskikokoinen"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Suuri"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Valtava"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Hyllyn sisältö"
+msgstr "Aseta sisältö..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Kaiken päällä"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Ikkunoiden alla"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Kaiken alla"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
-msgstr "Salli ikkunoidenn limittyä hyllyn kanssa"
+msgstr "Salli ikkunoiden limittyä hyllyn kanssa"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Kutista sisältöä vastaavaksi"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikseliä"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Tyylit"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automaattinen piilotus"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Piilota hylly automaattisesti"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Näytä hiiren hiirenheilautuksella"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
-msgstr "Näytä hiirenklikkauksella"
+msgstr "Näytä hiiren napsautuksella"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Piiloutumisen viive"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekuntia"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Piiloutumisen kesto"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Näytä kaikilla työpöydillä"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Näytä määritetyillä työpöydillä"
 
@@ -2374,7 +2308,7 @@ msgstr ""
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2401,26 +2335,30 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Valinnat:\n"
-"\t-näyttö DISPLAY\n"
-"\t\tYhdistys näyttöön DISPLAY.\n"
-"\t\tEG: -display :1.0\n"
+"Valitsimet:\n"
+"\t-display NÄYTTÖ\n"
+"\t\tYhdistä näyttöön NÄYTTÖ.\n"
+"\t\tESIM: -display :1.0\n"
 "\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tLisää keinotekoisen xinerama-ruudun (oikeiden sijaan)\n"
-"\t\tLisää niin monta kun haluat. Ne kaikki korvaavat oikeita\n"
-"\t\txinerama-ruutuja, jos yhtäkään. Tätä voidaan käyttää\n"
-"\t\txineraman simuloimiseen.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"\t\tLisää keinotekoinen xinerama-näyttö (oikeiden sijaan)\n"
+"\t\tannetulla geometrialla. Lisää niin monta kuin haluat. Ne kaikki\n"
+"\t\tkorvaavat oikeat xinerama-näytöt, jos yhtäkään. Tätä voidaan\n"
+"\t\tkäyttää xineraman simulointiin.\n"
+"\t\tESIM: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
 "+0\n"
 "\t-profile CONF_PROFILE\n"
-"\tKäytä asetusprofiilia CONF_PROFILE käyttäjän valitseman vakion sijaan tai "
-"vain \"default\".\n"
-"\t-hyvä\n"
+"\t\tKäytä asetusprofiilia CONF_PROFILE käyttäjän valitseman vakion sijaan "
+"tai vain \"default\".\n"
+"\t-good\n"
 "\t\tOle hyvä.\n"
-"\t-paha\n"
+"\t-evil\n"
 "\t\tOle paha.\n"
-"\t-psykoottinen\n"
+"\t-psychotic\n"
 "\t\tOle psykoottinen.\n"
+"\t-locked\n"
+"\t\tKäynnistyy lukitulla ruudulla, eli salasana kysytään.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tJos tarvitset tätä ohjetta, et tarvitse tätä valitsinta.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2519,10 +2457,9 @@ msgid ""
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 "Enlightenment selvitti, että ecore_evas ei tue ohjelmistopohjaista\n"
-"puskurirenderöintiä Evasissa. Tarkkista Evas ja Ecore asennuksesi ja "
+"puskurirenderöintiä Evasissa. Tarkista Evas- ja Ecore-asennuksesi ja "
 "tarkista\n"
-"että ne tukevat ohjelmistopohjaista ohjelmistopohjaista "
-"puskurirenderöintimoottoria."
+"että ne tukevat ohjelmistopohjaista puskurirenderöintimoottoria."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
 msgid ""
@@ -2549,9 +2486,8 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment ei voi käynnistää asetusjärjestelmäänsä."
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment ei voi asettaa hyllyjärjestelmäänsä."
+msgstr "Enlightenment ei voi asettaa skaalausjärjestelmäänsä."
 
 #: src/bin/e_main.c:600
 msgid "Enlightenment cannot set up the pointer system."
@@ -2581,19 +2517,19 @@ msgstr "Käynnistetään kansainvälisyyden tuki"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ei voi käynnistää kansainvälisyyden järjestelmäänsä."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ei voi käynnistää aloitusruutua.\n"
-"Ehkäpä muisti on vähänä?"
+"Ehkäpä muisti on lopussa?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Testataan formaattitukea"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2602,7 +2538,7 @@ msgstr ""
 "Tarkistaisitko,\n"
 "että Evasilla on ohjelmistopohjainen puskurimoottorin tuki.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2611,7 +2547,7 @@ msgstr ""
 "että\n"
 "Evasilla on PNG-latauksen tuki.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2619,7 +2555,7 @@ msgstr ""
 "Enlightenment selvitti, että Evas ei voi ladata JPEG-tiedostoja. Tarkista,\n"
 "että Evasilla on JPEG-latauksen tuki.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2627,22 +2563,22 @@ msgstr ""
 "Enlightenment selvitti, että Evas ei voi ladata EET-tiedostoja. Tarkista,\n"
 "että Evasilla on EET-latauksen tuki.\n"
 
-#: src/bin/e_main.c:722
-#, fuzzy
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Enlightenment selvitti, että Evas ei voi ladata PNG-tiedostoja. Tarkista, "
-"että\n"
-"Evasilla on PNG-latauksen tuki.\n"
+"Enlightenment havaitsi että Evas ei pysty lataamaan \"Sans\"-fonttia. "
+"Tarkista että Evas\n"
+"sisältää fontconfig-tuen ja että järjestelmän fontconfig määrittelee \"Sans"
+"\"-fontin.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Aseta näytöt"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2650,196 +2586,192 @@ msgstr ""
 "Enlightenment asettama ikkunanhallinta kaikille järjestelmäsi näytöille\n"
 "epäonnistui. Ehkäpä toinen ikkunamanageri on käynnissä?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Aseta näytönsäästäjä"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ei voi säätää X-näytönsäästäjää."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Aseta työpöydän lukko"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ei voi asettaa työpöydän lukitusjärjestelmäänsä."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Asetetaan polkuja"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Aseta järjestelmän kontrollit"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ei voi käynnistää järjestelmäkomentojärjestelmää.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Aseta toiminnot"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ei voi asettaa toimintojärjestelmäänsä."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Aseta suoritusjärjestelmä"
 
-#: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
-msgstr "Enlighenment ei voi asettaa suoritusjärjestelmäänsä."
-
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Aseta muistamiset"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ei voi asettaa muistamisasetuksia."
+msgid "Enlightenment cannot set up its exec system."
+msgstr "Enlightenment ei voi asettaa suoritusjärjestelmäänsä."
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Aseta tiedostonhallinta"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ei voi aloittaa tiedostonhallintaa.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Aseta viestijärjestelmä"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ei voi asettaa viestijärjestelmäänsä."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Aseta Drag & Drop (DND)"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ei voi asettaa Drag & Drop -järjestelmäänsä."
 
-#: src/bin/e_main.c:869
-#, fuzzy
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr "Aseta syötteenkaappauksen hallinta"
+msgstr "Aseta syötteenkaappauksen hallintajärjestelmä"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment ei voi asettaa syötteenkaappauksen hallintajärjestelmäänsä."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Aseta moduulit"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ei voi asettaa moduulijärjestelmäänsä."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Aseta muistamiset"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ei voi asettaa muistamisasetuksia."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Aseta väriluokat"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ei voi asettaa väriluokkajärjestelmäänsä."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Aseta vempaimenhallinta (Gadcon)"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ei voi asettaa vempaimenhallintajärjestelmäänsä."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Aseta DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Elightenment ei voi säätää DPMS-asetuksia."
+msgstr "Enlightenment ei voi säätää DPMS-asetuksia."
 
-#: src/bin/e_main.c:918
-#, fuzzy
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
-msgstr "Aseta CPU:n tehokäytäntö"
+msgstr "Aseta virransäästötilat"
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment ei voi asettaa ponnahdusjärjestelmäänsä."
+msgstr "Enlightenment ei voi asettaa virransäästötiloja."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Aseta taustakuva"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr "Enlightenment ei voi asettaa työpöydän taustakuvajärjestelmäänsä"
+msgstr "Enlightenment ei voi asettaa työpöydän taustakuvajärjestelmäänsä."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Aseta hiiri"
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Elightenment ei voi säätää DPMS-asetuksia."
+msgstr "Enlightenment ei voi säätää hiiren asetuksia."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Aseta hiiri/näppäimistötoiminnot"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ei voi asettaa hiiri/näppäimistötoimintojärjestelmäänsä."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Aseta ponnahdukset"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ei voi asettaa ponnahdusjärjestelmäänsä."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Aseta hyllyt"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ei voi asettaa hyllyjärjestelmäänsä."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Asetetaan pikkukuvien tekijä"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ei voi käynnistää pikkukuvajärjestelmäänsä.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Aseta tiedostojen järjestely"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ei voi asettaa tiedostojenjärjestelyjärjestelmäänsä."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Lataa moduulit"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2851,12 +2783,12 @@ msgstr ""
 "poistaa<br>ongelmamoduulit kokoonpanostasi. Moduulien<br>asetusvalikon "
 "tulisi antaa sinun valita moduulisi<br>uudestaan."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 "Enlightenment kaatui varhaisessa vaiheessa ja on käynnistetty uudelleen."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2868,15 +2800,15 @@ msgstr ""
 "poistaa<br>ongelmamoduulit kokoonpanostasi. Moduulien<br>asetusvalikon "
 "tulisi antaa sinun valita moduulisi<br>uudestaan."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Muokkaa hyllyjä"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Melkein valmis"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2885,11 +2817,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Virhe moduulin lataamisessa"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2898,11 +2830,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Moduuli ei sisällä kaikkia tarvittuja funktioita"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2913,12 +2845,12 @@ msgstr ""
 "vähintään moduuli-API:n version %i.<br>Enlightenmentin ilmoittama moduuli-"
 "API on: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenmentin %s-moduuli"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Haluaisitko poistaa käytöstä tämän moduulin?<br>"
 
@@ -2929,30 +2861,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Haluatko varmasti poistaa tämän hyllyn?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Vaadit tämän hyllyn poistamista.<br><br>Haluatko varmasti poistaa sen?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Lopeta kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Aloita kohteiden siirtäminen/koon muuttaminen"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Hyllyn sisältö"
+msgstr "Määritä hyllyn sisältö"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
@@ -2969,11 +2900,11 @@ msgstr "Tarkistetaan järjestelmän oikeuksia"
 msgid "System Check Done"
 msgstr "Järjestelmän tarkistus valmis"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Sisäänkirjautumisen ongelmat"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2983,157 +2914,139 @@ msgstr ""
 "sulkeutumasta.<br>Haluatko suorittaa uloskirjautumisen loppuun<br>joka "
 "tapauksessa sulkematta näitä<br>sovelluksia ensin?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Kirjaudu ulos nyt"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Odota pidempään"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Peruuta uloskirjautuminen"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Uloskirjautuminen käynnissä"
 
-#: src/bin/e_sys.c:366
-#, fuzzy
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr ""
-"Uloskirjautuminen on juuri käynnissä.<br><hilight>Odota, kiitos.</hilight>"
+msgstr "Uloskirjautuminen käynnissä.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment on kiireinen toisen vaatimuksen takia"
 
-#: src/bin/e_sys.c:401
-#, fuzzy
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Enlightenment on kirjaamassa sinua ulos.<br>Et voi suorittaa muita "
-"järjestelmätoimintoja,<br>kun uloskirjautuminen on alkanut."
+"Kirjaudutaan ulos järjestelmästä.<br>Muita järjestelmätoimintoja ei voi "
+"suorittaa<br>kun uloskirjautuminen on alkanut."
 
-#: src/bin/e_sys.c:409
-#, fuzzy
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Enlightenment sammuttaa järjestelmää.<br>Et voi suorittaa muita "
-"järjestelmätoimintoja,\n"
-"kun sammutus on alkanut."
+"Kone sammutetaan.<br>Mitään muita järjestelmätoimintoja ei voida suorittaa "
+"sammutusprosessin käynnistyttyä."
 
-#: src/bin/e_sys.c:416
-#, fuzzy
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Enlightenment uudelleenkäynnistää järjestelmää.<br>Et voi suorittaa muita "
-"järjestelmätoimintoja,<br>kun uudelleenkäynnistys on alkanut."
+"Järjestelmä käynnistetään uudelleen.<br>Muita järjestelmätoimintoja ei voi "
+"suorittaa,<br>kun uudelleenkäynnistys on alkanut."
 
-#: src/bin/e_sys.c:423
-#, fuzzy
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
-"Enlightenment asettaa järjestelmää valmiustilaan.<br>Ennen valmiustilan "
-"loppuunsaattamista et voi suorittaa<br>muita järjestelmätoimintoja."
+"Asetutaan valmiustilaan.<br>Ennen valmiustilan loppuunsaattamista ei voi "
+"suorittaa<br>muita järjestelmätoimintoja."
 
-#: src/bin/e_sys.c:430
-#, fuzzy
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
-"Enlightenment asettaa järjestelmää lepotilaan.<br>Ennen lepotilan "
-"loppuunsaattamista et voi suorittaa<br>muita järjestelmätoimintoja."
+"Asetutaan lepotilaan.<br>Ennen lepotilan loppuunsaattamista ei voi "
+"suorittaa<br>muita järjestelmätoimintoja."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "IIK! Tätä ei pitäisi tapahtua"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
-msgstr ""
+msgstr "Koneen sammutus epäonnistui."
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "Työpöytätiedosto"
+msgstr "Uudelleenkäynnistys epäonnistui."
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "Lepotilan viive"
+msgstr "Valmiustilaan siirtyminen epäonnistui."
 
-#: src/bin/e_sys.c:478
-#, fuzzy
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
-msgstr "Järjestelmäsi asettaminen lepotilaan epäonnistui."
+msgstr "Lepotilaan siirtyminen epäonnistui."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
-msgstr ""
+msgstr "Sammuta"
 
-#: src/bin/e_sys.c:538
-#, fuzzy
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Koneesi uudelleenkäynnistetään.<br><hilight>Odota, kiitos.</hilight>"
+msgstr "Kone sammutetaan.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "Työpöydän asetukset"
+msgstr "Käynnistetään uudelleen"
 
-#: src/bin/e_sys.c:565
-#, fuzzy
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Koneesi uudelleenkäynnistetään.<br><hilight>Odota, kiitos.</hilight>"
+msgstr "Kone käynnistetään uudelleen.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Asetutaan valmiustilaan"
 
-#: src/bin/e_sys.c:591
-#, fuzzy
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Koneesi asetetaan valmiustilaan.<br><hilight>Odota, kiitos.</hilight>"
+msgstr "Asetutaan valmiustilaan.<br><hilight>Odota hetki.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Asetutaan lepotilaan"
 
-#: src/bin/e_sys.c:617
-#, fuzzy
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr "Koneesi asetetaan lepotilaan.<br><hilight>Odota, kiitos.</hilight>"
+msgstr "Asetutaan lepotilaan.<br><hilight>Odota hetki.</hilight>"
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "Tietoa teemasta"
+msgstr "Tietoja teemasta"
 
 #: src/bin/e_theme.c:42
 msgid "Set As Theme"
 msgstr "Aseta teemaksi"
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Työkalurivin sisältö"
+msgstr "Määritä työkalurivin sisältö"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Ei voi poistua - kuolemattomia ikkunoita."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3143,77 +3056,77 @@ msgstr ""
 "Tämä tarkoittaa sitä,<br>että Enlightenment ei salli itseään suljettavan "
 "ennen kuin nämä ikkunat on<br>suljettu tai elinaikalukko poistettu.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f tavua"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f kt"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mt"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Gt"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Tulevaisuudessa"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Viimeisimmän minuutin aikana"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li vuotta sitten"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li kuukautta sitten"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li viikkoa sitten"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li päivää sitten"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li tuntia sitten"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuuttia sitten"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3233,58 +3146,57 @@ msgstr "Ylös"
 msgid "Down"
 msgstr "Alas"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Lisää Suosikkeihin"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Siirry ylös hakemistossa"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Oikeudet"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Muokattu"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Sinä"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Suojattu"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Vain luku"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Kielletty"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Luku-Kirjoitus"
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Akkumonitorin asetukset"
+msgstr "Akkumittarin asetukset"
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3292,65 +3204,59 @@ msgstr "Perusasetukset"
 
 #: src/modules/battery/e_mod_config.c:94
 msgid "Show alert when battery is low"
-msgstr "Näytä varoitus akun ollessa vähänä"
+msgstr "Näytä varoitus akun alhaisesta varauksesta"
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Akun tarkistuksen väli:"
+msgstr "Tarkistusväli:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f tiedostoa"
+msgstr "%1.0f tickiä"
 
-#: src/modules/battery/e_mod_config.c:141
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
-msgstr "Paljas"
+msgstr "Seuranta"
 
-#: src/modules/battery/e_mod_config.c:144
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
-msgstr "Näytä varoitus akun ollessa vähänä"
+msgstr "Varoita kun akun varaustaso on alhainen"
 
-#: src/modules/battery/e_mod_config.c:146
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr "Hälytä akun tason ollessa:"
+msgstr "Varoita kun varausta on jäljellä:"
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "%1.0f minuuttia"
+msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f sekuntia"
+msgstr "%1.0f s"
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "Kiihdytä"
+msgstr "Varoitus"
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "Automaattinen piilotus"
+msgstr "Automaattinen tunnistus"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3358,13 +3264,12 @@ msgstr "Automaattinen piilotus"
 msgid "Internal"
 msgstr "Sisäinen"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
-#, fuzzy
 msgid "HAL"
-msgstr "ALT"
+msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3372,25 +3277,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Akku"
 
-#: src/modules/battery/e_mod_main.c:844
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
-msgstr "Näytä varoitus akun ollessa vähänä"
+msgstr "Akun varaustaso on alhainen!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
-msgstr ""
+msgstr "VIRHE"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Akkumittari"
 
@@ -3398,26 +3302,22 @@ msgstr "Akkumittari"
 msgid "Clock"
 msgstr "Kello"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "Työpöydän asetukset"
+msgstr "Asetuspaneeli"
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Työpöydän asetukset"
+msgstr "Esitystila"
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Sammutuksen viive"
+msgstr "Offline-tila"
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Moduulit"
+msgstr "Tilat"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3441,7 +3341,7 @@ msgid "Restart Applications"
 msgstr "Uudelleenkäynnistyksen sovellukset"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Kaikki sovellukset"
 
@@ -3450,9 +3350,8 @@ msgid "Selected Applications"
 msgstr "Valitut sovellukset"
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Käytä"
+msgstr "Sovellukset"
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
@@ -3464,12 +3363,12 @@ msgstr "IBar muut"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Valikot"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Kehysten oletustyyli"
 
@@ -3477,14 +3376,14 @@ msgstr "Kehysten oletustyyli"
 msgid "Window Border Selection"
 msgstr "Ikkunankehyksen valinta"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Muista tämä kehys tälle ikkunalle, kun ikkuna seuraavan kerran avautuu"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3492,9 +3391,8 @@ msgstr "Muista tämä kehys tälle ikkunalle, kun ikkuna seuraavan kerran avautu
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "Lukot"
+msgstr "Ulkoasu"
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3511,7 +3409,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3589,146 +3487,131 @@ msgid "Client List Menu"
 msgstr "Asiakaslista-valikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
-#, fuzzy
 msgid "Window Manager"
-msgstr "Ikkunanhallinnan värit"
+msgstr "Ikkunanhallinta"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
 msgid "About Dialog Title"
-msgstr ""
+msgstr "Tietoa-ikkunan otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
 msgid "About Dialog Version"
-msgstr ""
+msgstr "Tietoa-ikkunan versioteksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#, fuzzy
 msgid "Border Title"
-msgstr "Kehyksen tyyli"
+msgstr "Otsikkoteksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Muokkaa virtuaalityöpöytiä"
+msgstr "Asetusikkunan otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#, fuzzy
 msgid "Error Text"
-msgstr "Virhelogit"
+msgstr "Virheviesti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 #: src/modules/conf_fonts/e_int_config_fonts.c:63
-#, fuzzy
 msgid "Menu Title"
-msgstr "Otsikko"
+msgstr "Valikon otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Aktiivisen valikon otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
-#, fuzzy
 msgid "Menu Item"
-msgstr "Valikon kohteiden tekstit"
+msgstr "Valikon teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
-#, fuzzy
 msgid "Menu Item Active"
-msgstr "Valikon kohteiden tekstit"
+msgstr "Aktiivisen valikon teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
-#, fuzzy
 msgid "Move Text"
-msgstr "Siirrä"
+msgstr "Ikkunan siirtoteksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
 #: src/modules/conf_fonts/e_int_config_fonts.c:68
-#, fuzzy
 msgid "Resize Text"
-msgstr "Muuta kokoa"
+msgstr "Ikkunan koon muutosteksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
-#, fuzzy
 msgid "Winlist Item"
-msgstr "Ikkunalista"
+msgstr "Ikkunalistan kohta"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
 msgid "Winlist Label"
-msgstr ""
+msgstr "Ikkunalistan nimike"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
-#, fuzzy
 msgid "Winlist Title"
-msgstr "Näytä otsikko"
+msgstr "Ikkunalistan otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 #: src/modules/conf_fonts/e_int_config_fonts.c:82
-#, fuzzy
 msgid "Widgets"
-msgstr "Vempainten värit"
+msgstr "Vimpaimet"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
-#, fuzzy
 msgid "Button Text"
-msgstr "Painike %i"
+msgstr "Painikkeen teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:69
 msgid "Button Text Disabled"
-msgstr ""
+msgstr "Passiivisen painikkeen teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
 msgid "Check Text"
-msgstr ""
+msgstr "Asetusnapin teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
 msgid "Check Text Disabled"
-msgstr ""
+msgstr "Passiivisen asetusnapin teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
 msgid "Entry Text"
-msgstr ""
+msgstr "Tekstikentän teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
 msgid "Label Text"
-msgstr ""
+msgstr "Nimikkeen teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
 msgid "List Item Text"
-msgstr ""
+msgstr "Listan kohdan teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "List Item Odd Text"
-msgstr ""
+msgstr "Listan parittoman kohdan teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:76
 #: src/modules/conf_fonts/e_int_config_fonts.c:92
-#, fuzzy
 msgid "List Header"
-msgstr "Asiakasjohtaja"
+msgstr "Listan otsikko"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
 msgid "Radio Text"
-msgstr ""
+msgstr "Valintanapin teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "Passiivisen valintanapin teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
 msgid "Slider Text"
-msgstr ""
+msgstr "Liukusäätimen teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "Passiivisen liukusäätimen teksti"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
-#, fuzzy
 msgid "Module Label"
-msgstr "Moduulien värit"
+msgstr "Moduulin nimike"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:130
 #: src/modules/conf_colors/e_mod_main.c:35
@@ -3736,9 +3619,8 @@ msgid "Colors"
 msgstr "Värit"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
-#, fuzzy
 msgid "Other"
-msgstr "IBar muut"
+msgstr "Muut"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Window Manager Colors"
@@ -3795,9 +3677,9 @@ msgid "Desktop Name"
 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:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -3807,9 +3689,8 @@ msgstr "Työpöydän taustakuva"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Valitse"
+msgstr "Aseta"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
@@ -3824,18 +3705,16 @@ msgid "Automatic Locking"
 msgstr "Automaattinen lukitus"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Käytä Enlightenmentin kursoria"
+msgstr "Lukitse Enlightenmentin käynnistyessä"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Lukitse X-näytönsäästäjän aktivoituessa"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "X-näytönsäästäjän vaihtumisen viive"
+msgstr "Lukituksen viive näytönsäästäjän aktivoiduttua"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3866,10 +3745,10 @@ msgstr "%1.0f minuuttia"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Oma"
@@ -3901,8 +3780,8 @@ msgstr "Näytä näytön alueella #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3915,16 +3794,15 @@ msgstr "Taustakuvatila"
 #: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
-msgstr "Teema määritetty"
+msgstr "Teemassa määritetty"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
 msgstr "Teeman taustakuva"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Käytä teeman taustakuvaa"
+msgstr "Oma taustakuva"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3934,7 +3812,7 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:435
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:197
 msgid "Suggest entering presentation mode"
-msgstr ""
+msgstr "Ehdota esitystilaan siirtymistä"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:439
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:202
@@ -3977,7 +3855,7 @@ msgstr "Työpöydät"
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
-msgstr "Vaihda vedettäessä objekteja näytön laidalle"
+msgstr "Vaihda vedettäessä objekteja näytön reunalle"
 
 #: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
@@ -4007,66 +3885,68 @@ msgid "%1.1f sec"
 msgstr "%1.1f sekuntia"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Taustakuvan vaihto"
+msgstr "Taustan panorointi"
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
 msgid "%.2f X-axis pan factor"
-msgstr ""
+msgstr "%.2f X-akselin kerroin"
 
 #: src/modules/conf_desks/e_int_config_desks.c:325
 #, c-format
 msgid "%.2f Y-axis pan factor"
-msgstr ""
+msgstr "%.2f Y-akselin kerroin"
 
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Virtuaalityöpöydät"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Valintaikkunan asetukset"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Yleisasetukset"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Poista käytöstä vahvistusvalintaikkunat"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(Ei ikkunoita)"
+msgstr "Normaali ikkuna"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "Oletus valintaikkunan tilalle"
+msgstr "Asetusikkunan oletustila"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Perustila"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Lisäasetustila"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Oletus valintaikkunan tilalle"
 
@@ -4075,93 +3955,90 @@ msgid "Dialogs"
 msgstr "Valintaikkunat"
 
 #: src/modules/conf_display/e_int_config_display.c:129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored in %d seconds."
 msgstr ""
-"Näyttääkö tämä hyvältä? Paina <hilight>Kyllä</hilight>, jos näyttää, muuten "
-"Ei.<br>Jos et paina mitään näppäintä, vanha resoluutio <br>%dx%d @ %d Hz "
-"palautetaan %d sekunnin päästä."
+"Näyttääkö tämä hyvältä? Jos näyttää, paina <hilight>Tallenna</hilight>, "
+"muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
+"@ %d Hz palautetaan %d sekunnin kuluttua."
 
 #: src/modules/conf_display/e_int_config_display.c:136
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
-"Näyttääkö tämä hyvältä? Paina <hilight>Kyllä</hilight>, jos näyttää, muuten "
-"Ei.<br>Jos et paina mitään näppäintä, vanha resoluutio <br>%dx%d palautetaan "
-"%d sekunnin päästä."
+"Näyttääkö tämä hyvältä? Jos näyttää, paina <hilight>Tallenna</hilight>, "
+"muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
+"palautetaan %d sekunnin kuluttua."
 
 #: src/modules/conf_display/e_int_config_display.c:146
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Näyttääkö tämä hyvältä? Paina <hilight>Kyllä</hilight>, jos näyttää, muuten "
-"Ei.<br>Jos et paina mitään näppäintä, vanha resoluutio <br>%dx%d @ %d Hz "
-"palautetaan <hilight>VÄLITTÖMÄSTI</hilight>."
+"Näyttääkö tämä hyvältä? Jos näyttää, paina <hilight>Tallenna</hilight>, "
+"muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
+"@ %d Hz palautetaan <hilight>VÄLITTÖMÄSTI</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:153
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Näyttääkö tämä hyvältä? Paina <hilight>Kyllä</hilight>, jos näyttää, muuten "
-"Ei.<br>Jos et paina mitään näppäintä, vanha resoluutio <br>%dx%d palautetaan "
-"<hilight>VÄLITTÖMÄSTI</hilight>."
+"Näyttääkö tämä hyvältä? Jos näyttää, paina <hilight>Tallenna</hilight>, "
+"muussa tapauksessa Palauta.<br>Jos et paina nappia, aiempi tarkkuus<br>%dx%d "
+"palautetaan <hilight>VÄLITTÖMÄSTI</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
 msgstr "Tarkkuuden vaihto"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Tila"
+msgstr "Tallenna"
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Käynnistä uudelleen"
+msgstr "Palauta"
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
 msgstr "Näytön tarkkuuden asetukset"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Tarkkuus"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
-msgstr "Palauta sisäänkirjautuessa"
+msgstr "Palauta sisäänkirjauduttaessa"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Päivitys"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Kierto"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Peilaus"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Puuttuvia ominaisuuksia"
 
-#: src/modules/conf_display/e_int_config_display.c:642
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4169,17 +4046,16 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
-"X-näyttöpalvelimestasi puuttuu tuki<br><hilight>XRandr</hilight> (X:n koon "
-"muuttaminen ja rotaatio)-laajennukselle.<br>Et voi vaihtaa näytön "
-"tarkkuuksia ilman<br>tämän laajennuksen tukea. Voi myös olla,<br> että "
-"silloin, kun <hilight>ecore</hilight> käännettiin,<br>ei XRandr-tukea "
-"havaittu."
+"X-näyttöpalvelimesi ei tue<br><hilight>XRandR</hilight>-laajennosta (X "
+"Resize and Rotate).<br>Näytön resoluutioita ei voi vaihtaa jos<br>tämän "
+"laajennoksen tuki puuttuu. On myös mahdollista<br>että <hilight>ecore</"
+"hilight>a käännettäessä<br>XRandR-tukea ei havaittu."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Ei löydettyjä ruudunpäivityksen arvoja"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4208,7 +4084,7 @@ msgstr "Nykyinen näyttöpalvelin ei ole<br>DPMS-valmis"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:82
 msgid "The current display server does not <br>have the DPMS extension."
-msgstr "Nykyisellä näyttöpalvelimells ei ole<br>DPMS-laajennusta."
+msgstr "Nykyisellä näyttöpalvelimella ei ole<br>DPMS-laajennusta."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
@@ -4219,9 +4095,8 @@ msgid "Enable Display Power Management"
 msgstr "Ota käyttöön näytön virranhallinta"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "Ajastimet"
+msgstr "Ajastukset"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
@@ -4240,7 +4115,7 @@ msgid "Power Management"
 msgstr "Virranhallinta"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4250,113 +4125,109 @@ msgstr "<Ei mitään>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "Näppäimistötoimintojen asetukset"
+msgstr "Reunatoimintojen asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Näppäimistötoiminnot"
+msgstr "Reunatoiminnot"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "Lisää vempain"
+msgstr "Lisää reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "Poista näppäin"
+msgstr "Poista reuna"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "Muokkaa näppäintä"
+msgstr "Muokkaa reunaa"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Poista kaikki"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Palauta oletusnäppäimet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Toiminto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Toiminnon parametrit"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "Yleisasetukset"
+msgstr "Yleiset asetukset"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
-msgstr "Salli ikkunoiden olla Koko näytön -ikkunan päällä"
+msgstr "Salli toimintojen aktivointi kokoruudun ikkunoille"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "Näppäimistötoiminnon sekvenssi"
+msgstr "Reunatoiminnon sekvenssi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f sekuntia"
+msgstr "%.2f sekuntia"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr "Näppäimistötoiminnon virhe"
+msgstr "Reunatoimintovirhe"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
-"Näppäinyhdistelmä, jonka valitset, on jo toiminnon<br><hilight>%s</hilight> "
+"Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4366,9 +4237,8 @@ msgstr "WIN"
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "Aloitus"
+msgstr "Syöttölaitteet"
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4384,7 +4254,7 @@ msgstr "Oletusmoottori"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
-msgstr "Ota komposiitituki käyttöön?"
+msgstr "Ota komposiittituki käyttöön?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4393,7 +4263,7 @@ msgid ""
 "support ?"
 msgstr ""
 "Olet valinnut komposiittituen käyttöön ottamisen,<br>mutta nykyinen näyttösi "
-"ei tue komposiittiä.<br><br>Haluatko varmasti ottaa komposiittituen käyttöön?"
+"ei tue komposiittia.<br><br>Haluatko varmasti ottaa komposiittituen käyttöön?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4496,7 +4366,7 @@ msgstr "Maksimikorkeus"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:225
 #: src/modules/conf_winlist/e_int_config_winlist.c:284
 msgid "Position Settings"
-msgstr "Sijainnin setukset"
+msgstr "Sijainnin asetukset"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:226
 #: src/modules/conf_winlist/e_int_config_winlist.c:285
@@ -4514,14 +4384,12 @@ msgid "Run Command"
 msgstr "Suorita komento"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
 msgid "Core"
-msgstr "Sulje"
+msgstr "Ydin"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
-#, fuzzy
 msgid "Title Bar"
-msgstr "Otsikko"
+msgstr "Ikkunan otsakerivi"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
@@ -4536,100 +4404,86 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Työpöydän asetukset"
+msgstr "Asetusten otsake"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
-#, fuzzy
 msgid "About Title"
-msgstr "Tietoa teemasta"
+msgstr "Tietoa-ikkunan otsake"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
-msgstr ""
+msgstr "Tietoa-ikkunan versioteksti"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
-#, fuzzy
 msgid "About Text"
-msgstr "Tietoa"
+msgstr "Tietoa-ikkunan teksti"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:74
-#, fuzzy
 msgid "Desklock Title"
-msgstr "Työpöytätiedosto"
+msgstr "Työpöytälukituksen otsikko"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
-msgstr ""
+msgstr "Työpöytälukituksen salasana"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:76
-#, fuzzy
 msgid "Dialog Error"
-msgstr "Valintaikkunat"
+msgstr "Virheikkuna"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
-#, fuzzy
 msgid "Exebuf Command"
-msgstr "Suorituskomento"
+msgstr "Suorita komento -teksti"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
-#, fuzzy
 msgid "Splash Title"
-msgstr "Näytä otsikko"
+msgstr "Käynnistysruudun otsikko"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
-msgstr ""
+msgstr "Käynnistysruudun teksti"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
-msgstr ""
+msgstr "Käynnistysruudun versioteksti"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:84
-#, fuzzy
 msgid "Frame"
-msgstr "Ruudunpäivitys"
+msgstr "Kehys"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:85
-#, fuzzy
 msgid "Label"
-msgstr "Kuvakkeiden nimikkeet"
+msgstr "Nimike"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:86
-#, fuzzy
 msgid "Buttons"
-msgstr "Painike %i"
+msgstr "Painikkeet"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:87
-#, fuzzy
 msgid "Slider"
-msgstr "Koko"
+msgstr "Liukusäädin"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
-msgstr ""
+msgstr "Valintanapit"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
-msgstr ""
+msgstr "Asetusnapit"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:90
-#, fuzzy
 msgid "Text List Item"
-msgstr "Asiakaslista-valikko"
+msgstr "Tekstilistan kohta"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
-#, fuzzy
 msgid "List Item"
-msgstr "Listaa"
+msgstr "Listan kohta"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
-#, fuzzy
 msgid "Filemanager"
 msgstr "Tiedostonhallinta"
 
@@ -4638,18 +4492,16 @@ msgid "Typebuf"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Näytä työpöydän kuvakkeet"
+msgstr "Työpöydän kuvake"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
-#, fuzzy
 msgid "Normal Styled"
-msgstr "Normaali"
+msgstr "Normaali tyylitelty"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
@@ -4672,18 +4524,17 @@ msgstr "Todella suuri"
 msgid "%d pixels"
 msgstr "%d pikseliä"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ota käyttöön mukautetut fonttiluokat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Esikatseluteksti: abc ABC 123: 我的天空!"
 
@@ -4691,39 +4542,50 @@ msgstr "Esikatseluteksti: abc ABC 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Fonttiluokat"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Ota käyttöön fonttiluokat"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Fontti"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Tyyli"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Laajempi esikatseluteksti.. abcåäö ABCÅÄÖ 123"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Vihjeistys"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Tavukoodi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Varafontit"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Varafontin nimi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
-msgstr "Ota käyttöön varafontit"
+msgstr "Käytä varafontteja"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Laajempi esikatseluteksti.. abcåäö ABCÅÄÖ 123"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Vihjeistys / varafontit"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4735,9 +4597,9 @@ msgstr "Kuvaketeemat"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
-msgstr ""
+msgstr "Kuvaketeema korvaa perusteeman"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Kuvaketeema"
 
@@ -4782,10 +4644,9 @@ msgstr "Asetuskomento"
 
 #: src/modules/conf_imc/e_int_config_imc.c:934
 msgid "Exported Environment Variables"
-msgstr "Viedyt ympäsirtömuuttujat"
+msgstr "Viedyt ympäristömuuttujat"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
 msgstr "Valitse syöttötavan asetukset..."
 
@@ -4808,27 +4669,25 @@ msgid ""
 msgstr "Enlightenment ei voinut tuoda asetuksia kopiointivirheen<br>vuoksi."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Kieli"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Valinnan asetukset"
+msgstr "Vuorovaikutuksen asetukset"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "Pikkukuva"
+msgstr "Sormivieritys"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
-msgstr ""
+msgstr "Käytä sormivieritystä"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr ""
+msgstr "Vetoliikkeen raja-arvo"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
@@ -4838,26 +4697,25 @@ msgstr "%1.0f pikseliä"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
 msgid "Threshold for applying drag momentum"
-msgstr ""
+msgstr "Raja-arvo vetoliikkeen nopeudelle"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f pikseliä/sekunti"
+msgstr "%1.0f pikseliä/s"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
-msgstr ""
+msgstr "Hidastuskitkan aloitusviive"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f sekuntia"
+msgstr "%1.2f s"
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Sisäinen"
+msgstr "Vuorovaikutus"
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -4921,7 +4779,7 @@ 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 ""
-"Näppäinyhdistelmä, jonka valitset, on jo toiminnon<br><hilight>%s</hilight> "
+"Valitsemasi näppäinyhdistelmä on jo toiminnon<br><hilight>%s</hilight> "
 "käytössä.<br>Valitse jokin toinen näppäinyhdistelmä, kiitos."
 
 #: src/modules/conf_menus/e_int_config_menus.c:44
@@ -4985,7 +4843,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Automaattivierityksen kursorimarginaali"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Sekalaiset valinnat"
 
@@ -5010,7 +4868,7 @@ msgstr "%4.0f pikseliä/sekunti"
 
 #: src/modules/conf_menus/e_int_config_menus.c:206
 msgid "Click Drag Timeout"
-msgstr "Klikkaa ja vedä -viive"
+msgstr "Paina ja vedä -viive"
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
 #, c-format
@@ -5028,7 +4886,7 @@ msgstr "Tiedostotyypit"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:69
 msgid "File Icon"
-msgstr "Tiedon kuvake"
+msgstr "Tiedoston kuvake"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
 msgid "Mime:"
@@ -5075,7 +4933,7 @@ msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
 msgid "Mouse Binding Settings"
-msgstr "Hiiritoimintojen"
+msgstr "Hiiritoimintojen asetukset"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
 #: src/modules/conf_mousebindings/e_mod_main.c:35
@@ -5138,15 +4996,13 @@ msgstr "Kursorin asetukset"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
-#, fuzzy
 msgid "Show Cursor"
-msgstr "Varjon väri"
+msgstr "Näytä kursori"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
-#, fuzzy
 msgid "Idle Cursor"
-msgstr "Käytä X:n kursoria"
+msgstr "Sykkivä kursori"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
@@ -5166,33 +5022,30 @@ msgstr "Kursorin koko"
 msgid "Mouse Cursor"
 msgstr "Hiiren kursori"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Moduulien asetukset"
+msgstr "Hiiren asetukset"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
-msgstr "Hiiritoiminnot"
+msgstr "Hiiren kätisyys"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Hiiren kiihdytys"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Kiihdytys"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Kynnys"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Käynnistyksen asetukset"
+msgstr "Hakupolkujen asetukset"
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
@@ -5203,7 +5056,7 @@ msgid "Images"
 msgstr "Kuvat"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Teemat"
 
@@ -5252,9 +5105,8 @@ msgstr "%1.0f fps"
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "Ohjelman ajovirhe"
+msgstr "Sovellusten prioriteetti"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5304,36 +5156,33 @@ msgstr "%1.0f kokoelmaa"
 msgid "Performance"
 msgstr "Suorituskyky"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profiilin valitsin"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Käytettävissä olevat profiilit"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Valitse edj-tiedosto"
+msgstr "Valitse profiili"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "Muuta kokoa"
+msgstr "Nollaa"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "Vaadit tämän hyllyn poistamista.<br><br>Haluatko varmasti poistaa sen?"
+msgstr "Aiot poistaa profiilin \"%s\".<br><br>Oletko varma?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "Poista näppäin"
+msgstr "Hyväksy poisto?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Lisää uusi profiili"
 
@@ -5342,82 +5191,75 @@ msgid "Profiles"
 msgstr "Profiilit"
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Valintaikkunan asetukset"
+msgstr "Skaalauksen asetukset"
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
-msgstr ""
+msgstr "Skaalaa DPI-arvon mukaan"
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "Nosta"
+msgstr "Suhteellinen"
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
-msgstr ""
+msgstr "DPI-perusarvo jonka mukaisesti skaalataan"
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.0f F"
+msgstr "%1.0f DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
 msgid "Currently %i DPI"
-msgstr ""
+msgstr "Tällä hetkellä %i DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:245
 msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Älä salli"
+msgstr "Ei skaalausta"
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
-msgstr ""
+msgstr "Skaalaa suhteessa näytön DPI-arvoon"
 
 #: src/modules/conf_scale/e_int_config_scale.c:255
 #, c-format
 msgid "Base DPI (Currently %i DPI)"
-msgstr ""
+msgstr "DPI-perusarvo (tällä hetkellä %i DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:263
 msgid "Custom scaling factor"
-msgstr ""
+msgstr "Mukautettu skaalauskerroin"
 
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%1.0f tiedostoa"
+msgstr "%1.2f kertaa"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Säiliö"
+msgstr "Rajoitukset"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Minimikoko"
+msgstr "Vähintään"
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Maksimikoko"
+msgstr "Enintään"
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Pinoutuminen"
+msgstr "Skaalaus"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
@@ -5476,9 +5318,8 @@ msgstr "Muokatut hyllyt"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Aseta tiedostonhallinta"
+msgstr "Asetukset"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5506,30 +5347,29 @@ msgstr "Käynnistys"
 msgid "Theme Selector"
 msgstr "Teeman valitsin"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "Tuo..."
+msgstr " Tuo..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Teeman osa-alueet"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Ota käyttöön"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Poista kaikki käytöstä"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
-msgstr "Valise teema..."
+msgstr "Valitse teema..."
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:274
 #: src/modules/conf_theme/e_int_config_theme_import.c:283
@@ -5549,9 +5389,8 @@ msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr "Enlightenment ei voinut tuoda teemaa<br>kopiointivirheen vuoksi."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Kuvaketeemat"
+msgstr "Vaihda teemoja"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
@@ -5579,44 +5418,44 @@ msgid "Wallpaper Settings"
 msgstr "Taustakuvan asetukset"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Käytä teeman taustakuvaa"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Kuva..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
-msgstr "Gradientti..."
+msgstr "Liukuväri..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Mihin taustakuva sijoitetaan"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Kaikille työpöydille"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Tälle työpöydälle"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Tälle näytölle"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
 msgid "Create a gradient..."
-msgstr "Luo gradientti..."
+msgstr "Luo liukuväri..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
 msgid "Color 1:"
@@ -5631,14 +5470,14 @@ msgid "Fill Options"
 msgstr "Täytön valinnat"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Leveyssuuntaan"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Korkeussuuntaan"
 
@@ -5656,16 +5495,15 @@ msgstr "Säteittäin"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
 msgid "Gradient Creation Error"
-msgstr "Gradientin luontivirhe"
+msgstr "Liukuvärin luontivirhe"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
 msgid "For some reason, Enlightenment was unable to create a gradient."
-msgstr "Jostain syystä Enlightenment ei voinut luoda gradienttia."
+msgstr "Jostain syystä Enlightenment ei voinut luoda liukuväriä."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Taustakuvan asetukset"
+msgstr "Taustakuvan asetukset..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5704,34 +5542,34 @@ msgstr "Käytä alkuperäistä tiedostoa"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Valitse kuva..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Kuvan tuontivirhe"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 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:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Taustakuvan tuontivirhe"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5739,10 +5577,9 @@ 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:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "Teeman taustakuva"
+msgstr "Vaihda taustakuvia"
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5852,21 +5689,13 @@ msgstr "Käytä mieluiten käyttäjän määrittämää kuvaketta"
 msgid "Prefer application provided icon"
 msgstr "Käytä mieluiten sovelluksen tarjoamaa kuvaketta"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Sisäiset ikkunat"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Muista aina sisäiset ikkunat"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Aktivoinnin asetukset"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:165
 msgid "Click Window to Focus"
-msgstr "Klikkaa ikkunaa aktivoidaksesi"
+msgstr "Napsauta ikkunaa aktivoidaksesi"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:167
 msgid "Window under the Mouse"
@@ -5882,7 +5711,7 @@ msgstr "Aktivointi"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:185
 msgid "Click to focus"
-msgstr "Aktivointi klikkaamalla"
+msgstr "Aktivointi napsauttamalla"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:187
 msgid "Pointer focus"
@@ -5918,15 +5747,15 @@ msgstr "Muut asetukset"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:206
 msgid "Always pass on caught click events to programs"
-msgstr "Välitä aina havaitut klikkaustapahtumat ohjelmille"
+msgstr "Välitä aina havaitut napsautustapahtumat ohjelmille"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
-msgstr "Ikkunan klikkaaminen nostaa sen aina"
+msgstr "Ikkunan napsauttaminen nostaa sen aina"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:210
 msgid "A click in a window always focuses it"
-msgstr "Ikkunan klikkaaminen aktivoi sen aina"
+msgstr "Ikkunan napsautus aktivoi sen aina"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
@@ -5938,7 +5767,7 @@ msgstr "Palauta aktivointi ikkunan piiloutuessa tai sulkeutuessa"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:216
 msgid "Slide pointer to a new focused window"
-msgstr "Liu'uta osoitin vasta aktivoitu ikkunaan"
+msgstr "Liu'uta osoitin vasta aktivoituun ikkunaan"
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 #: src/modules/wizard/page_060.c:26
@@ -5947,9 +5776,8 @@ msgstr "Ikkunan aktivointi"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "Ikkunan siirron geometria"
+msgstr "Ikkunageometria"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -5965,50 +5793,40 @@ msgstr "Ikkunoiden välinen vastustus:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
 msgid "Resistance at the edge of the screen:"
-msgstr "Vastustus näytön laidalla:"
+msgstr "Vastustus näytön reunalla:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
 msgid "Resistance to desktop gadgets:"
 msgstr "Vastustus työpöydän vempaimiin:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "Näppäimistö & hiiri"
+msgstr "Siirto ja koon muutos näppäimistöllä"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
-#, fuzzy
 msgid "Automatically accept changes after:"
-msgstr "Vieritä sisältöä automaattisesti"
+msgstr "Hyväksy muutokset automaattisesti kun aikaa on kulunut:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Siirrä"
+msgstr "Painallus siirtää:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Muuta kokoa"
+msgstr "Painallus muuttaa kokoa:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "Maksimoinnin käytäntö"
+msgstr "Ikkunan maksimoinnin käytännöt"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Älykäs laajennus"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Laajenna ikkuna"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Täytä käytettävissä oleva tila"
 
@@ -6016,28 +5834,26 @@ msgstr "Täytä käytettävissä oleva tila"
 msgid "Maximize Policy"
 msgstr "Maksimoinnin käytäntö"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "Maksimoi leveyssuunnasa"
+msgstr "Maksimoinnin suunta"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
-msgstr ""
+msgstr "Molemmat"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Salli ikkunoiden manipulointi"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Siirrä ikkunaa/muuta ikkunan kokoa automaattisesti hyllyn piiloutuessa"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "Ikkunan varjostus"
+msgstr "Ikkunoiden pinoaminen"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -6067,63 +5883,61 @@ msgstr "Nosta aloitettaessa siirto tai koon muuttaminen"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
 msgid "Raise when clicking to focus"
-msgstr "Nosta klikattaessa aktivoitavaksi"
+msgstr "Nosta napsautettaessa aktivoitavaksi"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Ikkunamuisti"
+msgstr "Ikkunamuistit"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "Aseta muistamiset"
+msgstr "Poista muisti(t)"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
-msgstr "Oletukset"
+msgstr "Tiedot"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "Kuvakkeen nimi"
+msgstr "<Ei nimeä>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Luokka"
+msgstr "Luokka:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "Luokka"
+msgstr "<Ei luokkaa>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Otsikko"
+msgstr "Otsikko:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "Otsikko"
+msgstr "<Ei otsikkoa>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Rooli"
+msgstr "Rooli:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "<Ei mitään>"
+msgstr "<Ei roolia>"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -6182,7 +5996,7 @@ msgstr "Hyppää työpöydälle valittaessa"
 #: src/modules/conf_winlist/e_int_config_winlist.c:176
 #: src/modules/conf_winlist/e_int_config_winlist.c:254
 msgid "Warp Settings"
-msgstr "Ponnahduksen setukset"
+msgstr "Ponnahduksen asetukset"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:177
 #: src/modules/conf_winlist/e_int_config_winlist.c:255
@@ -6198,29 +6012,24 @@ msgid "Cpufreq"
 msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Nopea (0.5 s)"
+msgstr "Nopea (4 tickiä)"
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Keskitaso (1 sek)"
+msgstr "Keskinopea (8 tickiä)"
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normaali (2 s)"
+msgstr "Normaali (32 tickiä)"
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Hidas (5 s)"
+msgstr "Hidas (64 tickiä)"
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Hyvin hidas (30 s)"
+msgstr "Erittäin hidas (256 tickiä)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6247,9 +6056,8 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Automaattinen lukitus"
+msgstr "Automaattinen virransäästö"
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -6292,8 +6100,8 @@ msgid ""
 "support this feature."
 msgstr ""
 "Kernelisi ei tue CPU:n<br>taajuuden asettamista ollenkaan. Sinulta voi "
-"puuttua<br>kernelin moduuleita tai ominaisuuksia, tai sinun CPU:"
-"si<br>eiyksinkertaisesti tue tätä ominaisuutta."
+"puuttua<br>kernelin moduuleita tai ominaisuuksia, tai sinun CPU:si<br>ei "
+"yksinkertaisesti tue tätä ominaisuutta."
 
 #: src/modules/cpufreq/e_mod_main.c:432
 msgid ""
@@ -6304,9 +6112,8 @@ msgstr ""
 "toiminnolla."
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Valintaikkunan asetukset"
+msgstr "Ikkunavarjon asetukset"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6405,17 +6212,14 @@ msgid "Home"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:322
-#, fuzzy
 msgid "Favorites"
-msgstr "Suosikkisovellukset-valikko"
+msgstr "Suosikit"
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "Käynnistä uudelleen"
+msgstr "Root"
 
 #: src/modules/fileman/e_mod_main.c:431
-#, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6425,14 +6229,14 @@ 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 ""
-"Filemanmoduulin asennustiedot tarvitsivat päivitystä. Vanhat asetuksesi on "
-"<br>pyyhitty ja uudet oletusarvot asetettu. Tämä tulee tapahtumaan "
-"säännöllisesti<br>kehityksen aikana, joten älä tee bugiraporttia.<br>Tämä "
-"tarkoittaa yksinkertaisesti sitä, että Filemanmoduuli tarvitsee<br>uudet "
-"asetustiedot toimiakseen, mikä ei<br>onnistu vanhoilla asetuksillasi. Nämä "
-"uudet oletusasetukset korjaavat<br>sen lisäämällä tarvitun "
-"toiminnallisuuden. Voit asettaa asetukset<br>uudelleen mieleiseksesi. "
-"Anteeksi asetuksiesi sorkkiminen.<br>"
+"Fileman-moduulin asetustiedot tarvitsivat päivitystä. Vanhat asetukset<br>on "
+"pyyhitty ja uudet oletusarvot asetettu. Tätä tapahtuu<br>säännöllisesti "
+"kehityksen aikana, joten älä tee vikailmoitusta.<br>Tämä tarkoittaa "
+"yksinkertaisesti sitä, että Fileman-moduuli tarvitsee uudet<br>asetustiedot "
+"toimiakseen, mikä ei onnistu vanhoilla<br>asetuksillasi. Nämä uudet "
+"oletusasetukset korjaavat<br>sen lisäämällä tarvitun toiminnallisuuden. Voit "
+"asettaa asetukset uudelleen<br>mieleiseksesi. Anteeksi asetuksiesi "
+"sorkkiminen.<br>"
 
 #: src/modules/fileman/e_mod_main.c:444
 msgid ""
@@ -6451,9 +6255,8 @@ msgstr ""
 "aiheutetusta vaivasta.<br>"
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "Filemanin asetukset"
+msgstr "Filemanin asetukset päivitetty"
 
 #: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
@@ -6464,30 +6267,28 @@ msgid "Icon Size"
 msgstr "Kuvakkeen koko"
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "Näkymän tila"
+msgstr "Näkymä"
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
-msgstr "Avaa tiedostot samaan ikkunaan"
+msgstr "Avaa hakemistot samaan ikkunaan"
 
 #: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
 msgstr "Lajittele hakemistot ensin"
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Peruskoko"
+msgstr "Huomioi kirjainkoko"
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
-msgstr "Käytä kertaklikkausta"
+msgstr "Käytä kertanapsautusta"
 
 #: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
-msgstr ""
+msgstr "Käytä vaihtoehtoisia muuntonäppäimiä"
 
 #: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
@@ -6506,14 +6307,13 @@ msgid "Show Toolbar"
 msgstr "Näytä työkalurivi"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
-msgstr ""
+msgstr "Käytös"
 
 #: src/modules/fileman/e_mod_config.c:270
-#, fuzzy
 msgid "Show HAL icons on desktop"
-msgstr "Näytä kaikilla työpöydillä"
+msgstr "Näytä HAL-kuvakkeet työpöydällä"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
@@ -6521,99 +6321,97 @@ msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Avaa tiedostonhallinta liitettäessä"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Mene isäntähakemistoon"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Lisää sovellus"
+msgstr "Muu sovellus..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Avaa"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Avaa sovelluksella..."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "Sovellukset"
+msgstr "Tunnetut sovellukset"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Määritetyt sovellukset"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Mukautettu komento"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Kopiointi keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "Siirto keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Poisto keskeytetty"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "Kopioitiin %s"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "Siirrettiin %s"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Poista näppäin"
+msgstr "Poisto suoritettu"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Työpöytätiedosto"
+msgstr "Poistetaan tiedostot..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6621,14 +6419,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Linkin info"
+msgstr "(ei tietoja)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Tiedosto:"
+msgstr "Tiedosto: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6640,85 +6437,72 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Piiloutumisen kesto"
+msgstr "Suoritetaan %d toiminto(a)"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Tiedostonhallinta"
+msgstr "Tiedostonhallinta on toimetonna"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "EFM-toimintotiedot"
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Tiedostonhallinta"
+msgstr "Vempainten hallinta"
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Taustakuvat"
+msgstr "Taustan asetukset"
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Mukautettu komento"
+msgstr "Oma kuvatiedosto"
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Mukautettu komento"
+msgstr "Oma väri"
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Vaihtuma"
+msgstr "Läpikuultava"
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Vaihdon animaatio"
+msgstr "Animaatiot"
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Taustakuvat"
+msgstr "Tausta"
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "Vempainten värit"
+msgstr "Vempaimet"
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "Ruudunpäivitys"
+msgstr "Vapaa"
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "Aina päällä"
+msgstr "Aina työpöydällä"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
-msgstr ""
+msgstr "Päällimmäisenä painamalla"
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "Lisää vempain"
+msgstr "Lisää muita vempaimia"
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-msgstr "Älä piilota vempaimia"
+msgstr "Näytä/piilota vempaimet"
 
 #: 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
@@ -6738,9 +6522,8 @@ msgid "Select a window"
 msgstr "Valitse ikkuna"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "Ponnahduksen setukset"
+msgstr "IBar - asetukset"
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
@@ -6750,7 +6533,7 @@ msgstr "Valittu palkin lähde"
 msgid "Icon Labels"
 msgstr "Kuvakkeiden nimikkeet"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Näytä kuvakkeen nimike"
 
@@ -6793,7 +6576,7 @@ msgstr "IBar"
 
 #: src/modules/ibar/e_mod_main.c:797
 msgid "Change Icon Properties"
-msgstr "Muuta kuvakkeen ominaisuukisa"
+msgstr "Muuta kuvakkeen ominaisuuksia"
 
 #: src/modules/ibar/e_mod_main.c:802
 msgid "Remove Icon"
@@ -6811,45 +6594,43 @@ msgstr "Luo uusi kuvake"
 msgid "Add Application"
 msgstr "Lisää sovellus"
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "Sisäänkirjautumisikkunan asetukset"
+msgstr "IBox - asetukset"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Näytä nimi"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Näytä otsikko"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Näytä luokka"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Näytä kuvakkeen nimi"
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "Näytä info"
+msgstr "Näytä ikkunaotsikko"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Näytä kaikkien näyttöjen ikkunat"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Näytä nykyisen näytön ikkunat"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Näytä kaikkien työpöytien ikkunat"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Näytä aktiivisen työpöydän ikkunat"
 
@@ -6858,94 +6639,92 @@ msgid "IBox"
 msgstr "IBox"
 
 #: src/modules/pager/e_mod_config.c:72
-#, fuzzy
 msgid "Pager Settings"
-msgstr "Ponnahduksen setukset"
+msgstr "Sivuttajan asetukset"
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "Vaihda työpöytää hiiren rullalla"
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Näytä työpöydän kuvakkeet"
+msgstr "Näytä työpöytien nimet"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Ponnahdusikkunan asetukset"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Näytä ponnahdusikkuna työpöytää vaihdettaessa"
 
 #: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
-msgstr "Näytä ponnahdusikkina huomiota vaativille ikkunoille"
+msgstr "Näytä ponnahdusikkuna huomiota vaativille ikkunoille"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Valitse ja liu'uta -painike"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
-msgstr "Klikkaa asettaaksesi"
+msgstr "Napsauta asettaaksesi"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Vedä ja pudota -painike"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Vedä koko työpöytä"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Näppäintoiminnon ponnahduskorkeus"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pikseliä"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Vastustus vetämiselle"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Ponnahdussivuttajan korkeus"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Ponnahdusnopeus"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekuntia"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Huomiota vaativan ikkunan asetukset"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Näytä ponnahdus huomiota vaativalle ikkunalle"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Huomiota vaativan ikkunan ponnahdus pysyy näytöllä"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Sivuttaja-painikkeen kaappaus"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6953,68 +6732,61 @@ msgstr ""
 "Paina hiiren painiketta, kiitos.<br>Paina <hilight>ESC</hilight>iä "
 "keskeyttääksesi,<br>tai <hilight>Del</hilight>iä nollataksesi painikkeen."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Huomio"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
-"Et voi käyttää oikeaa hiiren painiketta<br>hyllyssä tätä varten, koska se "
-"onjo koodattu<br>kontekstivalikkojen käyttöön.<br>Tämä painike toimii vain "
+"Et voi käyttää oikeaa hiiren painiketta<br>hyllyssä tätä varten, koska se on "
+"jo koodattu<br>kontekstivalikkojen käyttöön.<br>Tämä painike toimii vain "
 "ponnahduksessa"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Painike %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
-msgstr ""
+msgstr "Näytä sivuttajan ponnahdusikkuna"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "Vaihda oikeanpuoleiseen työpöytään"
+msgstr "Oikealle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "Vaihda vasemmanpuoleiseen työpöytään"
+msgstr "Vasemmalle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "Ponnahdusnopeus"
+msgstr "Ylemmälle työpöydälle ponnahdusikkunasta"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
-msgstr "Vaihda alapuoleiseen työpöytään"
+msgstr "Alemmalle työpöydälle ponnahdusikkunasta"
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
 msgstr "Aloita"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Aseta järjestelmän kontrollit"
+msgstr "Järjestelmän hallinta"
 
 #: src/modules/syscon/e_mod_main.c:55
-#, fuzzy
 msgid "System Controls"
-msgstr "Aseta järjestelmän kontrollit"
+msgstr "Järjestelmän hallinta"
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Yleisasetukset"
+msgstr "Lämpötila-asetukset"
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
@@ -7120,7 +6892,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Lämpötila"
 
@@ -7129,247 +6901,244 @@ msgid "Next"
 msgstr "Seuraava"
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Terve tuloa Enlightenmentiin"
+msgstr "Tervetuloa Enlightenmentiin"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "Valitse kuvake"
+msgstr "Valitse jokin"
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "Profiilit"
+msgstr "Profiili"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
+"Järjestelmästäsi ei<br>löytynyt valikkotiedostoja.<br> Katso sivuston<br> "
+"www.enlightenment.org<br> dokumenteista<br> tarkempia tietoja<br> kuinka "
+"saat<br> sovellusvalikot<br> toimimaan."
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "Valitut sovellukset"
+msgstr "Valitse sovellusvalikko"
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Käytä oletusta"
+msgstr "Järjestelmän oletus"
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "Lisää käynnistimeen"
+msgstr "Käynnistinpalkki"
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "Valitut sovellukset"
+msgstr "Valitse sovellukset"
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Työpöytätiedosto"
+msgstr "Työpöytätiedostot"
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Näytä kaikilla työpöydillä"
+msgstr "Ei kuvakkeita työpöydällä"
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Näytä työpöydän kuvakkeet"
+msgstr "Ota työpöytäkuvakkeet käyttöön"
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Aktivointi"
+msgstr "Aktivointitapa"
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Aktivointi klikkaamalla"
+msgstr "Ikkunat aktivoidaan napsauttamalla"
 
 #: src/modules/wizard/page_060.c:35
-#, fuzzy
 msgid "Mouse over focuses windows"
-msgstr "Liu'uta osoitin vasta aktivoitu ikkunaan"
+msgstr "Ikkunat aktivoituvat kun hiiri on niiden päällä"
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "Valitse kuvake"
+msgstr "Valitse lisättävät kuvakkeet"
 
-#: src/modules/wizard/page_080.c:62
-#, fuzzy
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
-msgstr "Käynnistä"
+msgstr "Pikakäynnistys"
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "Valitut sovellukset"
+msgstr "Valitse sovellukset"
 
 #: src/modules/mixer/app_mixer.c:165
-#, fuzzy
 msgid "Capture"
-msgstr "Cpufreq"
+msgstr "Tulolinja"
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
-msgstr ""
+msgstr "Toisto"
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "Tulosteen data"
+msgstr "Toisto"
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Luokka"
+msgstr "Äänikortit"
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Peruuta"
+msgstr "Äänikanavat"
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "Poista käytöstä"
+msgstr "Äänikortti:"
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Peruuta"
+msgstr "Kanava:"
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Tiedostotyyppi"
+msgstr "Tyyppi:"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
-msgstr ""
+msgstr "Vasen:"
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Vaalea"
+msgstr "Oikea:"
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
-#, fuzzy
 msgid "Mute"
-msgstr "Valikon kohteiden tekstit"
+msgstr "Vaimenna"
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "Koko"
+msgstr "Lukitse liukusäätimet"
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Poistu"
+msgstr "Muokkaa"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
-msgstr ""
+msgstr "Näytä molemmat liukusäätimet lukittuna"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
-msgstr ""
+msgstr "Äänikortit"
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "Koon asetukset"
+msgstr "Mikserin asetukset"
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:152
-#, fuzzy
 msgid "Launch mixer..."
-msgstr "Lisää käynnistimeen"
+msgstr "Avaa mikseri..."
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Moduulien asetukset"
+msgstr "Mikserimoduulin asetukset"
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Filemanin asetukset päivitetty"
+msgstr "Mikseriasetukset päivitetty"
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "Aseta järjestelmän kontrollit"
+msgstr "Säätimet"
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
 msgstr ""
+"Mikserimoduulin asetustiedot ovat muuttuneet.<br>Aiemmat asetukset on "
+"korvattu uusilla oletusarvoilla.<br>Pahoittelut aiheutuneesta haitasta."
 
 #: src/modules/connman/e_mod_main.c:214
-#, fuzzy
 msgid "Connection Manager"
-msgstr "Ikkunanhallinnan värit"
+msgstr "Yhteyksien hallinta"
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Valinnan asetukset"
+msgstr "Verkkoyhteyden asetukset"
 
 #: src/modules/connman/e_mod_main.c:737
-#, fuzzy
 msgid "Network Device"
-msgstr "Irroitettava laita"
+msgstr "Verkkolaite"
 
 #: src/modules/connman/e_mod_main.c:742
-#, fuzzy
 msgid "Wifi"
-msgstr "Sisäkkäin"
+msgstr "Wifi"
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
-msgstr ""
+msgstr "Lähiverkko"
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "Määritetyt sovellukset"
+msgstr "Määritelty laite"
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
-msgstr ""
+msgstr "Verkot"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
-msgstr ""
+msgstr "Yksi ilmoitusalue on jo olemassa"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
-msgstr ""
+msgstr "Käytössä voi olla vain yksi ilmoitusalue ja sellainen on jo olemassa."
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Järjestelmä"
+msgstr "Ilmoitusalue"
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Vierekkäin"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Yrität pyytää Enlightenmentia muistamaan käyttämään<br>ominaisuuksia "
+#~ "(kuten koko, sijainti, kehyksen tyyli etc.) ikkunaan<br>, jolla "
+#~ "<hilight>ei ole ainutlaatuisia ominaisuuksia</hilight>.<br><br>Tämä "
+#~ "tarkoittaa sitä, että se jakaa Nimen/Luokan, vaihtuman, roolin jne. "
+#~ "ominaisuuden<br>yhden tai useamman ruudunikkunan kanssa ja "
+#~ "ominaisuuksien<br>muistaminen tälle ikkunalle pätee kaikille "
+#~ "muilleikkunoille,<br>jotka sopivat näihin ominaisuuksiin.<br><br>Voit "
+#~ "luultavasti haluta hyväksyä <hilight>Yhteensovita vain yksi ikkuna</"
+#~ "hilight> -ominaisuuden, jos<br> haluat vain yhden instanssin tästä "
+#~ "ikkunasta muokattavaksi muiden<br>jäädessä muokkaamatta.<br><br> Tämä on "
+#~ "vain varoitus siinä tapauksessa, ettet tarkoittanut tätä tapahtuvaksi."
+#~ "<br>Jos tarkoitit, paina yksinkertaisesti <hilight>Käytä</hilight>- tai "
+#~ "<hilight>OK</hilight>-painiketta<br>, jolloin asetuksesi hyväksytään. "
+#~ "Paina <hilight>Peruuta</hilight>, jos et<br>ole varma, eikä mitään "
+#~ "muuteta."
+
+#~ msgid "Window name and class"
+#~ msgstr "Ikkunan nimi ja luokka"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Muokkaa virtuaalityöpöytiä"
@@ -7389,18 +7158,14 @@ msgstr "Järjestelmä"
 #~ msgid "Configure"
 #~ msgstr "Muokkaa"
 
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "Vaihda työpöytää hiiren ollessa näytön reunassa"
-
-#~ msgid "Flip when moving mouse to the screen edge"
-#~ msgstr "Vaihda siirrettäessä hiiri näytön laidalle"
+#~ msgid "Internal Windows"
+#~ msgstr "Sisäiset ikkunat"
 
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "Aika jonka hiiren täytyy olla näytön laidalla ennen vaihtoa:"
+#~ msgid "Expand the window"
+#~ msgstr "Laajenna ikkuna"
 
-#, fuzzy
-#~ msgid "Configure Heading"
-#~ msgstr "Asetukset"
+#~ msgid "Allow window manipulation"
+#~ msgstr "Salli ikkunoiden manipulointi"
 
 #~ msgid "Custom Grid Icons"
 #~ msgstr "Muokautetut, ruudukoidut kuvakkeet"
@@ -7408,16 +7173,21 @@ msgstr "Järjestelmä"
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Mukautetut, älykkäät ruudukon kuvakkeet"
 
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Vaihda työpöytää hiiren ollessa näytön reunassa"
+
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr "Vaihda siirrettäessä hiiri näytön laidalle"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Aika jonka hiiren täytyy olla näytön laidalla ennen vaihtoa:"
+
 #~ msgid "Defined Command"
 #~ msgstr "Määritetty komento"
 
 #~ msgid "Exit Immediately"
 #~ msgstr "Poistu välittömästi"
 
-#, fuzzy
-#~ msgid "Shut Down Immediately"
-#~ msgstr "Poistu välittömästi"
-
 #~ msgid "Shut Down"
 #~ msgstr "Sammuta"
 
@@ -7533,14 +7303,6 @@ msgstr "Järjestelmä"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Lämpötilan asetukset"
 
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Sivuttajan asetukset"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Hyllyn asetukset"
-
 #~ msgid "Back"
 #~ msgstr "Takaisin"
 
diff --git a/po/fo.gmo b/po/fo.gmo
index b96fee8..dda681c 100644
Binary files a/po/fo.gmo and b/po/fo.gmo differ
diff --git a/po/fo.po b/po/fo.po
index 63a6e16..380f844 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -6,40 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-14 22:07+0000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-10-21 20:00+0000\n"
 "Last-Translator: Gunleif Joensen <Unknown>\n"
 "Language-Team: Faroese <fo at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Um Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Lat aftur"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -65,607 +67,606 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nei"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
-msgstr "Er tú vissur í at fara út"
+msgstr "Er tú vissur í at fara út?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Tú hevur biðið um at fara úr Enlightenment.<br><br>Er tú vissur í at fara úr?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Vil tú útritast?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Tú er um at útrita.<br><br>Er tú viss í at útrita?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Er tú vissir í at sløkkja?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Tú hevur biðið um at sløkkja telduna.<br><br>Er tú viss í at sløkkja?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Er tú viss í at endurbyrja?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Tú hevur biðið um at endurbyrja telduna.<br><br>Er tú viss í at endurbyrja?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr ""
+msgstr "Eru tygum viss í at fara í dvala?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Flyt"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Endurstødda"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Valmynd"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Glugga valmund"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
-msgstr ""
+msgstr "Lyfta"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Lægri"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr ""
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
-msgstr ""
+msgstr "Gluggi : Standur"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Mesta"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Mesta loddrætt"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Mesta vannrætt"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Mesta fullskýggja"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Mesta standur \"smart\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Mesta standur \"fyll\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Skriviborð"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Flippa skriviborðið til vinstru"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Flippa skriviborðið til vinstru"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Flippa skriviborðið upp"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Flippa skriviborðið Niður"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
-msgstr ""
+msgstr "Vippa skriviborðið um..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Vís skriviborðið"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Vís hyllina"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Flippa skriviborðið til..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
-msgstr ""
+msgstr "Vippa skriviborðið linjurætt..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Skift til skriviborð 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Skift til skriviborð 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Skift til skriviborð 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Skift til skriviborð 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Skift til skriviborð 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Skift til skriviborð 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Skift til skriviborð 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Skift til skriviborð 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Skift til skriviborð 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Skift til skriviborð 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Skift til skriviborð 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Skift til skriviborð 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Skift til skriviborð..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Flippa skriviborðið til vinstru (allir skíggjar)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Flippa skriviboðið til høgru (allir skíggjar)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Flippa skriviboðið upp (allir skíggjar)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Flippa skriviborðið niður (allir skíggjar)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Flippa skriviboðið um... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Flippa skriviboðið til... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr ""
+msgstr "Vippa skriviborðið linjurætt... (Allir skíggjar)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Flippa skriviboðið í eina kós..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Skift til skriviborð 0 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Skift til skriviborð 1 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Skift til skriviborð 2 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Skift til skriviborð 4 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Skift til skriviborð 4 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Skift til skriviborð 5 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Skift til skriviborð 6 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Skift til skriviborð 7 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Skift til skriviborð 8 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Skift til skriviborð 9 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Skift til skriviborð 10 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Skift til skriviborð 11 (allir skíggjar)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Skift til skriviborð... (allir skíggjar)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Skíggji"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Send mús til skíggja 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Send mús til skíggja 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Send mús til skíggja..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Send mús fram til 1 skíggja"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Send mús aftur til 1 skíggja"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Send mús framm/aftur skíggjar.."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Gluggi : Flyti"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Til næsta skriviborð"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Til fyrra skriviborð"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr ""
+msgstr "Av skriviborði #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
-msgstr ""
+msgstr "Til skriviborð..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
-msgstr ""
+msgstr "Vís høvuðs valmynd"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
-msgstr ""
+msgstr "Vís yndis valmynd"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
-msgstr ""
+msgstr "Vís allar nýtsluskipanar valmyndir"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
-msgstr ""
+msgstr "Vís viðskifta valmynd"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
-msgstr ""
+msgstr "Vís valmynd..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
-msgstr ""
+msgstr "Koyr"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
-msgstr ""
+msgstr "Boð"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
-msgstr ""
+msgstr "Nýtsluskipan"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
-msgstr ""
+msgstr "Endurbyrja"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
-msgstr ""
+msgstr "Enda"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr ""
+msgstr "Enda nú"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr ""
+msgstr "Enlightenment : Standur"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
-msgstr ""
+msgstr "Kervi"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
-msgstr ""
+msgstr "Rita út"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
-msgstr ""
+msgstr "Sløkk nú"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
-msgstr ""
+msgstr "Sløkk"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
-msgstr ""
+msgstr "Endurbyrja"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
-msgstr ""
+msgstr "Hvílustøða"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
-msgstr ""
+msgstr "Dvali"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr ""
+msgstr "Læs"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
-msgstr ""
+msgstr "Rudda upp í gluggum"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr ""
+msgstr "Set sum bakgrund"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
-msgstr ""
+msgstr "Skriviborðs fílukanning liðug"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr ""
+msgstr "Skriviborðs fílukanning"
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
-msgstr ""
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "Lita veljari"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
-msgstr ""
+msgstr "Ógilda"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -676,7 +677,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -685,11 +686,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr ""
+msgstr "Setingar dagførdar"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -697,7 +698,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -707,7 +708,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -716,7 +717,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -725,7 +726,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -733,73 +734,73 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr ""
+msgstr "Skrivi trupuleikar við at goyma Enlightenment setingarnar"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 msgid "Advanced"
-msgstr ""
+msgstr "Framkomið"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
-msgstr ""
+msgstr "Grundleggjandi"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
-msgstr ""
+msgstr "Set í verk"
 
 #: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
-msgstr ""
+msgstr "Mótular"
 
 #: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
 #: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -807,22 +808,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -843,7 +844,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -888,7 +889,7 @@ msgstr ""
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr ""
 
@@ -920,23 +921,23 @@ msgstr ""
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr ""
 
@@ -944,331 +945,331 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr ""
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1279,144 +1280,148 @@ msgstr ""
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1426,7 +1431,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr ""
 
@@ -1460,21 +1465,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr ""
 
@@ -1483,12 +1488,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr ""
 
@@ -1497,7 +1502,7 @@ msgid "Maximized state"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr ""
 
@@ -1505,7 +1510,7 @@ msgstr ""
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr ""
 
@@ -1553,115 +1558,116 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1677,7 +1683,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr ""
 
@@ -1769,11 +1775,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1781,15 +1787,15 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1803,11 +1809,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1815,102 +1821,101 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:541
-msgid "Match only one window"
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr ""
@@ -1929,24 +1934,24 @@ msgstr ""
 msgid "Module Settings"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -1980,8 +1985,8 @@ msgstr ""
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2005,12 +2010,12 @@ msgid "Favorite Applications"
 msgstr ""
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2019,7 +2024,7 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr ""
 
@@ -2055,129 +2060,128 @@ msgstr ""
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2354,242 +2358,242 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
+#: src/bin/e_main.c:824
+msgid "Setup FM"
 msgstr ""
 
 #: src/bin/e_main.c:829
-msgid "Setup FM"
+msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:834
-msgid "Enlightenment cannot initialize the File manager.\n"
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
 msgstr ""
 
 #: src/bin/e_main.c:849
-msgid "Setup Message System"
+msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
 #: src/bin/e_main.c:854
-msgid "Enlightenment cannot set up its msg system."
+msgid "Setup DND"
 msgstr ""
 
 #: src/bin/e_main.c:859
-msgid "Setup DND"
+msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:864
-msgid "Enlightenment cannot set up its dnd system."
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:869
-msgid "Setup Grab Input Handling"
+msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
 #: src/bin/e_main.c:874
-msgid "Enlightenment cannot set up its input grab handling system."
+msgid "Setup Modules"
 msgstr ""
 
 #: src/bin/e_main.c:879
-msgid "Setup Modules"
+msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
 #: src/bin/e_main.c:884
-msgid "Enlightenment cannot set up its module system."
+msgid "Setup Remembers"
 msgstr ""
 
 #: src/bin/e_main.c:889
-msgid "Setup Color Classes"
+msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
 #: src/bin/e_main.c:894
-msgid "Enlightenment cannot set up its color class system."
+msgid "Setup Color Classes"
 msgstr ""
 
 #: src/bin/e_main.c:899
-msgid "Setup Gadcon"
+msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
 #: src/bin/e_main.c:904
-msgid "Enlightenment cannot set up its gadget control system."
+msgid "Setup Gadcon"
 msgstr ""
 
 #: src/bin/e_main.c:909
-msgid "Setup DPMS"
+msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
 #: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2597,11 +2601,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2609,37 +2613,37 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, 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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2647,12 +2651,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
@@ -2663,29 +2667,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2702,120 +2706,120 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2831,88 +2835,88 @@ msgstr ""
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -2932,51 +2936,51 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -2992,57 +2996,57 @@ msgstr ""
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3050,12 +3054,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3063,24 +3067,24 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3088,20 +3092,20 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr ""
 
@@ -3127,7 +3131,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3149,12 +3153,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3162,14 +3166,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3195,7 +3199,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3463,9 +3467,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
@@ -3531,10 +3535,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr ""
@@ -3566,8 +3570,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3688,46 +3692,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -3783,31 +3792,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3816,11 +3825,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3875,7 +3884,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3885,102 +3894,107 @@ msgstr ""
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4275,18 +4289,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4294,37 +4307,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4339,7 +4364,7 @@ msgstr ""
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr ""
 
@@ -4407,7 +4432,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr ""
 
@@ -4577,7 +4602,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr ""
 
@@ -4753,24 +4778,24 @@ msgstr ""
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4787,7 +4812,7 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr ""
 
@@ -4887,33 +4912,33 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5076,23 +5101,23 @@ msgstr ""
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5145,38 +5170,38 @@ msgid "Wallpaper Settings"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5197,14 +5222,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr ""
 
@@ -5269,40 +5294,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5414,14 +5439,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr ""
@@ -5554,17 +5571,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr ""
 
@@ -5572,19 +5584,19 @@ msgstr ""
 msgid "Maximize Policy"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5623,49 +5635,57 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6016,7 +6036,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6032,95 +6052,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6146,16 +6166,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6193,19 +6213,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6242,7 +6262,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -6301,43 +6321,43 @@ msgstr ""
 msgid "Add Application"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -6357,11 +6377,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6369,114 +6389,114 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr ""
+msgstr "Legg til merkis"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
-msgstr ""
+msgstr "Tendra"
 
 #: src/modules/syscon/e_mod_main.c:34
 msgid "System Control"
@@ -6512,71 +6532,71 @@ msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:258
 msgid "Fast"
-msgstr ""
+msgstr "Skjótt"
 
 #: src/modules/temperature/e_mod_config.c:262
 msgid "Slow"
-msgstr ""
+msgstr "Seint"
 
 #: src/modules/temperature/e_mod_config.c:264
 msgid "Very Slow"
-msgstr ""
+msgstr "Øgiliga seint"
 
 #: src/modules/temperature/e_mod_config.c:271
 #: src/modules/temperature/e_mod_config.c:295
 #: src/modules/temperature/e_mod_config.c:396
 #: src/modules/temperature/e_mod_config.c:408
 msgid "High Temperature"
-msgstr ""
+msgstr "Høgt hitastig"
 
 #: src/modules/temperature/e_mod_config.c:274
 msgid "200 F"
-msgstr ""
+msgstr "200 F"
 
 #: src/modules/temperature/e_mod_config.c:276
 msgid "150 F"
-msgstr ""
+msgstr "150 F"
 
 #: src/modules/temperature/e_mod_config.c:278
 #: src/modules/temperature/e_mod_config.c:287
 msgid "110 F"
-msgstr ""
+msgstr "110 F"
 
 #: src/modules/temperature/e_mod_config.c:282
 #: src/modules/temperature/e_mod_config.c:306
 #: src/modules/temperature/e_mod_config.c:401
 #: src/modules/temperature/e_mod_config.c:413
 msgid "Low Temperature"
-msgstr ""
+msgstr "Lágt hitastig"
 
 #: src/modules/temperature/e_mod_config.c:285
 msgid "130 F"
-msgstr ""
+msgstr "130 F"
 
 #: src/modules/temperature/e_mod_config.c:289
 msgid "90 F"
-msgstr ""
+msgstr "90 F"
 
 #: src/modules/temperature/e_mod_config.c:298
 msgid "93 C"
-msgstr ""
+msgstr "93 C"
 
 #: src/modules/temperature/e_mod_config.c:300
 msgid "65 C"
-msgstr ""
+msgstr "65 C"
 
 #: src/modules/temperature/e_mod_config.c:302
 #: src/modules/temperature/e_mod_config.c:311
 msgid "43 C"
-msgstr ""
+msgstr "43 C"
 
 #: src/modules/temperature/e_mod_config.c:309
 msgid "55 C"
-msgstr ""
+msgstr "55 C"
 
 #: src/modules/temperature/e_mod_config.c:313
 msgid "32 C"
-msgstr ""
+msgstr "32 C"
 
 #: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
@@ -6586,35 +6606,35 @@ msgstr ""
 #: src/modules/temperature/e_mod_config.c:402
 #, c-format
 msgid "%1.0f F"
-msgstr ""
+msgstr "%1.0f F"
 
 #: src/modules/temperature/e_mod_config.c:409
 #: src/modules/temperature/e_mod_config.c:414
 #, c-format
 msgid "%1.0f C"
-msgstr ""
+msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
-msgstr ""
+msgstr "Hitastig"
 
 #: src/modules/wizard/e_wizard.c:221
 msgid "Next"
-msgstr ""
+msgstr "Næst"
 
 #: src/modules/wizard/e_wizard.c:281
 msgid "Welcome to Enlightenment"
-msgstr ""
+msgstr "Vælkomin til Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr ""
+msgstr "Vel ein/eitt"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6661,15 +6681,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6687,35 +6707,35 @@ msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
 msgid "Cards"
-msgstr ""
+msgstr "Kort"
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
 msgid "Channels"
-msgstr ""
+msgstr "Rásir"
 
 #: src/modules/mixer/app_mixer.c:390
 msgid "Card:"
-msgstr ""
+msgstr "Kort:"
 
 #: src/modules/mixer/app_mixer.c:394
 msgid "Channel:"
-msgstr ""
+msgstr "Rás:"
 
 #: src/modules/mixer/app_mixer.c:398
 msgid "Type:"
-msgstr ""
+msgstr "Slag:"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
-msgstr ""
+msgstr "Vinstru:"
 
 #: src/modules/mixer/app_mixer.c:407
 msgid "Right:"
-msgstr ""
+msgstr "Høgru:"
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
-msgstr ""
+msgstr "Doyv"
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
 msgid "Lock Sliders"
@@ -6723,7 +6743,7 @@ msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
 msgid "Edit"
-msgstr ""
+msgstr "Broyt"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -6731,7 +6751,7 @@ msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
-msgstr ""
+msgstr "Ljóð kort"
 
 #: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
@@ -6755,7 +6775,7 @@ msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
-msgstr ""
+msgstr "Stýritól"
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -6777,7 +6797,7 @@ msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
 msgid "Wifi"
-msgstr ""
+msgstr "Tráðleyst"
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
@@ -6791,14 +6811,14 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
diff --git a/po/fr.gmo b/po/fr.gmo
index 3d8c862..6518321 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index e430ec1..36bffa8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,42 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-20 14:28+0400\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-12 12:58+0400\n"
 "Last-Translator: batden <batden at orange.fr>\n"
-"Language-Team: French <Enlightenment i18n French>\n"
+"Language-Team: Enlightenment French Team <pourunmondesansgourou at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "À propos de Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,16 +52,16 @@ 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-2008, par l'Équipe de Développement de Enlightenment."
+"Copyright &copy ; 1999-2009, par l'Équipe de Développement de Enlightenment."
 "<br><br>Nous espérons que vous prendrez autant de plaisir à utiliser ce "
-"logiciel que nous en avons pris lors de son développement.<br><br>Ce "
-"logiciel est fourni  « tel quel » sans aucune garantie explicite ou "
-"implicite. Ce logiciel est régi par des conditions de licence, veuillez "
-"consulter les fichiers de licence COPYING et COPYING-PLAIN installés sur "
-"votre système.<br><br>Enlightenment est en cours de <hilight>DÉVELOPPEMENT "
-"INTENSIF</hilight> et n'est donc pas stable. Beaucoup de fonctionnalités "
-"sont encore incomplètes ou non encore implémentées et peuvent contenir de "
-"nombreux bogues. Vous êtes  <hilight>PRÉVENU !</hilight>"
+"logiciel que nous en prenons à le développer.<br><br>Ce logiciel est fourni "
+"« TEL QUEL », sans aucune garantie explicite ou implicite. Ce logiciel est "
+"régi par des conditions de licence, veuillez consulter les fichiers de "
+"licence COPYING et COPYING-PLAIN installés sur votre système."
+"<br><br>Enlightenment est en cours de <hilight>DÉVELOPPEMENT INTENSIF</"
+"hilight> et n'est donc pas stable. Beaucoup de fonctionnalités sont encore "
+"incomplètes ou non encore implémentées et peuvent contenir de nombreux "
+"bogues. Vous êtes <hilight>PRÉVENU !</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -73,582 +75,582 @@ msgid ""
 "you want to kill this window?"
 msgstr ""
 "Vous êtes sur le point de tuer %s.<br><br>Toutes les informations non encore "
-"enregistrées<br>contenues dans cette fenêtre seront perdues !<br><br>Êtes-"
-"vous sûr de vouloir tuer cette fenêtre ?"
+"enregistrées<br>contenues dans cette fenêtre seront perdues !<br><br>Êtes-"
+"vous sûr de vouloir tuer cette fenêtre ?"
 
 #: src/bin/e_actions.c:357
 msgid "Are you sure you want to kill this window?"
-msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
+msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
-msgstr "Êtes-vous sûr de vouloir quitter ?"
+msgstr "Êtes-vous sûr de vouloir quitter ?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vous avez demandé à quitter Enlightenment.<br><br>Êtes-vous sûr de vouloir "
-"quitter ?"
+"quitter ?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
-msgstr "Êtes-vous sûr de vouloir fermer votre session ?"
+msgstr "Êtes-vous sûr de vouloir fermer votre session ?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Vous êtes sur le point de fermer votre session.<br><br>Êtes-vous sûr de "
-"vouloir le faire ?"
+"vouloir le faire ?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
-msgstr "Êtes-vous sûr de vouloir éteindre ?"
+msgstr "Êtes-vous sûr de vouloir éteindre ?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Vous avez demandé à éteindre votre ordinateur.<br><br>Êtes-vous sûr de "
-"vouloir l'éteindre ?"
+"vouloir l'éteindre ?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
-msgstr "Êtes-vous sûr de vouloir redémarrer ?"
+msgstr "Êtes-vous sûr de vouloir redémarrer ?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Vous avez demandé à redémarrer votre ordinateur.<br><br>Êtes-vous sûr de "
-"vouloir le redémarrer ?"
+"vouloir le redémarrer ?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Vous avez demandé à mettre votre ordinateur en veille.<br><br>Êtes-vous sûr "
-"de vouloir le mettre en veille ?"
+"de vouloir le mettre en veille ?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr "Êtes-vous sûr de vouloir mettre en hibernation ?"
+msgstr "Êtes-vous sûr de vouloir mettre votre ordinateur en hibernation ?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Vous avez demandé à mettre votre ordinateur en hibernation.<br><br>Êtes-vous "
-"sur de vouloir le mettre en hibernation ?"
+"sûr de vouloir le mettre en veille prolongée ?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
-msgstr "Fenêtre: Actions"
+msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Redimensionner"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Placer dessus"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Placer dessous"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
-msgstr "Fenêtre: État"
+msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Activer/Désactiver l'ancrage"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Activer/Désactiver l'iconique"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Activer/Désactiver le mode plein écran"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximisation en plein écran"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
-msgstr "Maximisation en mode « Intelligent »"
+msgstr "Maximisation en mode « intelligent »"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
-msgstr "Maximisation en mode « Expansion »"
+msgstr "Maximisation en mode « expansion »"
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
-msgstr "Maximisation en mode « Remplissage »"
+msgstr "Maximisation en mode « remplissage »"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le haut"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers le bas"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la gauche"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Activer/Désactiver l'ombre vers la droite"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Activer/Désactiver l'enroulement"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Activer/Désactiver le mode sans bordure"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Activer/Désactiver l'épinglage"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Basculer vers le bureau gauche"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Basculer vers le bureau droit"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Basculer vers le bureau du dessus"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Basculer vers le bureau du dessous"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
-msgstr "Se déplacer de ... bureaux"
+msgstr "Se déplacer de … bureaux"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Afficher le rack"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
-msgstr "Aller au bureau ..."
+msgstr "Aller au bureau …"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
-msgstr "Se déplacer linéairement de ... bureaux"
+msgstr "Se déplacer linéairement de … bureaux"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Passer au bureau 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Passer au bureau 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Passer au bureau 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Passer au bureau 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Passer au bureau 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Passer au bureau 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Passer au bureau 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Passer au bureau 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Passer au bureau 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Passer au bureau 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Passer au bureau 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Passer au bureau 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
-msgstr "Passer au bureau ..."
+msgstr "Passer au bureau …"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Basculer vers le bureau gauche (tous les écrans)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Basculer vers le bureau droit (tous les écrans)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Basculer vers le bureau du dessus (tous les écrans)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Basculer vers le bureau du dessous (tous les écrans)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Se déplacer de ... bureaux (tous les écrans)"
+msgstr "Se déplacer de … bureaux (tous les écrans)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Aller au bureau ... (tous les écrans)"
+msgstr "Aller au bureau … (tous les écrans)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Se déplacer linéairement de ... bureaux (tous les écrans)"
+msgstr "Se déplacer linéairement de … bureaux (tous les écrans)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Basculer le bureau en direction..."
+msgstr "Basculer le bureau en direction "
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passer au bureau 0 (tous les écrans)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passer au bureau 1 (tous les écrans)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passer au bureau 2 (tous les écrans)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passer au bureau 3 (tous les écrans)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passer au bureau 4 (tous les écrans)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passer au bureau 5 (tous les écrans)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passer au bureau 6 (tous les écrans)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passer au bureau 7 (tous les écrans)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passer au bureau 8 (tous les écrans)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passer au bureau 9 (tous les écrans)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passer au bureau 10 (tous les écrans)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passer au bureau 11 (tous les écrans)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Passer au bureau ... (tous les écrans)"
+msgstr "Passer au bureau … (tous les écrans)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
-msgstr "Envoyer la souris à l'écran ..."
+msgstr "Envoyer la souris à l'écran …"
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
-msgstr "Envoyer la souris ... écrans plus loin"
+msgstr "Envoyer la souris … écrans plus loin"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
-msgstr "Fenêtre: Déplacement"
+msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Vers le bureau suivant"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Vers le bureau précédent"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr "Déplacer de ... bureaux"
+msgstr "Déplacer de … bureaux"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
-msgstr "Vers le bureau ..."
+msgstr "Vers le bureau …"
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des favoris"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
-msgstr "Afficher le menu des clients"
+msgstr "Afficher le menu détaillé"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
-msgstr "Afficher le menu..."
+msgstr "Afficher le menu…"
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Lancer"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Quitter à l'instant"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment: Mode"
+msgstr "Enlightenment : mode"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Activer/Désactiver le mode présentation"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Activer/Désactiver le mode hors ligne"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Se déconnecter"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Éteindre à l'instant"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Éteindre"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Mettre en veille"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Réorganiser les fenêtres"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Générique: Actions"
+msgstr "Générique : actions"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Action reportée"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Utiliser comme fond d'écran"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Analyse des fichiers desktop terminée"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Analyse des fichiers desktop"
 
@@ -656,41 +658,40 @@ msgstr "Analyse des fichiers desktop"
 msgid "Color Selector"
 msgstr "Sélecteur de couleurs"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
-msgstr "OK"
+msgstr "O.K."
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -708,7 +709,7 @@ msgstr ""
 "niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout "
 "reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -723,11 +724,11 @@ msgstr ""
 "pas bon et, par<br>mesure de précaution, votre configuration a été<br>remise "
 "à zéro. Désolé pour le désagrément.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Configuration mise à niveau"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -736,10 +737,10 @@ msgid ""
 msgstr ""
 "Une erreur est survenue lors de l'enregistrement de<br>la configuration de "
 "Enlightenment sur le disque.<br>L'origine de cette erreur n'a pu être "
-"déterminée.<br><br>Le fichier incriminé était:<br>%s<br><br>Ce fichier a été "
-"supprimé pour éviter la corruption<br>des données.<br>"
+"déterminée.<br><br>Le fichier incriminé était :<br>%s<br><br>Ce fichier a "
+"été supprimé pour éviter la corruption<br>des données.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -752,10 +753,10 @@ msgstr ""
 "système de fichiers où ils doivent être<br>enregistrés. Une erreur tout à "
 "fait étonnante car<br>ils devraient être vraiment très petits.<br> Veuillez "
 "vérifier la configuration de<br>votre répertoire personnel.<br><br>Le "
-"fichier incriminé était:<br>%s<br><br>Ce fichier a été supprimé pour éviter "
+"fichier incriminé était :<br>%s<br><br>Ce fichier a été supprimé pour éviter "
 "la corruption<br>des données.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -765,11 +766,11 @@ msgid ""
 msgstr ""
 "Une erreur d'entrée/sortie est survenue lors de l'écriture<br>des fichiers "
 "de configuration de Enlightenment. Votre disque dur<br> est en cause et "
-"devra vraisemblablement être remplacé.<br><br>Le fichier incriminé était:<br>"
-"%s<br><br>Ce fichier a été supprimé pour éviter la corruption<br>des données."
-"<br>"
+"devra vraisemblablement être remplacé.<br><br>Le fichier incriminé était :"
+"<br>%s<br><br>Ce fichier a été supprimé pour éviter la corruption<br>des "
+"données.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -779,11 +780,11 @@ msgid ""
 msgstr ""
 "Enlightenment n'a pu écrire son fichier de configuration<br>car il n'y a pas "
 "suffisamment d'espace pour cela.<br>Soit vous n'avez plus d'espace disque,"
-"<br>soit vous avez dépassé votre quota.<br><br>Le fichier incriminé était:"
+"<br>soit vous avez dépassé votre quota.<br><br>Le fichier incriminé était :"
 "<br>%s<br><br>Ce fichier a été supprimé pour éviter la corruption<br>des "
 "données.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -792,14 +793,14 @@ msgid ""
 msgstr ""
 "Le fichier de configuration dans lequel Enlightenment était en "
 "train<br>d'écrire s'est fermé de façon inattendue. C'est exceptionnel."
-"<br><br> Le fichier incriminé était:<br>%s<br><br>Ce fichier a été supprimé "
+"<br><br> Le fichier incriminé était :<br>%s<br><br>Ce fichier a été supprimé "
 "pour éviter la corruption des données.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration de Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -807,12 +808,12 @@ msgstr "Problèmes d'écriture de la configuration de Enlightenment"
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Basique"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -820,7 +821,7 @@ msgstr "Appliquer"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Modules"
 
@@ -829,27 +830,27 @@ msgstr "Modules"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
-msgstr "Erreur: Pas de support PAM"
+msgstr "Erreur : pas de support PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment n'a pas été compilé avec le support<br>PAM, le verrouillage "
 "d'écran a été désactivé."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -858,15 +859,15 @@ msgstr ""
 "soit le clavier, soit la souris, soit les deux<br>et il n'est pas possible "
 "d'outrepasser cette action."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Veuillez entrer votre mot de passe de déverrouillage"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Erreur du système d'authentification"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -877,11 +878,11 @@ msgstr ""
 "d'authentification. Le code de l'erreur est <hilight>%i</hilight>.<br>Cette "
 "erreur ne devrait pas se produire.<br> Merci de faire un rapport de bogue,"
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr "Activer le mode présentation ?"
+msgstr "Activer le mode présentation ?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -889,13 +890,13 @@ msgid ""
 msgstr ""
 "Vous avez déverrouillé le bureau trop vite.<br><br>Voulez-vous activer le "
 "mode <b>présentation</b> et désactiver temporairement l'écran de veille, le "
-"verrouillage et la gestion de l'énergie ?"
+"verrouillage et la gestion de l'énergie ?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Non, mais augmenter le délai"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Non, et ne plus demander"
 
@@ -921,7 +922,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Éditeur de fichier desktop"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -966,7 +967,7 @@ msgstr "Catégories"
 msgid "Mime Types"
 msgstr "Types mime"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Options"
 
@@ -998,23 +999,23 @@ msgstr "Sélectionner un icone"
 msgid "Select an Executable"
 msgstr "Sélectionner un exécutable"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Coller"
 
@@ -1022,24 +1023,24 @@ msgstr "Coller"
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Erreur d'exécution de l'application"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1048,459 +1049,463 @@ 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s s'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, 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:450
+#: src/bin/e_exec.c:483
 #, 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:454
+#: src/bin/e_exec.c:487
 #, 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:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu par un signal de mort prioritaire."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s a été interrompu par un tube cassé."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, 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:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Le reste de la sortie a été tronqué. Enregistrez la sortie pour tout voir."
 "***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Journaux des erreurs"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Sauvegarder ce message"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Ce journal d'erreur va être enregistré dans %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Information sur l'erreur"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Chemin inexistant"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s n'existe pas."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Erreur au montage"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Impossible de monter le périphérique"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Erreur au démontage"
+msgstr "Erreur lors du démontage"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Impossible de démonter le périphérique"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Erreur pendant l'éjection"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Impossible d'éjecter le périphérique"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Fichiers"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr " Lien "
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Annuler"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Hériter des propriétés du parent"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Mode d'affichage"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Rafraîchir"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Mémoriser l'ordre"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Démonter"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Monter"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Éjecter"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Valeur par défaut"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Icones alignés"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Icones personnalisés"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Liste"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icone (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Définir le fond d'écran..."
+msgstr "Définir le fond d'écran…"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Définir l'incrustation..."
+msgstr "Définir l'incrustation…"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
-msgstr "Nom du nouveau dossier:"
+msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
-msgstr "Renommer %s en:"
+msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Réessayer"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Non pour tout"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Oui pour tout"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Le fichier existe déjà, écraser ?<br><hilight>%s</hilight> ?"
+msgstr "Le fichier existe déjà, écraser <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorer"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorer tout"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Une erreur s'est produite lors d'une opération.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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> ?"
+msgstr "Êtes-vous sûr de vouloir supprimer<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
 msgstr ""
-"Êtes-vous sûr de vouloir supprimer<br>les %d fichiers sélectionnés dans:"
-"<br><hilight>%s</hilight> ?"
+"Êtes-vous sûr de vouloir supprimer<br>les %d fichiers sélectionnés dans :"
+"<br><hilight>%s</hilight> ?"
 
 #: src/bin/e_fm_prop.c:108
 msgid "File Properties"
 msgstr "Propriétés du fichier"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
-msgstr "Fichier:"
+msgstr "Fichier :"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
-msgstr "Taille:"
+msgstr "Taille :"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
-msgstr "Dernière modification:"
+msgstr "Dernière modification :"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
-msgstr "Type de fichier:"
+msgstr "Type de fichier :"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
-msgstr "Permissions:"
+msgstr "Permissions :"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
-msgstr "Propriétaire:"
+msgstr "Propriétaire :"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Les autres peuvent lire"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Les autres peuvent écrire"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Le propriétaire peut lire"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
-msgstr "Défaut"
+msgstr "Par défaut"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Vignette"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Utiliser cet icone pour tous les fichiers de ce type"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Information sur le lien"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu Tio"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu Gio"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu Mio"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu Kio"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu o"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume inconnu"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Déplacer ce gadget vers"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "En plein"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "En creux"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Activer le déplacement/redimensionnement de ce gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de déplacer/redimensionner ce gadget"
 
@@ -1510,9 +1515,9 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 "Une instance précédente de Enlightenment est encore\n"
-"active sur cet écran. Arrêt du démarrage.\n"
+"active sur cet écran. Abandon du démarrage.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Verrous de fenêtre"
 
@@ -1546,24 +1551,24 @@ msgstr "Mémoriser ces verrous pour la prochaine apparition de cette fenêtre"
 
 #: src/bin/e_int_border_locks.c:308
 msgid "Lock program changing:"
-msgstr "Empêcher le programme de changer:"
+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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1572,12 +1577,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "État d'enroulement"
 
@@ -1586,7 +1591,7 @@ msgid "Maximized state"
 msgstr "État de maximisation"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "État de plein écran"
 
@@ -1594,13 +1599,13 @@ 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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Style de bordure"
 
 #: src/bin/e_int_border_locks.c:348
 msgid "Stop me from:"
-msgstr "M'empêcher de:"
+msgstr "M'empêcher de :"
 
 #: src/bin/e_int_border_locks.c:349
 msgid "Closing the window"
@@ -1620,7 +1625,7 @@ msgstr "Éditer l'icone"
 
 #: src/bin/e_int_border_menu.c:78
 msgid "Add Application..."
-msgstr "Ajouter une application..."
+msgstr "Ajouter une application…"
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1640,117 +1645,118 @@ msgstr "Décrocher du bureau"
 
 #: src/bin/e_int_border_menu.c:131
 msgid "More..."
-msgstr "Plus..."
+msgstr "Plus…"
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Raccourci clavier"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Au menu des favoris"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Au lanceur"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Ignorer"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "État"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Mémoriser"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 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:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Toujours au-dessus"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Toujours en dessous"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Sélectionner un style de bordure"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Utiliser l'icone proposé par E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icone fourni par l'application"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Utiliser l'icone défini par l'utilisateur"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Enroulé"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Ancré"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Barre des tâches"
 
@@ -1766,7 +1772,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:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titre"
 
@@ -1776,7 +1782,7 @@ msgstr "Classe"
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
 msgid "Icon Name"
-msgstr "Nom d'icone"
+msgstr "Nom de l'icone"
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
@@ -1812,7 +1818,7 @@ msgstr "État initial"
 
 #: src/bin/e_int_border_prop.c:434
 msgid "Window ID"
-msgstr "Identifiant de fenêtre"
+msgstr "Identifiant de la fenêtre"
 
 #: src/bin/e_int_border_prop.c:435
 msgid "Window Group"
@@ -1824,7 +1830,7 @@ msgstr "Transition pour"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr "Fenêtre parente"
+msgstr "Fenêtre leader"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
@@ -1858,27 +1864,27 @@ msgstr "Propriétés NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Ignorer la barre des tâches"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
-msgstr "Ignorer le pager"
+msgstr "Ignorer le Pager"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Mémorisations propres à la fenêtre"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
-msgstr "Propriétés de fenêtre partagées"
+msgstr "Les propriétés de la fenêtre sont partagées"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1895,7 +1901,7 @@ msgstr ""
 "taille, la position,<br>le type de bordure, etc) d'une fenêtre "
 "sans<hilight><br>propriétés distinctives</hilight>.<br><br>Ce qui signifie "
 "qu'elle partage son nom et classe, sa fugacité,<br>son rôle, etc, avec au "
-"moins 1 autre fenêtre à l'écran et que la<br>mémorisation des propriétés "
+"moins une autre fenêtre à l'écran et que la<br>mémorisation des propriétés "
 "pour cette fenêtre s'appliquera à<br>toutes les autres fenêtres qui "
 "partagent les mêmes propriétés.<br><br>Ceci n'est qu'un avertissement au cas "
 "où ce<br>n'était pas ce que vous recherchiez.<br>Cliquez sur "
@@ -1903,11 +1909,11 @@ msgstr ""
 "seront acceptés. Cliquez<br>sur <hilight>Annuler</hilight> si vous n'êtes "
 "pas sûr<br>et rien ne sera modifié."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Aucune propriété ne correspond"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1916,119 +1922,104 @@ msgid ""
 msgstr ""
 "Vous demandez à Enlightenment de mémoriser des<br>propriétés (telles que la "
 "taille, la position, le style de bordure, etc)<br>d'une fenêtre<hilight>sans "
-"spécifier comment le faire</hilight>.<br><br>Vous devez spécifier au moins 1 "
-"méthode pour<br>mémoriser cette fenêtre."
+"spécifier comment le faire</hilight>.<br><br>Vous devez spécifier au moins "
+"une méthode pour<br>mémoriser cette fenêtre."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Vous demandez à Enlightenment de mémoriser les<br>propriétés (telles que la "
-"taille, la position,<br>le type de bordure, etc) d'une fenêtre "
-"sans<hilight><br>propriétés distinctives</hilight>.<br><br>Ce qui signifie "
-"qu'elle partage son nom et classe, sa fugacité,<br>son rôle, etc, avec au "
-"moins 1 autre fenêtre à l'écran et que la<br>mémorisation des propriétés "
-"pour cette fenêtre s'appliquera à<br>toutes les autres fenêtres qui "
-"partagent les mêmes propriétés.<br><br>Peut-être souhaitez-vous cocher "
-"l'option <br><hilight>N'appliquer qu'à une seule fenêtre</hilight> "
-"si<br>vous avez l'intention de ne modifier qu'une<br>seule instance de cette "
-"fenêtre, sans<br>modifier les autres instances.<br><br>Ceci n'est qu'un "
-"avertissement au cas où ce<br>n'était pas ce que vous recherchiez."
-"<br>Cliquez sur <hilight>Appliquer</hilight> ou <hilight>OK</hilight> "
-"et<br>vos paramètres seront acceptés. Cliquez<br>sur <hilight>Annuler</"
-"hilight> si vous n'êtes pas sûr<br>et rien ne sera modifié."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Rien"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Taille et position"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Tout"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Mémoriser selon"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nom et classe de fenêtre"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Nom de la fenêtre"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Classe de la fenêtre"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
-msgstr "Rôle de fenêtre"
+msgstr "Rôle de la fenêtre"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
-msgstr "Type de fenêtre"
+msgstr "Type de la fenêtre"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "Caractères jokers autorisés"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Fugacité"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propriétés à mémoriser"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Préférence de l'icone"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Bureau virtuel"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Écran actuel"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ne pas afficher dans la liste des fenêtres"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Fichier d'application ou nom (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "N'appliquer qu'à une seule fenêtre"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Démarrer ce programme à l'ouverture de session"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Toujours focaliser au démarrage"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Conserver les propriétés actuelles"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Démarrer ce programme à l'ouverture de session"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Configuration"
@@ -2047,28 +2038,28 @@ msgstr "Rack"
 msgid "Module Settings"
 msgstr "Paramétrage des modules"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Modules disponibles"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Activer le module"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Modules activés"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Désactiver le module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
-msgstr "Description: Non disponible"
+msgstr "Description : non disponible"
 
 #: src/bin/e_int_gadcon_config.c:36
 msgid "Shelf Contents"
@@ -2098,8 +2089,8 @@ msgstr "Supprimer ce gadget"
 msgid "Toolbar Settings"
 msgstr "Paramétrage de la barre d'outils"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Présentation"
 
@@ -2119,19 +2110,19 @@ msgstr ""
 
 #: src/bin/e_int_menus.c:89
 msgid "Main"
-msgstr "Principal"
+msgstr "Menu Principal"
 
 #: src/bin/e_int_menus.c:106
 msgid "Favorite Applications"
 msgstr "Applications favorites"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2140,7 +2131,7 @@ msgstr "Applications"
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
@@ -2176,129 +2167,128 @@ msgstr "(Aucune application)"
 msgid "Set Virtual Desktops"
 msgstr "Configurer les bureaux virtuels"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
-msgstr "Pas de nom !!"
+msgstr "Pas de nom !!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Aucun rack)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
-msgstr "Rack #"
+msgstr "Rack …"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Ajouter un rack"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Supprimer un rack"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Paramétrage du rack"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minuscule"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Petit"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Définir le contenu..."
+msgstr "Définir le contenu…"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Au-dessus de tout"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Sous les fenêtres"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "En dessous de tout"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Autoriser les fenêtres à recouvrir ce rack"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Redimensionner à la taille du contenu"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Styles"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Auto-masquage"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Auto-masquage du rack"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Afficher au passage de la souris"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Afficher avec un clic de souris"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Délai avant masquage"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f secondes"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Vitesse du masquage"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Afficher sur tous les bureaux"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Afficher sur les bureaux spécifiés"
 
@@ -2312,11 +2302,11 @@ msgid ""
 "or is not owned by you. Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
-"Tentative probable de hacking IPC. Le dossier\n"
-"de socket IPC existe déjà MAIS possède des permissions\n"
-"trop laxistes (il ne doit être que lisible et éditable\n"
-"par l'utilisateur, et par personne d'autre)\n"
-"ou ne vous appartient pas. Veuillez vérifier:\n"
+"Vulnérabilité au hacking IPC. Le dossier de socket IPC\n"
+"existe déjà MAIS possède des permissions trop\n"
+"laxistes (il ne doit être que lisible et éditable\n"
+"par l'utilisateur, et par personne d'autre) ou\n"
+"ne vous appartient pas. Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:57
@@ -2327,9 +2317,9 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
-"Le dossier de socket IPC n'a pu être créé ou\n"
-"examiné.\n"
-"Veuillez vérifier:\n"
+"Le dossier de socket IPC n'a pu être créé\n"
+"ou examiné.\n"
+"Veuillez vérifier :\n"
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
@@ -2360,21 +2350,21 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Options :\n"
+"Options :\n"
 "\t-display DISPLAY\n"
 "\t\tSe connecter à l'affichage nommé DISPLAY\n"
-"\t\tExemple: -display :1.0\n"
+"\t\tExemple : -display :1.0\n"
 "\t-fake-xinerama-screen WxH+X+Y\n"
 "\t\tAjouter un écran xinerama VIRTUEL (au lieu d'un réel)\n"
 "\t\tétant donné sa géométrie. Vous pouvez en ajouter autant\n"
 "\t\tque vous le désirez. Ils remplaceront les écrans réels\n"
 "\t\tle cas échéant. Ceci peut être utilisé pour simuler\n"
 "\t\txinerama.\n"
-"\t\tExemple: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
+"\t\tExemple : -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600"
 "+800+0\n"
 "\t-profile PROFIL_CONF\n"
 "\t\tUtiliser le profil de configuration PROFIL_CONF à la place du profil par "
-"défaut de l'utilisateur ou juste « default ».\n"
+"défaut de l'utilisateur ou juste « default ».\n"
 "\t-good\n"
 "\t\tGentil.\n"
 "\t-evil\n"
@@ -2393,8 +2383,8 @@ msgid ""
 "Enlightenment cannot Initialize Ecore!\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment ne peut pas initialiser Ecore !\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Enlightenment ne peut pas initialiser Ecore !\n"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:411
 msgid ""
@@ -2402,7 +2392,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le système de fichiers.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:424
 msgid ""
@@ -2410,7 +2400,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de signal de sortie.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:430
 msgid ""
@@ -2418,7 +2408,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de signal HUP.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:442
 msgid ""
@@ -2426,7 +2416,7 @@ msgid ""
 "Have you set your DISPLAY variable?"
 msgstr ""
 "Enlightenment ne peut pas initialiser sa connexion à X.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+"Avez-vous défini la variable d'environnement DISPLAY ?"
 
 #: src/bin/e_main.c:450
 msgid ""
@@ -2434,7 +2424,7 @@ msgid ""
 "Have you set your DISPLAY variable?"
 msgstr ""
 "Enlightenment ne peut pas initialiser son système d'alerte d'urgence.\n"
-"Avez-vous défini la variable d'environnement DISPLAY ?"
+"Avez-vous défini la variable d'environnement DISPLAY ?"
 
 #: src/bin/e_main.c:473
 msgid ""
@@ -2442,7 +2432,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le gestionnaire de connexions.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:481
 msgid ""
@@ -2450,7 +2440,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le système IPC.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:490
 msgid ""
@@ -2466,7 +2456,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas initialiser le système Evas.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:515
 msgid ""
@@ -2474,10 +2464,10 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
-"Enlightenment a remarqué que ecore_evas ne contient pas le support\n"
+"Enlightenment a détecté que ecore_evas ne contient pas le support\n"
 "de rendu graphique logiciel X11 de Evas. Veuillez vérifier vos\n"
-"installations de Evas et Ecore, et que ces bibliothèques supportent\n"
-"le moteur de rendu logiciel X11."
+"installations de Evas et Ecore, et que ces bibliothèques\n"
+"supportent le moteur de rendu logiciel X11."
 
 #: src/bin/e_main.c:522
 msgid ""
@@ -2485,10 +2475,10 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
-"Enlightenment a remarqué que ecore_evas ne supportait pas le moteur de\n"
+"Enlightenment a détecté que ecore_evas ne supportait pas le moteur de\n"
 "rendu graphique logiciel en mémoire dans Evas. Veuillez vérifier vos\n"
 "installations de Evas et Ecore et vérifier qu'ils supportent le\n"
-"le moteur de rendu logiciel en mémoire."
+"moteur de rendu logiciel en mémoire."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
 msgid ""
@@ -2505,7 +2495,7 @@ msgid ""
 msgstr ""
 "Enlightenment ne peut créer de dossiers dans votre dossier personnel.\n"
 "Peut-être n'avez vous pas de dossier personnel,\n"
-"ou que votre disque dur est plein ?"
+"ou que votre disque dur est plein ?"
 
 #: src/bin/e_main.c:569
 msgid "Enlightenment cannot set up its file registry system."
@@ -2530,7 +2520,7 @@ msgid ""
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas configurer les chemins de recherche des fichiers.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
 #: src/bin/e_main.c:627
 msgid "Enlightenment cannot set up its font system."
@@ -2542,275 +2532,274 @@ msgstr "Enlightenment ne peut pas initialiser son gestionnaire de thèmes."
 
 #: src/bin/e_main.c:643
 msgid "Starting International Support"
-msgstr "Démarrage du support multi-langues"
+msgstr "Démarrage du support multilingue"
 
 #: src/bin/e_main.c:648
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son système d'internationalisation."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 "Enlightenment ne peut pas configurer l'écran de démarrage.\n"
-"Peut-être êtes-vous à court de mémoire ?"
+"Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Test du support des formats"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
-"Enlightenment a remarqué que Evas ne pouvais pas créer un canevas en "
+"Enlightenment a détecté que Evas ne pouvait pas créer un canevas en "
 "mémoire.\n"
-"Veuillez vérifier que Evas support le moteur de rendu logiciel en mémoire.\n"
+"Veuillez vérifier que Evas supporte le moteur de rendu logiciel en mémoire.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
-"Enlightenment a remarqué que Evas ne pouvait pas charger les fichiers PNG.\n"
+"Enlightenment a détecté que Evas ne pouvait pas charger les fichiers PNG.\n"
 "Veuillez vérifier que Evas contient le support des images PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
-"Enlightenment a remarqué que Evas ne pouvait pas charger les fichiers JPEG.\n"
+"Enlightenment a détecté que Evas ne pouvait pas charger les fichiers JPEG.\n"
 "Veuillez vérifier que Evas contient le support des images JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
-"Enlightenment a remarqué que Evas ne pouvait pas charger les fichiers EET.\n"
-"Veuillez vérifier que Evas contient le support des images EET.\n"
+"Enlightenment a détecté que Evas ne pouvait pas charger les fichiers EET.\n"
+"Veuillez vérifier que Evas contient le support de EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Enlightenment a remarqué que Evas ne pouvait pas charger la police 'Sans'. "
+"Enlightenment a détecté que Evas ne pouvait pas charger la police « Sans ». "
 "Vérifiez que Evas \n"
-"contient le support fontconfig et que le système prend en charge la police "
-"'Sans'.\n"
+"contient le support de fontconfig et que le système prend en charge la "
+"police « Sans ».\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Configuration des écrans"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
-"Enlightenment ne peut s'initialiser en tant que gestionnaire de fenêtres\n"
-"pour tous les écrans de votre système.\n"
-"Un autre gestionnaire de fenêtres est-il déjà lancé ?\n"
+"Enlightenment ne peut être initialisé en tant que gestionnaire de fenêtres\n"
+"Un autre gestionnaire de fenêtres est-il déjà lancé ?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Configuration de l'écran de veille"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne peut pas configurer l'écran de veille de X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Configuration du verrouillage de bureau"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment ne peut pas configurer son système de verrouillage d'écran."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Configuration des chemins"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Configuration des contrôles du système"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de commandes "
-"systèmes.\n"
+"système.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Configuration des actions"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne peut pas configurer son système d'actions."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Configuration du système d'exécution"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne peut pas initialiser son système d'exécution."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Configuration de la mémorisation"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ne peut pas initialiser son système de mémorisation."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Configuration du gestionnaire de fichiers"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Configuration du système de messages"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne peut pas configurer son système de messages."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Configuration du glisser-déposer"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne peut pas configurer son système de glisser-déposer."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr "Configuration des périphériques d'entrée"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment ne peut pas configurer son gestionnaire de réservation de "
 "périphériques d'entrée."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Configuration des modules"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne peut pas configurer son système de modules."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Configuration de la mémorisation"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne peut pas initialiser son système de mémorisation."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Configuration des classes de couleurs"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 "Enlightenment ne peut pas configurer son système de classes de couleur."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Configuration de Gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment ne peut pas configurer son système de contrôle des gadgets."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Configuration du DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne peut pas configurer le DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Configuration de la gestion de l'énergie"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment ne peut pas configurer la gestion de l'énergie."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Configuration du fond d'écran"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment ne peut pas configurer son gestionnaire de fonds d'écran."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Configuration de la souris"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment est incapable de configurer la souris."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Configuration des raccourcis"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne peut pas configurer son système de raccourcis."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Configuration des pop-up"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
-msgstr "Enlightenment ne peut pas configurer son système de  pop-up"
+msgstr "Enlightenment ne peut pas configurer son système de pop-up."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Configuration des racks"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ne peut pas configurer son gestionnaire de racks."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Configuration des vignettes"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne peut pas initialiser son système de vignettes.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Configuration du classement des fichiers"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne peut pas configurer sa gestion des fichiers."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Activer les modules"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2823,11 +2812,11 @@ msgstr ""
 "dialogue de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment a planté au démarrage et a été redémarré "
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2840,59 +2829,60 @@ msgstr ""
 "fenêtre de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Configurer les racks"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Presque fini"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
 "found in the<br>module search directories.<br>"
 msgstr ""
-"Une erreur est survenue lors du chargement du module nommé: %s<br>Aucun "
-"module nommé %s n'a pu être trouvé dans les<br>dossiers de modules.<br>"
+"Une erreur est survenue lors du chargement du module nommé : %s<br>Aucun "
+"module nommé %s n'a pu être trouvé dans les<br>dossiers de recherche du "
+"module.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
 "is:<br>%s<br>The error reported was:<br>%s<br>"
 msgstr ""
-"Erreur lors du chargement du module nommé: %s<br>Le chemin d'accès de ce "
-"module est <br>%s<br>L'erreur retournée est:<br>%s<br>"
+"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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
 "module API version of: %i.<br>The module API advertized by Enlightenment is: "
 "%i.<br>"
 msgstr ""
-"Erreur de l'API du module<br>Erreur d'initialisation du module: %s<br>La "
-"version minimale de l'API du module requise est: %i.<br>La version de l'API "
-"retournée par Enlightenment est: %i.<br>"
+"Erreur de l'API du module.<br>Erreur d'initialisation du module : %s<br>La "
+"version minimale de l'API du module requise est : %i.<br>La version de l'API "
+"retournée par Enlightenment est : %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s de Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
-msgstr "Voulez-vous désactiver ce module ?<br>"
+msgstr "Voulez-vous désactiver ce module ?<br>"
 
 #: src/bin/e_screensaver.c:99
 msgid ""
@@ -2902,33 +2892,33 @@ msgid ""
 msgstr ""
 "Vous avez désactivé l'écran de veille trop vite.<br><br>Voulez-vous activer "
 "le mode <b>présentation</b> et désactiver temporairement l'écran de veille, "
-"le verrouillage et la gestion de l'énergie ?"
+"le verrouillage et la gestion de l'énergie ?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce rack ?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce rack ?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "Vous avez demandé à supprimer ce rack.<br><br>Êtes-vous sûr de vouloir le "
-"supprimer ?"
+"supprimer ?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Arrêter de déplacer/redimensionner des éléments"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Déplacer/Redimensionner des éléments"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Définir le contenu du rack"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Supprimer ce rack"
 
@@ -2945,11 +2935,11 @@ msgstr "Vérification des permissions du système"
 msgid "System Check Done"
 msgstr "Vérification du système terminée"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problème de fermeture de session"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2957,34 +2947,34 @@ msgid ""
 msgstr ""
 "La fermeture de la session est trop longue.<br>Certaines applications "
 "refusent de se terminer.<br>Voulez-vous forcer la fermeture de la "
-"session<br> sans attendre la fermeture des applications ?"
+"session<br> sans attendre la fermeture des applications ?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Fermer immédiatement la session"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Attendre plus longtemps"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Annuler la fermeture de session"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
-msgstr "Fermeture de la session en cours"
+msgstr "Fermeture de la session en cours…"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"Fermeture de session en cours.<br><hilight>Veuillez patienter.</hilight>"
+"Fermeture de session en cours.<br><hilight>Veuillez patienter…</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment est occupé à traiter une autre requête"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2992,7 +2982,7 @@ msgstr ""
 "Fermeture de session en cours.<br>Vous ne pouvez pas effectuer d'autres "
 "actions système<br>une fois que la fermeture de session est amorcée."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3000,7 +2990,7 @@ msgstr ""
 "Extinction du système en cours.<br>Vous ne pouvez pas effectuer d'autres "
 "actions système<br>pendant l'arrêt de votre ordinateur."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3008,7 +2998,7 @@ msgstr ""
 "Redémarrage en cours.<br>Vous ne pouvez pas effectuer d'autres actions "
 "système<br>lorsqu'un redémarrage est amorcé."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3016,7 +3006,7 @@ msgstr ""
 "Mise en veille en cours.<br>Vous ne pouvez pas effectuer d'autres actions "
 "système<br>pendant ce temps."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -3024,57 +3014,57 @@ msgstr ""
 "Mise en hibernation en cours.<br>Vous ne pouvez pas effectuer d'autres "
 "actions système<br>tant que ce n'est pas terminé."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
-msgstr "ARGH ! Ceci ne devrait pas arriver"
+msgstr "ARGH ! Ça ne devrait pas se produire…"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Échec de l'extinction."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Échec du redémarrage."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Échec de la mise en veille."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Échec de la mise en hibernation."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Extinction"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Extinction.<br><hilight>Veuillez patienter.</hilight>"
+msgstr "Extinction.<br><hilight>Veuillez patienter…</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Redémarrage"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Redémarrage.<br><hilight>Veuillez patienter.</hilight>"
+msgstr "Redémarrage.<br><hilight>Veuillez patienter…</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Mise en veille"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Mise en veille.<br><hilight>Veuillez patienter.</hilight>"
+msgstr "Mise en veille.<br><hilight>Veuillez patienter…</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Mise en hibernation"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr "Mise en hibernation.<br><hilight>Veuillez patienter.</hilight>"
+msgstr "Mise en hibernation.<br><hilight>Veuillez patienter…</hilight>"
 
 #: src/bin/e_theme_about.c:17
 msgid "About Theme"
@@ -3088,91 +3078,91 @@ msgstr "Utiliser ce thème"
 msgid "Set Toolbar Contents"
 msgstr "Définir le contenu de la barre d'outils"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
-msgstr "Impossible de quitter - fenêtres immortelles."
+msgstr "Impossible de quitter – fenêtres immortelles."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 "Des fenêtres sont toujours présentes car elles ont été verrouillées. "
-"Cependant<br>Enlightenment n'autorisera pas une fin de session tant que "
+"Toutefois,<br>Enlightenment n'autorisera pas la fin de session tant que "
 "ces<br>fenêtres n'auront pas été fermées, ou déverrouillées.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f octets"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Ko"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Mo"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Go"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
-msgstr "il y a %li semaines"
+msgstr "il y a %li semaine(s)"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
-msgstr "il y a %li jours"
+msgstr "il y a %li jour(s)"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
-msgstr "il y a %li heures"
+msgstr "il y a %li heure(s)"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Inconnu"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3192,51 +3182,51 @@ msgstr "Monter"
 msgid "Down"
 msgstr "Descendre"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Remonter d'un niveau"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
-msgstr "Permissions:"
+msgstr "Permissions :"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
-msgstr "Dernière modification:"
+msgstr "Dernière modification :"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Vous"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protégé"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Lecture seule"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lecture-Écriture"
 
@@ -3252,57 +3242,57 @@ msgstr "Paramètres basiques"
 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:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Contrôler tous les:"
+msgstr "Contrôler tous les :"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tics"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Interrogation"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr "Alerte quand le niveau est à:"
+msgstr "Alerte quand le niveau est à :"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
-msgstr "Éliminer automatiquement dans..."
+msgstr "Éliminer automatiquement dans…"
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f s"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Alerte"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Auto-détection"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3310,12 +3300,12 @@ msgstr "Auto-détection"
 msgid "Internal"
 msgstr "Interne"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Interface"
 
@@ -3323,24 +3313,24 @@ msgstr "Interface"
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "La batterie est faible !"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Branchement sur le secteur recommandé."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Surveillance de la batterie"
 
@@ -3348,20 +3338,20 @@ msgstr "Surveillance de la batterie"
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Panneau de configuration"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Présentation"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Modes"
 
@@ -3387,7 +3377,7 @@ msgid "Restart Applications"
 msgstr "Applications à redémarrer"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3409,12 +3399,12 @@ msgstr "IBar (autres)"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menus"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Style de bordure par défaut"
 
@@ -3422,14 +3412,14 @@ msgstr "Style de bordure par défaut"
 msgid "Window Border Selection"
 msgstr "Sélection de la bordure de fenêtre"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Mémoriser la bordure lors de la prochaine apparition de cette fenêtre"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3446,7 +3436,7 @@ msgstr "Bordures"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
 msgid "Client List Settings"
-msgstr "Paramétrage des fenêtres clientes"
+msgstr "Paramétrage des fenêtres filles"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
 msgid "Group By"
@@ -3455,7 +3445,7 @@ msgstr "Grouper 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3469,7 +3459,7 @@ msgstr "Afficher les fenêtres des autres écrans"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:111
 msgid "Separate Groups By"
-msgstr "Séparer les groupes par"
+msgstr "Séparer les groupes (par)"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:116
 msgid "Using separator bars"
@@ -3485,7 +3475,7 @@ msgstr "Ordre des fenêtres"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
 msgid "Alphabetical"
-msgstr "Alphabétique"
+msgstr "Alphabétiquement"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
 msgid "Window stacking layer"
@@ -3530,7 +3520,7 @@ msgstr "%1.0f Caractères"
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
 msgid "Client List Menu"
-msgstr "Menu des fenêtres clientes"
+msgstr "Menu des fenêtres filles"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
 msgid "Window Manager"
@@ -3546,11 +3536,11 @@ msgstr "Version de la fenêtre à propos"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
 msgid "Border Title"
-msgstr "Titre de bordure"
+msgstr "Titre de la bordure"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Settings Dialog Title"
-msgstr "Titre de dialogue de la configuration"
+msgstr "Titre de la fenêtre de configuration"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3568,7 +3558,7 @@ msgstr "Titre du menu actif"
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
-msgstr "Élément de menu"
+msgstr "Élément du menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
 msgid "Menu Item Active"
@@ -3586,7 +3576,7 @@ msgstr "Texte de redimensionnement"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
 msgid "Winlist Item"
-msgstr "Élément de la liste de fenêtres"
+msgstr "Élément de la liste des fenêtres"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
 msgid "Winlist Label"
@@ -3723,11 +3713,11 @@ msgid "Desktop Name"
 msgstr "Nom du bureau"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
-msgstr "Nom:"
+msgstr "Nom :"
 
 #: src/modules/conf_desk/e_int_config_desk.c:156
 msgid "Desktop Wallpaper"
@@ -3791,17 +3781,17 @@ msgstr "%1.0f minutes"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personnel"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
-msgstr "Paramétrage de la boîte de login"
+msgstr "Paramétrage de la boîte de connexion"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
@@ -3813,7 +3803,7 @@ msgstr "Afficher sur la zone d'écran actuelle"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
-msgstr "Afficher sur la zone d'écran #:"
+msgstr "Afficher sur la zone d'écran ..."
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:406
 #: src/modules/conf_desks/e_int_config_desks.c:247
@@ -3826,8 +3816,8 @@ msgstr "Afficher sur la zone d'écran #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3884,7 +3874,7 @@ msgstr "Paramétrage des bureaux virtuels"
 
 #: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
-msgstr "Nombre de bureaux"
+msgstr "Nombre des bureaux"
 
 #: src/modules/conf_desks/e_int_config_desks.c:258
 #: src/modules/conf_desks/e_int_config_desks.c:295
@@ -3948,52 +3938,57 @@ msgstr "Facteur vertical %.2f"
 msgid "Virtual Desktops"
 msgstr "Bureaux virtuels"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr "Paramétrage des boîtes de dialogues"
+msgstr "Paramétrage des boîtes de dialogue"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr "Désactiver les boîtes de dialogues de confirmation"
+msgstr "Désactiver les boîtes de dialogue de confirmation"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Fenêtres normales"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Mode par défaut des boîtes de dialogue"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Mode basique"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Mode avancé"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr "La taille et la position des boîtes de dialogue"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Mode par défaut des boîtes de dialogue"
 
 #: src/modules/conf_dialogs/e_mod_main.c:35
 msgid "Dialogs"
-msgstr "Dialogues"
+msgstr "Boîtes de dialogue"
 
 #: src/modules/conf_display/e_int_config_display.c:129
 #, c-format
@@ -4002,7 +3997,7 @@ 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 ""
-"Ceci vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight>si c'est "
+"Ceci vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight>si c'est "
 "le cas, ou Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
 "résolution de<br>%dx%d à %d Hz sera restaurée dans %d secondes."
 
@@ -4013,7 +4008,7 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
-"Cela vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
+"Cela vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
 "le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
 "résolution de<br>%dx%d sera restaurée dans %d secondes."
 
@@ -4024,7 +4019,7 @@ 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 ""
-"Ceci vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
+"Ceci vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
 "le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
 "résolution de<br>%dx%d à %d Hz sera restaurée <hilight>IMMÉDIATEMENT</"
 "hilight>."
@@ -4036,13 +4031,13 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Cela vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
+"Cela vous convient-il ? Cliquez sur <hilight>Enregistrer</hilight> si c'est "
 "le cas, sur Restaurer sinon.<br>Si vous ne cliquez pas, la précédente "
 "résolution de<br>%dx%d sera restaurée <hilight>IMMÉDIATEMENT</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
-msgstr "Changement de résolution"
+msgstr "Modification de la résolution"
 
 #: src/modules/conf_display/e_int_config_display.c:194
 msgid "Save"
@@ -4056,31 +4051,31 @@ msgstr "Restaurer"
 msgid "Screen Resolution Settings"
 msgstr "Paramétrage de la résolution de l'écran"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaurer à l'ouverture de session"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Rafraîchissement"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Miroir"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Fonctionnalités manquantes"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4088,17 +4083,17 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
-"Votre serveur X ne supporte pas l'extension<br><hilight>XRandr</hilight> "
+"Votre serveur X ne supporte pas l'extension<br><hilight>XRandR</hilight> "
 "(Redimensionnement et Rotation X).<br>Vous ne pouvez modifier la résolution "
 "de l'écran sans le<br>support de cette extension. Il se peut aussi qu'au "
-"moment de la compilation<br>de<hilight>ecore</hilight>, le support de XRandr "
+"moment de la compilation<br>de<hilight>ecore</hilight>, le support de XRandR "
 "n'ait pas été détecté."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
-msgstr "Aucun taux de rafraîchissement trouvé"
+msgstr "Aucun taux de rafraîchissement détecté"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4107,9 +4102,9 @@ msgid ""
 "screen."
 msgstr ""
 "Aucun taux de rafraîchissement n'a été rapporté par votre serveur X.<br>Si "
-"vous utilisez un serveur X incorporé, alors ceci est normal.<br>Néanmoins, "
-"si ce n'est pas le cas, le taux de rafraîchissement actuel<br>sera utilisé "
-"lors de la sélection de la résolution, ce qui "
+"vous utilisez un serveur X imbriqué (nested), alors ceci est normal."
+"<br>Néanmoins, si ce n'est pas le cas, le taux de rafraîchissement "
+"actuel<br>sera utilisé lors de la sélection de la résolution, ce qui "
 "pourrait<br><hilight>endommager</hilight> votre écran."
 
 #: src/modules/conf_display/e_mod_main.c:35
@@ -4127,7 +4122,7 @@ msgstr "L'affichage actuel ne supporte<br>pas le DPMS."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:82
 msgid "The current display server does not <br>have the DPMS extension."
-msgstr "L'affichage actuel n'a pas le support<br>DPMS."
+msgstr "L'affichage actuel n'a pas le <br>support DPMS."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
@@ -4143,22 +4138,22 @@ msgstr "Minuteurs"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
-msgstr "Délai de mise en veille"
+msgstr "Délai avant mise en veille"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
-msgstr "Délai d'hibernation"
+msgstr "Délai avant hibernation"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
-msgstr "Extinction"
+msgstr "Délai avant extinction"
 
 #: src/modules/conf_dpms/e_mod_main.c:35
 msgid "Power Management"
 msgstr "Gestion de l'énergie"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4168,78 +4163,83 @@ msgstr "<Aucun>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Veuillez choisir un bord,<br>ou cliquer sur <hilight>Fermer</hilight> pour "
-"annuler.<br><br>Pour modifier le délai de cette action,<br>utilisez le "
-"curseur:"
+"Veuillez choisir un bord,<br>ou cliquez sur <hilight>Fermer</hilight> pour "
+"annuler.<br><br>Vous avez le choix entre spécifier un délai pour<br>cette "
+"action en utilisant le curseur,<br>ou l'activer par un clic :"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Paramétrage des raccourcis des bords de l'écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Raccourcis des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Ajouter un bord"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Supprimer un bord"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Modifier un bord"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paramétrage de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Options générales"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Autoriser l'activation du raccourci avec des fenêtres en plein écran"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "Séquence de raccourci des bords"
+msgstr "Séquence du raccourci des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f secondes"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr "Bord cliquable"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Erreur de raccourci des bords"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4249,29 +4249,29 @@ msgstr ""
 "l'action <hilight>%s</hilight>.<br>Veuillez choisir une autre séquence pour "
 "le raccourci des bords."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
-msgstr "CTRL"
+msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
-msgstr "ALT"
+msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
-msgstr "MAJ"
+msgstr "Majuscule"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
-msgstr "WIN"
+msgstr "Logo"
 
 #: src/modules/conf_edgebindings/e_mod_main.c:34
 #: src/modules/conf_interaction/e_mod_main.c:34
@@ -4296,7 +4296,7 @@ msgstr "Moteur par défaut"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
-msgstr "Activer le support de l'extension composite ?"
+msgstr "Activer le support de l'extension composite ?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4306,7 +4306,7 @@ msgid ""
 msgstr ""
 "Vous avez choisi d'activer l'extension composite,<br>mais votre écran actuel "
 "ne la prend pas en charge.<br><br>Êtes-vous sûr de vouloir activer cette "
-"extension ?"
+"extension ?"
 
 #: src/modules/conf_engine/e_mod_main.c:35
 msgid "Engine"
@@ -4348,7 +4348,7 @@ msgstr "Animer le défilement"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:185
 #: src/modules/conf_winlist/e_int_config_winlist.c:272
 msgid "Scroll Speed"
-msgstr "Vitesse de défilement"
+msgstr "Vitesse du défilement"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:189
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:228
@@ -4367,7 +4367,7 @@ msgstr "Paramétrage du terminal"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr "Commande de terminal (CTRL+ENTRÉE pour l'utiliser)"
+msgstr "Commande du terminal (Ctrl + Entrée pour l'utiliser)"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
@@ -4440,15 +4440,15 @@ msgstr "Bloc de texte"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
-msgstr "Bloc de texte petit"
+msgstr "Bloc de texte fin"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
-msgstr "Bloc de texte gros"
+msgstr "Bloc de texte large"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Settings Heading"
-msgstr "En-tête de la configuration"
+msgstr "En-tête de configuration"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4472,7 +4472,7 @@ msgstr "Mot de passe de l'écran de verrouillage"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
-msgstr "Fenêtre d'erreur"
+msgstr "Boîte de dialogue d'erreur"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
@@ -4524,7 +4524,7 @@ msgstr "Texte de la liste des éléments"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
-msgstr "Élément de la liste"
+msgstr "Élément de liste"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
@@ -4536,7 +4536,7 @@ msgstr "Typebuf"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
 msgid "Desktop Icon"
-msgstr "Icone du bureau"
+msgstr "Icone de bureau"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
@@ -4567,57 +4567,68 @@ msgstr "Très gros"
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Activer les polices personnalisées"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
-msgstr "Aperçu basique du texte : 123 : 我的天空!"
+msgstr "Aperçu basique du texte : 123: 我的天空!"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:604
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Police"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Style"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Aperçu avancé du texte : 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Optimisation"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Polices de secours"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nom de la police de secours"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Activer les polices de secours"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Aperçu avancé du texte...我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Optimisation / Polices de secours"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4631,7 +4642,7 @@ msgstr "Thèmes d'icones"
 msgid "Icon theme overrides general theme"
 msgstr "Le thème d'icones prime sur le thème général"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Thème d'icones"
 
@@ -4660,7 +4671,7 @@ msgstr "Nouveau"
 
 #: src/modules/conf_imc/e_int_config_imc.c:903
 msgid "Import..."
-msgstr "Importer..."
+msgstr "Importer…"
 
 #: src/modules/conf_imc/e_int_config_imc.c:908
 msgid "Input Method Parameters"
@@ -4680,7 +4691,7 @@ msgstr "Variables d'environnement exportées"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
 msgid "Select an Input Method Settings..."
-msgstr "Choisir une configuration de la méthode de saisie..."
+msgstr "Choisir une configuration de la méthode de saisie…"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
@@ -4693,17 +4704,17 @@ msgid ""
 "this is really a valid configuration?"
 msgstr ""
 "Enlightenment n'a pas pu importer la configuration.<br><br>Êtes-vous sûr que "
-"cette configuration est valide ?"
+"cette configuration est valide ?"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:297
 msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
-"Enlightenment n'a pas pu importer cette configuration<br>à cause d'une "
+"Enlightenment n'a pas pu importer cette configuration,<br>à cause d'une "
 "erreur de copie."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Langue"
 
@@ -4721,7 +4732,7 @@ msgstr "Activer le défilement au doigt"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr "Seuil du glissé du doigt"
+msgstr "Seuil du glisser au doigt"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
@@ -4860,7 +4871,7 @@ msgstr "Paramétrage du défilement automatique"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
 msgid "Autoscroll Margin"
-msgstr "Marge de défilement automatique"
+msgstr "Marge du défilement automatique"
 
 #: src/modules/conf_menus/e_int_config_menus.c:184
 #: src/modules/conf_menus/e_int_config_menus.c:189
@@ -4878,7 +4889,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Marge du curseur de défilement automatique"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Autres options"
 
@@ -4903,7 +4914,7 @@ msgstr "%4.0f pixels/s"
 
 #: src/modules/conf_menus/e_int_config_menus.c:206
 msgid "Click Drag Timeout"
-msgstr "Délai d'expiration du glissé"
+msgstr "Délai d'expiration du glisser"
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
 #, c-format
@@ -4925,7 +4936,7 @@ msgstr "Icone du fichier"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
 msgid "Mime:"
-msgstr "Mime:"
+msgstr "Mime :"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:147
 msgid "Use Generated Thumbnail"
@@ -5057,24 +5068,24 @@ msgstr "Taille du curseur"
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Paramétrage de la souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Latéralité"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Accélération de la souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Accélération"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Seuil"
 
@@ -5091,7 +5102,7 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Thèmes"
 
@@ -5191,33 +5202,33 @@ msgstr "%1.0f collections"
 msgid "Performance"
 msgstr "Performance"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Sélecteur de profil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Profils disponibles"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Sélectionnez un profil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Redémarrer"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "Vous avez demandé à supprimer le profil « %s ».<br><br>Êtes-vous sûr ?"
+msgstr "Vous avez demandé à supprimer le profil « %s ».<br><br>Êtes-vous sûr ?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "Supprimer OK ?"
+msgstr "Supprimer, d'accord ?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Ajouter un nouveau profil"
 
@@ -5321,7 +5332,7 @@ msgstr "Délai avant le changement d'écran de veille de X"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
-msgstr "Masquer"
+msgstr "Éteindre (blanking)"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
@@ -5362,8 +5373,8 @@ msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "shelf?"
 msgstr ""
-"Vous avez demandé à supprimer « %s ».<br><br>Êtes-vous sûr de vouloir "
-"supprimer ce rack ?"
+"Vous avez demandé à supprimer « %s ».<br><br>Êtes-vous sûr de vouloir "
+"supprimer ce rack ?"
 
 #: src/modules/conf_startup/e_int_config_startup.c:39
 msgid "Startup Settings"
@@ -5382,29 +5393,29 @@ msgstr "Démarrage"
 msgid "Theme Selector"
 msgstr "Sélecteur de thème"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "Importer..."
+msgstr "Importer…"
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
-msgstr "En ligne..."
+msgstr "En ligne…"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
-msgstr "Catégories de thèmes"
+msgstr "Catégories des thèmes"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Assigner"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Tout effacer"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
-msgstr "Sélectionner un thème..."
+msgstr "Sélectionner un thème…"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:274
 #: src/modules/conf_theme/e_int_config_theme_import.c:283
@@ -5416,12 +5427,13 @@ msgid ""
 "Enlightenment was unable to import the theme.<br><br>Are you sure this is "
 "really a valid theme?"
 msgstr ""
-"Enlightenment n'a pu importer le thème.<br><br>Êtes-vous sûr que ce soit "
-"réellement un thème valide ?"
+"Enlightenment n'a pu importer ce thème.<br><br>Êtes-vous sûr que c'est "
+"réellement un thème valide ?"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:284
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
-msgstr "Enlightenment n'a pu importer le thème<br>dû à une erreur de copie."
+msgstr ""
+"Enlightenment n'a pu importer ce thème<br>à cause d'une erreur de copie."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
 msgid "Exchange themes"
@@ -5453,66 +5465,66 @@ msgid "Wallpaper Settings"
 msgstr "Paramétrage du fond d'écran"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
-msgstr "Image..."
+msgstr "Image…"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
-msgstr "Dégradé..."
+msgstr "Dégradé…"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
-msgstr "En ligne..."
+msgstr "En ligne…"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Où placer ce fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Tous les bureaux"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Ce bureau"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Cet écran"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
 msgid "Create a gradient..."
-msgstr "Créer un dégradé..."
+msgstr "Créer un dégradé…"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
 msgid "Color 1:"
-msgstr "Couleur 1:"
+msgstr "Couleur 1 :"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
 msgid "Color 2:"
-msgstr "Couleur 2:"
+msgstr "Couleur 2 :"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
 msgid "Fill Options"
 msgstr "Options de remplissage"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5538,7 +5550,7 @@ msgstr "Sans raison bien déterminée, Enlightenment n'a pu créer un dégradé.
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
 msgid "Wallpaper settings..."
-msgstr "Paramétrage du fond d'écran..."
+msgstr "Paramétrage du fond d'écran…"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5577,45 +5589,45 @@ msgstr "Utiliser le fichier original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
-msgstr "Choisir une image..."
+msgstr "Choisir une image…"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Erreur lors de l'importation du fichier"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
-"Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr que ce "
-"soit un fond d'écran valide ?"
+"Enlightenment n'a pu importer le fond d'écran.<br><br>Êtes-vous sûr que "
+"c'est un fond d'écran valide ?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Fonds d'écran Exchange "
 
@@ -5674,7 +5686,7 @@ msgstr "Placer manuellement à la souris"
 #: src/modules/conf_window_display/e_int_config_window_display.c:184
 #: src/modules/conf_window_display/e_int_config_window_display.c:265
 msgid "Automatically switch to desktop of new window"
-msgstr "Automatiquement basculer vers le bureau de la nouvelle fenêtre"
+msgstr "Basculer automatiquement vers le bureau de la nouvelle fenêtre"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:203
 msgid "Window Move Geometry"
@@ -5699,7 +5711,7 @@ msgstr "Suivre la fenêtre lors de son redimensionnement"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:225
 msgid "Window Shading"
-msgstr "Enroulement de fenêtre"
+msgstr "Enroulement de la fenêtre"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:234
 msgid "Linear"
@@ -5719,7 +5731,7 @@ msgstr "Décélérer"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
 msgid "Window Border"
-msgstr "Bordure de fenêtre"
+msgstr "Bordure de la fenêtre"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
@@ -5729,14 +5741,6 @@ msgstr "Préférer l'icone défini par l'utilisateur"
 msgid "Prefer application provided icon"
 msgstr "Préférer l'icone fourni par l'application"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Fenêtres internes"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Toujours se rappeler des fenêtres internes"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Paramétrage de la focalisation"
@@ -5809,7 +5813,8 @@ msgstr "Un clic dans une fenêtre la focalise toujours"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
-msgstr "Refocaliser la dernière fenêtre lors d'un changement de bureau"
+msgstr ""
+"Refocaliser la dernière fenêtre focalisée lors d'un changement de bureau"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:214
 msgid "Revert focus when hiding or closing a window"
@@ -5839,15 +5844,15 @@ msgstr "Résister lors du déplacement/redimensionnement sur un obstacle"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
 msgid "Resistance between windows:"
-msgstr "Résistance entre les fenêtres:"
+msgstr "Résistance entre les fenêtres :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
 msgid "Resistance at the edge of the screen:"
-msgstr "Résistance au bord de l'écran:"
+msgstr "Résistance au bord de l'écran :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
 msgid "Resistance to desktop gadgets:"
-msgstr "Résistance aux gadgets du bureau:"
+msgstr "Résistance aux gadgets du bureau :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
 msgid "Keyboard move and resize"
@@ -5855,15 +5860,15 @@ msgstr "Déplacement et redimensionnement au clavier"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
 msgid "Automatically accept changes after:"
-msgstr "Acceptation automatique des changements après:"
+msgstr "Acceptation automatique des changements après :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
 msgid "Move by:"
-msgstr "Déplacer de:"
+msgstr "Déplacer de :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
 msgid "Resize by:"
-msgstr "Redimensionner de:"
+msgstr "Redimensionner de :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
@@ -5871,17 +5876,12 @@ msgid "Window Maximize Policy"
 msgstr "Politique de maximisation de la fenêtre"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expansion intelligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Étendre la fenêtre"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Remplir l'espace disponible"
 
@@ -5889,19 +5889,19 @@ msgstr "Remplir l'espace disponible"
 msgid "Maximize Policy"
 msgstr "Politique de maximisation"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Directions de maximisation"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Les deux"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Autoriser la manipulation des fenêtres"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr "Autoriser la manipulation des fenêtres maximisées"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 "Déplacer/Redimensionner automatiquement les fenêtres lors de l'auto-masquage "
@@ -5928,7 +5928,7 @@ msgstr "Élever automatiquement"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
 msgid "Delay before raising:"
-msgstr "Délai avant la mise au premier plan:"
+msgstr "Délai avant la mise au premier plan :"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
 msgid "Raise Window"
@@ -5942,49 +5942,57 @@ msgstr "Élever lors du déplacement ou du redimensionnement"
 msgid "Raise when clicking to focus"
 msgstr "Élever lors du clic de focalisation"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Mémorisations propres à la fenêtre"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr "Mémoriser les boîtes de dialogue internes"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr "Mémoriser les fenêtres du gestionnaire de fichiers"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Effacer la (les) mémorisation(s)"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Détails"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Sans Nom>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Classe:"
+msgstr "Classe :"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Sans Classe>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Titre:"
+msgstr "Titre :"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Sans Titre>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Rôle:"
+msgstr "Rôle :"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Sans Rôle>"
 
@@ -6150,7 +6158,7 @@ msgid ""
 msgstr ""
 "Votre noyau ne supporte pas le changement<br> de fréquence. Vous l'avez peut-"
 "être compilé sans cette option<br> ou votre CPU ne supporte pas cette "
-"fonctionnalité."
+"fonctionnalité ?"
 
 #: src/modules/cpufreq/e_mod_main.c:432
 msgid ""
@@ -6278,13 +6286,14 @@ 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 ""
-"La configuration du module Fileman (EFM) a dû être mise à jour. Votre "
-"ancienne<br>configuration a été supprimée et de nouveaux paramètres "
-"par<br>défaut sont en place. Ceci risque d'arriver en phase "
+"La configuration du module Gestionnaire de fichiers a dû être mise à jour. "
+"<br>Votre ancienne configuration a été supprimée et de nouveaux "
+"paramètres<br>par défaut sont en place. Ceci risque d'arriver en phase "
 "de<br>développement, aussi est-il inutile de faire un rapport de bogue."
-"<br>Cela signifie simplement que le module Fileman a besoin<br>de cette mise "
-"à niveau pour être à nouveau fonctionnel.<br>Vous pouvez maintenant tout "
-"reconfigurer selon votre goût.<br>Désolé pour la gêne occasionnée.<br>"
+"<br>Cela signifie simplement que le module Gestionnaire de fichiers a "
+"besoin<br>de cette mise à niveau pour être à nouveau fonctionnel.<br>Vous "
+"pouvez maintenant tout reconfigurer selon votre goût.<br>Désolé pour la gêne "
+"occasionnée.<br>"
 
 #: src/modules/fileman/e_mod_main.c:444
 msgid ""
@@ -6295,10 +6304,10 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Votre configuration du module Fileman (EFM) est PLUS RÉCENTE que la version "
-"du<br>module actuelle. C'est vraiment étonnant. Cela ne devrait pas se "
-"produite<br>à moins que vous n'ayez installé une version antérieure ou "
-"copié<br>la configuration du module depuis une machine sur laquelle "
+"Votre configuration du module Gestionnaire de fichiers est PLUS RÉCENTE que "
+"la version du<br>module actuelle. C'est vraiment étonnant. Cela ne devrait "
+"pas se produire<br>à moins que vous n'ayez installé une version antérieure "
+"ou copié<br>la configuration du module depuis une machine sur laquelle "
 "une<br>version plus récente était installée. Ce n'est pas bon et, par<br> "
 "mesure de précaution, votre configuration a été remise à zéro.<br> Désolé "
 "pour les désagréments.<br>"
@@ -6356,7 +6365,7 @@ msgid "Show Toolbar"
 msgstr "Montrer la barre d'outils"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Comportement"
 
@@ -6372,95 +6381,95 @@ msgstr "Monter les volumes à l'insertion"
 msgid "Open filemanager on mount"
 msgstr "Ouvrir le gestionnaire de fichiers au montage"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Autre application..."
+msgstr "Autre application…"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
-msgstr "Ouvrir avec..."
+msgstr "Ouvrir avec…"
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Applications disponibles"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Commande personnalisée"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr "Copie annulée"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr "Déplacement annulé"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Suppression annulée"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "L'opération a échoué"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr "Copie de %s terminée"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr "Copie de %s (eta: %d s)"
+msgstr "Copie de %s (eta : %d s)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr "Déplacement de %s terminé"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr "Déplacement de %s (eta: %d s)"
+msgstr "Déplacement de %s (eta : %d s)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr "Suppression terminée"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr "Suppression des fichiers en cours..."
+msgstr "Suppression des fichiers en cours…"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6474,28 +6483,28 @@ msgstr "(pas d'information)"
 #: src/modules/fileman_opinfo/e_mod_main.c:142
 #, c-format
 msgid "File: %s"
-msgstr "Fichier: %s"
+msgstr "Fichier : %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr "De: %s"
+msgstr "De : %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr "Vers: %s"
+msgstr "Vers : %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr "Traitement de %d opération(s)"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr "Gestionnaire de fichiers inactif"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "Informations EFM"
 
@@ -6533,19 +6542,19 @@ msgstr "Fond d'écran"
 msgid "Gadgets"
 msgstr "Gadgets"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Libre"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Toujours sur le bureau"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Au-dessus en appuyant sur"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Ajouter un autre gadget"
 
@@ -6556,7 +6565,7 @@ msgstr "Afficher/Cacher les gadgets"
 #: 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
 msgid "Window : List"
-msgstr "Fenêtre: Liste"
+msgstr "Fenêtre : liste"
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
 msgid "Next Window"
@@ -6582,7 +6591,7 @@ msgstr "Sélection de la source"
 msgid "Icon Labels"
 msgstr "Étiquettes de l'icone"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Montrer l'étiquette de l'icone"
 
@@ -6604,7 +6613,7 @@ msgstr "Créer une nouvelle source"
 
 #: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
-msgstr "Entrer un nom pour cette nouvelle source:"
+msgstr "Entrer un nom pour cette nouvelle source :"
 
 #: src/modules/ibar/e_mod_config.c:183
 #, c-format
@@ -6612,12 +6621,12 @@ msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
 msgstr ""
-"Vous avez demandé à supprimer « %s ».<br><br>Êtes-vous sûr de vouloir "
-"supprimer cette source ?"
+"Vous avez demandé à supprimer « %s ».<br><br>Êtes-vous sûr de vouloir "
+"supprimer cette source ?"
 
 #: src/modules/ibar/e_mod_config.c:187
 msgid "Are you sure you want to delete this bar source?"
-msgstr "Êtes-vous sûr de vouloir supprimer cette source ?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette source ?"
 
 #: src/modules/ibar/e_mod_main.c:215
 msgid "IBar"
@@ -6643,43 +6652,43 @@ msgstr "Créer un nouvel icone"
 msgid "Add Application"
 msgstr "Ajouter une application"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Paramétrage de l'Ibox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Afficher le nom"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Afficher le titre"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Afficher la classe"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Afficher le nom de l'icone"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Afficher la légende de la bordure"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
-msgstr "Afficher les fenêtres de l'écran courant"
+msgstr "Afficher les fenêtres de l'écran actuel"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Afficher les fenêtres de tous les bureaux"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Afficher les fenêtres du bureau actif"
 
@@ -6699,11 +6708,11 @@ msgstr "Changer de bureau avec la molette de la souris"
 msgid "Show desktop names"
 msgstr "Afficher le nom des bureaux"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Paramétrage du pop-up"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Afficher un pop-up lors du changement de bureau"
 
@@ -6711,82 +6720,82 @@ msgstr "Afficher un pop-up lors du changement de bureau"
 msgid "Show popup for urgent windows"
 msgstr "Afficher le pop-up pour les fenêtres urgentes"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Bouton de sélectionner-glisser"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Cliquer pour configurer"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Bouton de glisser-déposer"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Faire glisser le bureau"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Hauteur du pop-up de l'élément"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Résistance au glissement"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "Hauteur du pop-up du pager"
+msgstr "Hauteur du pop-up du Pager"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Vitesse du pop-up"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Paramétrage de la fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "Afficher les pop-up sur les fenêtres urgentes"
+msgstr "Afficher un pop-up pour les fenêtres urgentes"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Pop-up de la fenêtre urgente ancrée à l'écran"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Bouton de capture du Pager"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
-"Veuillez cliquer sur un bouton de la souris<br>Presser<hilight>Échap</"
+"Veuillez cliquer sur un bouton de la souris<br>Pressez<hilight>Échap</"
 "hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight>pour réinitialiser "
 "le bouton."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Attention"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6797,29 +6806,29 @@ msgstr ""
 "interne<br>pour les menus contextuels. <br>Ce bouton fonctionne uniquement "
 "dans le pop-up."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Afficher le pop-up du Pager"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Pop-up du bureau droit"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Pop-up du bureau gauche"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Pop-up du bureau au-dessus"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Pop-up du bureau en dessous"
 
@@ -6880,16 +6889,16 @@ msgstr "Température élevée"
 
 #: src/modules/temperature/e_mod_config.c:274
 msgid "200 F"
-msgstr "200°F"
+msgstr "200 °F"
 
 #: src/modules/temperature/e_mod_config.c:276
 msgid "150 F"
-msgstr "150°F"
+msgstr "150 °F"
 
 #: src/modules/temperature/e_mod_config.c:278
 #: src/modules/temperature/e_mod_config.c:287
 msgid "110 F"
-msgstr "110°F"
+msgstr "110 °F"
 
 #: src/modules/temperature/e_mod_config.c:282
 #: src/modules/temperature/e_mod_config.c:306
@@ -6900,32 +6909,32 @@ msgstr "Température basse"
 
 #: src/modules/temperature/e_mod_config.c:285
 msgid "130 F"
-msgstr "130°F"
+msgstr "130 °F"
 
 #: src/modules/temperature/e_mod_config.c:289
 msgid "90 F"
-msgstr "90°F"
+msgstr "90 °F"
 
 #: src/modules/temperature/e_mod_config.c:298
 msgid "93 C"
-msgstr "93°C"
+msgstr "93 °C"
 
 #: src/modules/temperature/e_mod_config.c:300
 msgid "65 C"
-msgstr "65°C"
+msgstr "65 °C"
 
 #: src/modules/temperature/e_mod_config.c:302
 #: src/modules/temperature/e_mod_config.c:311
 msgid "43 C"
-msgstr "43°C"
+msgstr "43 °C"
 
 #: src/modules/temperature/e_mod_config.c:309
 msgid "55 C"
-msgstr "55°C"
+msgstr "55 °C"
 
 #: src/modules/temperature/e_mod_config.c:313
 msgid "32 C"
-msgstr "32°C"
+msgstr "32 °C"
 
 #: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
@@ -6935,15 +6944,15 @@ msgstr "Capteurs"
 #: src/modules/temperature/e_mod_config.c:402
 #, c-format
 msgid "%1.0f F"
-msgstr "%1.0f °F"
+msgstr "%1.0f °F"
 
 #: src/modules/temperature/e_mod_config.c:409
 #: src/modules/temperature/e_mod_config.c:414
 #, c-format
 msgid "%1.0f C"
-msgstr "%1.0f °C"
+msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Température"
 
@@ -6955,21 +6964,21 @@ msgstr "Suivant"
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenue dans Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Choisissez"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
-"Aucun fichier de menus<br>n'a été trouvé.<br>Veuillez consulter "
+"Aucun fichier de menus<br>n'a été détecté.<br>Veuillez consulter "
 "la<br>documentation disponible<br>sur www.enlightenment.org<br>pour savoir "
 "comment<br>générer les menus<br>d'applications."
 
@@ -6987,7 +6996,7 @@ msgstr "Barre de lancement"
 
 #: src/modules/wizard/page_040.c:27
 msgid "Select applications"
-msgstr "Sélectionner les applications"
+msgstr "Sélectionnez les applications"
 
 #: src/modules/wizard/page_050.c:28
 msgid "Desktop Files"
@@ -7013,15 +7022,15 @@ msgstr "Cliquer pour focaliser les fenêtres"
 msgid "Mouse over focuses windows"
 msgstr "Focalisation des fenêtres au passage de la souris "
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Sélectionner les icones à ajouter"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Lanceur"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Sélectionnez les applications"
 
@@ -7047,23 +7056,23 @@ msgstr "Canaux"
 
 #: src/modules/mixer/app_mixer.c:390
 msgid "Card:"
-msgstr "Carte:"
+msgstr "Carte :"
 
 #: src/modules/mixer/app_mixer.c:394
 msgid "Channel:"
-msgstr "Canal:"
+msgstr "Canal :"
 
 #: src/modules/mixer/app_mixer.c:398
 msgid "Type:"
-msgstr "Type:"
+msgstr "Type :"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
-msgstr "Gauche:"
+msgstr "Gauche :"
 
 #: src/modules/mixer/app_mixer.c:407
 msgid "Right:"
-msgstr "Droit:"
+msgstr "Droit :"
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
@@ -7079,7 +7088,7 @@ msgstr "Édition"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
-msgstr "Afficher les deux curseurs une fois verrouillé"
+msgstr "Afficher les deux curseurs si verrouillé"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
@@ -7091,11 +7100,11 @@ msgstr "Paramétrage du mélangeur"
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
-msgstr "Mélangeur général:"
+msgstr "Mélangeur général :"
 
 #: src/modules/mixer/conf_module.c:152
 msgid "Launch mixer..."
-msgstr "Lancer le mélangeur..."
+msgstr "Lancer le mélangeur…"
 
 #: src/modules/mixer/conf_module.c:187
 msgid "Mixer Module Settings"
@@ -7132,7 +7141,7 @@ msgstr "Périphérique réseau"
 
 #: src/modules/connman/e_mod_main.c:742
 msgid "Wifi"
-msgstr "Wifi"
+msgstr "Wi-Fi"
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
@@ -7146,20 +7155,63 @@ msgstr "Périphérique spécifique"
 msgid "Networks"
 msgstr "Réseaux"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Il y a déjà une zone de notification"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Il y a déjà une zone de notification active et seule une instance de ce "
 "gadget est autorisée."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Zone de notification"
 
+#~ msgid "Expand the window"
+#~ msgstr "Étendre la fenêtre"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Autoriser la manipulation des fenêtres"
+
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Vous demandez à Enlightenment de mémoriser les<br>propriétés (telles que "
+#~ "la taille, la position,<br>le type de bordure, etc) d'une fenêtre "
+#~ "sans<hilight><br>propriétés distinctives</hilight>.<br><br>Ce qui "
+#~ "signifie qu'elle partage son nom et classe, sa fugacité,<br>son rôle, "
+#~ "etc, avec au moins 1 autre fenêtre à l'écran et que la<br>mémorisation "
+#~ "des propriétés pour cette fenêtre s'appliquera à<br>toutes les autres "
+#~ "fenêtres qui partagent les mêmes propriétés.<br><br>Peut-être souhaitez-"
+#~ "vous cocher l'option <br><hilight>N'appliquer qu'à une seule fenêtre</"
+#~ "hilight> si<br>vous avez l'intention de ne modifier qu'une<br>seule "
+#~ "instance de cette fenêtre, sans<br>modifier les autres instances."
+#~ "<br><br>Ceci n'est qu'un avertissement au cas où ce<br>n'était pas ce que "
+#~ "vous recherchiez.<br>Cliquez sur <hilight>Appliquer</hilight> ou "
+#~ "<hilight>OK</hilight> et<br>vos paramètres seront acceptés. "
+#~ "Cliquez<br>sur <hilight>Annuler</hilight> si vous n'êtes pas sûr<br>et "
+#~ "rien ne sera modifié."
+
+#~ msgid "Internal Windows"
+#~ msgstr "Fenêtres internes"
+
+#~ msgid "Window name and class"
+#~ msgstr "Nom et classe de fenêtre"
+
 #~ msgid "idle"
 #~ msgstr "Inactif"
 
diff --git a/po/fr_CH.gmo b/po/fr_CH.gmo
index aa534ac..8596213 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 9864902..0468fef 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: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\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,29 +42,29 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "À propos d'Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Fermer"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -103,48 +103,48 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Êtes-vous sûr de vouloir tuer cette fenêtre ?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Oui"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Non"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Êtes-vous sûr de vouloir quitter ?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Vous avez demandé à quitter Enlightenment.<br><br>Êtes-vous sûr de vouloir "
 "quitter ?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Êtes-vous sur de vouloir fermer votre session ?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Vous avez demandé à fermer votre session.<br><br>Êtes-vous sûr de vouloir le "
 "faire ?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Êtes-vous sur de vouloir éteindre ?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -152,11 +152,11 @@ msgstr ""
 "Vous avez demandé à éteindre votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir l'éteindre ?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Êtes-vous sûr de vouloir redémarrer ?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -164,18 +164,18 @@ msgstr ""
 "Vous avez demandé à redémarrer votre ordinateur.<br><br>Êtes-vous sûr de "
 "vouloir le redémarrer ?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Vous avez demandé à votre ordinateur de roupiller<br><br>Êtes-vous sûr?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Êtes-vous sur de vouloir hiberner ?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -183,525 +183,525 @@ msgstr ""
 "Vous avez demandé à hiberner votre ordinateur.<br><br>Êtes-vous sur de "
 "vouloir le mettre en hibernation ?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Déplacer"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Changer la taille (resize)"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu de la fenêtre"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Monter"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Descendre"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Tuer"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Fenêtre : état"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Iconifier (on/off)"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximiser"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximiser en mode \"plein écran\""
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximiser en mode \"intelligent\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximiser en mode \"expansion\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximiser en mode \"remplissage\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Ombre vers le haut (on/off)"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Ombre vers le bas (on/off)"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Ombre vers la gauche (on/off)"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Ombre vers la droite (on/off)"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Sans bordure (on/off)"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Ancrage (on/off)"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Bureau"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Afficher le bureau"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vers le bureau à gauche"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vers le bureau à droite"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vers le bureau au dessus"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vers le bureau en dessous"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Se déplacer de ... bureaux"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Se déplacer linéairement de ... bureaux"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Aller au bureau ..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Aller au bureau 0"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Aller au bureau 1"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Aller au bureau 2"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Aller au bureau 3"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Aller au bureau 4"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Aller au bureau 5"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Aller au bureau 6"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Aller au bureau 7"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Aller au bureau 8"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Aller au bureau 9"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Aller au bureau 10"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Aller au bureau 11"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Aller au bureau..."
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Écran"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Envoyer la souris à l'écran 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Envoyer la souris à l'écran 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Envoyer la souris à l'écran..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Envoyer la souris à l'écran suivant"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Envoyer la souris à l'écran précédent"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Envoyer la souris ... écrans plus loin"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Fenêtre : déplacement"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Déplacer vers le bureau suivant"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Déplacer vers le bureau précédent"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Déplacer vers de ... bureaux"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Déplacer vers le bureau..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Afficher le menu principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Afficher le menu des applications favorites"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Afficher le menu des applications"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Afficher le menu des clients"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Afficher le menu..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Exécuter"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Commande"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Application"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 #, fuzzy
 msgid "Exit Now"
 msgstr "Quitter"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Plein écran (on/off)"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Enroulement (on/off)"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Système"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Fermer la session"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Roupiller"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hiberner"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 #, fuzzy
 msgid "Lock"
 msgstr "Verrous"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Ré-arranger les fenêtres"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Fenêtre : actions"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Actions de module"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Fonds d'écran"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Scan des fichiers du bureau terminé"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Scan des fichiers du bureau"
@@ -711,41 +711,40 @@ msgstr "Scan des fichiers du bureau"
 msgid "Color Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -766,7 +765,7 @@ msgstr ""
 "reconfigurer tout à votre goût comme avant.<br>Désolé pour le désagrément "
 "occasionné.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -782,12 +781,12 @@ msgstr ""
 "sain et par précaution votre<br>configuration a été remise à zéro. Désolé "
 "pour les désagréments.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Paramètre du bureau"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -799,7 +798,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:1784
+#: src/bin/e_config.c:1774
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -815,7 +814,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:1797
+#: src/bin/e_config.c:1787
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -829,7 +828,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:1808
+#: src/bin/e_config.c:1798
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -843,7 +842,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:1820
+#: src/bin/e_config.c:1810
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -854,12 +853,12 @@ 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:1845
+#: src/bin/e_config.c:1835
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -867,12 +866,12 @@ msgstr "Problèmes d'écriture de la configuration d'Enlightenment"
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Benêt"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -880,7 +879,7 @@ msgstr "Appliquer"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Modules"
 
@@ -889,27 +888,27 @@ msgstr "Modules"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Conteneur %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Erreur - pas de support PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Enlightenment n'a pas été compilé avec le support<br>PAM, le verrouillage "
 "d'écran a été désactivé."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Échec du verrouillage"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -918,15 +917,15 @@ msgstr ""
 "le clavier, la souris, ou les deux<br>et cette réservation n'a pu être "
 "annulée."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Veuillez entrer votre mot de passe pour dévérouiller"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Erreur du gestionnaire d'authentification"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -938,22 +937,22 @@ msgstr ""
 "erreur ne devrait pas se produire. Merci de redzipéter sur http://bugs."
 "enlightenment.org/"
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -979,7 +978,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editer un élément du bureau"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -1025,7 +1024,7 @@ msgstr "Catégories"
 msgid "Mime Types"
 msgstr "Types Mime"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 #, fuzzy
 msgid "Options"
 msgstr "Options de remplissage"
@@ -1059,23 +1058,23 @@ msgstr "Sélectionner une icône"
 msgid "Select an Executable"
 msgstr "Sélectionner un programme"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Couper"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Copier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Coller"
 
@@ -1083,24 +1082,24 @@ msgstr "Coller"
 msgid "Select All"
 msgstr "Tout selectionner"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Erreur d'exécution d'une application"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1109,326 +1108,326 @@ 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Erreur lors de l'exécution de l'application"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s c'est arrêté de façon inattendue."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s a été interrompu avec SIGINT"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s a été interrompu avec SIGQUIT."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s a été interrompu avec SIGABRT."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s a été interrompu avec SIGKILL."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, 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:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s a été interrompu avec SIGTERM."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, 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:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Historique des erreurs"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Il n'y a eu aucun message d'erreur."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Sauver ce message"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informations sur l'erreur"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Information sur le signal d'erreur"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Données de sortie"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Il n'y a eu aucune sortie."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Erreur d'exécution"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i fichiers"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 #, fuzzy
 msgid "Link"
 msgstr "Linéaire"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 #, fuzzy
 msgid "Abort"
 msgstr "À propos"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Paramètres de sélection"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Mode de vue"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Rafraîchir la vue"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Afficher les fichiers cachés"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Se souvenir de l'ordre"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Classer maintenant"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nouveau dossier"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "Élément de menu"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 #, fuzzy
 msgid "Use default"
 msgstr "Utiliser Valeurs par défaut"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Grille d'icônes"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Personnalisé"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Liste de fenêtres"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Taille de l'icône"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "Fonds d'écran"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Contenu du tablar"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 #, fuzzy
 msgid "Clear"
 msgstr "Supprimer"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Créer un nouveau dossier"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nom du nouveau dossier :"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renommer %s en :"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renommer le fichier"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 #, fuzzy
 msgid "Retry"
 msgstr "Redémarrer"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Erreur"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "Démarrage de %s"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Impossible de supprimer <br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmer la suppression"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1441,144 +1440,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Propriétés du fichier"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fichier:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Taille :"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Dernière modification:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Type de fichier:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permissions :"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Propriétaire :"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Les autres peuvent écrire"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Les autres peuvent écrire"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Le propriétaire peut lire"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Le propriétaire peut écrire"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Pré-visualisation"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Défaut"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Miniature"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Utiliser cette icon pour tous les fichiers de même type"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Informations sur le lien"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Sélectionner une image"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "volume inconnu"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Supprimer ce gadget"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Tel quel"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Encart"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Apparence"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Défilement automatique du contenu"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Permettre le redimensionnement"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Déplacer / redimensionner ce gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Supprimer ce gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Arrêter de Déplacer/redimensionner ce gadget"
 
@@ -1590,7 +1594,7 @@ msgstr ""
 "Un instance précédente d'Enlightenment est encore\n"
 "active sur cet écran. Arrêt du Démarrage de E.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Verrouillage des propriétés..."
 
@@ -1624,21 +1628,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Empilement"
 
@@ -1647,12 +1651,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "État d'enroulement"
 
@@ -1661,7 +1665,7 @@ msgid "Maximized state"
 msgstr "État de maximisation"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "État de plein écran"
 
@@ -1669,7 +1673,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Style de bordure"
 
@@ -1719,121 +1723,122 @@ msgstr "Décroché du bureau"
 msgid "More..."
 msgstr "Importer..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimiser"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximiser verticalement"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximiser horizontalement"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Restaurer"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 #, fuzzy
 msgid "Keyboard Shortcut"
 msgstr "Ajouter un raccourci clavier"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 #, fuzzy
 msgid "To Favorites Menu"
 msgstr "Menu Favoris"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 #, fuzzy
 msgid "To Launcher"
 msgstr "Ajouter l'application au lanceur"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Bordure"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Echapper"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "État"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Rappels"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 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:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Toujours au-dessus"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Toujours en-dessous"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Style de bordure par défaut"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 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:943
+#: src/bin/e_int_border_menu.c:949
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Utiliser l'icône fournie par l'application"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Choix manuel de l'icône"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Enroulé"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Sur tous les bureaux"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Plein écran"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Liste des fenêtres"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 #, fuzzy
 msgid "Taskbar"
 msgstr "Ne pas afficher dans la barre des tâches"
@@ -1850,7 +1855,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:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titre"
 
@@ -1942,11 +1947,11 @@ msgstr "Propriétés NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 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_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Ne pas afficher dans le pager"
 
@@ -1954,15 +1959,15 @@ msgstr "Ne pas afficher dans le pager"
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Rappels de fenêtre"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Propriétés de fenêtre partagées"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1987,11 +1992,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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Aucune propriété n'est rencontrée"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -2004,113 +2009,106 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Vous demandez à Enlightenment de se souvenir des<br>propriétés (tel que la "
-"taille, l'emplacement, le style de bordure etc..)<br>à une fenêtre <hilight> "
-"qui n'est pas définie de façon unique</hilight>.<br><br>Cela signifie que "
-"ses propriétés de Nom/Classe/Transition etc..<br>s'appliqueront à plus d'une "
-"fenêtre sur cette écran qui auront les mêmes propriétés.<br><br>Vous devriez "
-"peut-être activé l'option<hilight>Sur une seule fenêtre</hilight><br>si vous "
-"ne voulez qu'une seule instance de cette fenêtre soit modifié.<br>Dans ce "
-"cas pressez simplement le bouton <hilight>Appliquer</hilight> ou "
-"<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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Rien"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Taille et position"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Verrous"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Taille, position et verrous"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Tout"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Rappel en utilisant"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nom et classe de fenêtre"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Nom de fenêtre"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Classe de fenêtre"
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Rôle de fenêtre"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Type de fenêtre"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Transience"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propriétés à retenir"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 #, fuzzy
 msgid "Icon Preference"
 msgstr "Non préféré"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Bureau virtuel"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Ecran actuel"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ne pas afficher dans la liste des fenêtres"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Erreur d'exécution d'une application"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "N'appliquer qu'à une fenêtre"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Démarrer ce programme à l'ouverture de session"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Changer les propriétés de l'icône"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Démarrer ce programme à l'ouverture de session"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 #, fuzzy
 msgid "Settings"
@@ -2132,28 +2130,28 @@ msgstr "Tablar #"
 msgid "Module Settings"
 msgstr "Paramètres du module"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 #, fuzzy
 msgid "Available Modules"
 msgstr "Modules disponibles"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 #, fuzzy
 msgid "Load Module"
 msgstr "Charger le module"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "Modules chargés"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 #, fuzzy
 msgid "Unload Module"
 msgstr "Décharger le module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2189,8 +2187,8 @@ msgstr "Supprimer ce gadget"
 msgid "Toolbar Settings"
 msgstr "Paramètres d'apparition"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Positionnement"
 
@@ -2217,12 +2215,12 @@ msgid "Favorite Applications"
 msgstr "Applications favorites"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Applications"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2231,7 +2229,7 @@ msgstr "Applications"
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Fenêtres orphelines"
 
@@ -2268,133 +2266,132 @@ msgstr "(Aucune application)"
 msgid "Set Virtual Desktops"
 msgstr "Bureaux virtuels"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Aucune fenêtre)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Aucun Nom !"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Aucun tablar)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Tablar #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Ajouter tablar"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Supprimer un tablar"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Paramètres du tablar"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Miquelet"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Petit"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grand"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Énorme"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Contenu du tablar"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Au-dessus de tout"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Sous les fenêtres"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "En-dessous de tout"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Autoriser les fenêtres à cacher ce tablar"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Redimensionner à la taille du contenu"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Styles"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Caché automatiquement"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Cacher automatiquement le tablar"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "Afficher sur la zone d'écran :"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Afficher avec un clic souris"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Délai pour cacher"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Caché durant.."
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Sur tous les bureaux"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Afficher le bureau spécifiés"
@@ -2647,7 +2644,7 @@ msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire "
 "d'internationalisation."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2655,11 +2652,11 @@ msgstr ""
 "Enlightenment ne peut pas initialiser l'écran de démarrage.\n"
 "Peut-être êtes-vous à court de mémoire ?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2667,7 +2664,7 @@ msgstr ""
 "Enlightenment a remarqué qu'Evas ne pouvais créer un canvas en mémoire.\n"
 "Veuillez vérifier qu'Evas support le moteur de rendu logiciel en mémoire.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2675,7 +2672,7 @@ msgstr ""
 "Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
 "Veuillez vérifier qu'Evas contient le support des images PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2683,7 +2680,7 @@ msgstr ""
 "Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers JPEG.\n"
 "Veuillez vérifier qu'Evas contient le support des images JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2691,7 +2688,7 @@ msgstr ""
 "Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers EET.\n"
 "Veuillez vérifier qu'Evas contient le support des images EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
@@ -2701,12 +2698,12 @@ msgstr ""
 "Enlightenment a remarqué qu'Evas ne pouvait charger les fichiers PNG.\n"
 "Veuillez vérifier qu'Evas contient le support des images PNG.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 #, fuzzy
 msgid "Setup Screens"
 msgstr "Ecran courant"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2715,224 +2712,224 @@ msgstr ""
 "pour tous les écrans de votre système.\n"
 "Un autre gestionnaire de fenêtres est-il déjà lancé ?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Screensaver"
 msgstr "Ecran de veille"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne peut pas configurer l'écran de veille."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 #, fuzzy
 msgid "Setup Desklock"
 msgstr "Verrouillage de d'écran"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de verrouillage "
 "d'écran."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 #, fuzzy
 msgid "Setting up Paths"
 msgstr "Paramètres des chemins (paths)"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 #, fuzzy
 msgid "Setup System Controls"
 msgstr "Fixer le controleur"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de commandes "
 "systèmes.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 #, fuzzy
 msgid "Setup Actions"
 msgstr "Applications à démarrer (setup actions)"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire d'actions."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Système d'exécution (exec system)"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne peut pas initialiser son système d'exécution."
 
-#: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Rappels"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ne peut pas initialiser son gestionnaire de rappels."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Gestionnaire de fichiers"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de fichiers.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Système de messages"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de messages."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Glisser-déposer (drag'n drop)"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de glisser-déposer."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "Réservation de périphériques d'entrée (grab input handling)"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de réservation de "
 "périphériques d'entrée (input grab handling)"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 #, fuzzy
 msgid "Setup Modules"
 msgstr "Modules"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de modules."
 
+#: src/bin/e_main.c:884
+#, fuzzy
+msgid "Setup Remembers"
+msgstr "Rappels"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne peut pas initialiser son gestionnaire de rappels."
+
+#: src/bin/e_main.c:894
 #, fuzzy
 msgid "Setup Color Classes"
 msgstr "Classes de couleurs"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de classes de couleur."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 #, fuzzy
 msgid "Setup Gadcon"
 msgstr "Gadcon (gadget control system)"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de contrôle de "
 "gadgets."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne peut pas configurer le DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 #, fuzzy
 msgid "Set Up Powersave modes"
 msgstr "Définir la politique CPU"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 #, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment ne peut pas configurer les popups"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 #, fuzzy
 msgid "Setup Wallpaper"
 msgstr "Fond d'écran du bureau"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de fonds d'écran."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 #, fuzzy
 msgid "Setup Mouse"
 msgstr "Supprimer"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne peut pas configurer le DPMS."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 #, fuzzy
 msgid "Setup Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de raccourcis."
 "(bindings system)"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Configurer les popups"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne peut pas configurer les popups"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 #, fuzzy
 msgid "Setup Shelves"
 msgstr "Tablars"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ne peut pas initialiser son gestionnaire de tablars."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 #, fuzzy
 msgid "Setup Thumbnailer"
 msgstr "Paramètres des miniatures"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 "Enlightenment ne peut pas initialiser son gestionnaire de miniatures.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Tri des fichiers"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne peut pas paramétrer sa gestion des fichiers."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 #, fuzzy
 msgid "Load Modules"
 msgstr "Module"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2945,11 +2942,11 @@ msgstr ""
 "dialogue de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment a planté au démarrage et a été redémarré "
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2962,16 +2959,16 @@ msgstr ""
 "fenêtre de configuration des modules vous permettra<br>de recharger vos "
 "modules."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 #, fuzzy
 msgid "Configure Shelves"
 msgstr "Configurer les tablars"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Presque reglé"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2980,11 +2977,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Erreur de chargement du module"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2993,11 +2990,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Le module ne contient pas toutes les fonctions nécessaires"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3008,12 +3005,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Module %s d'Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Voulez-vous décharger ce module ?<br>"
 
@@ -3024,11 +3021,11 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce tablar ?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3036,20 +3033,20 @@ msgstr ""
 "Vous avez demandé à supprimer ce tablar.<br><br>Êtes-vous sur de vouloir la "
 "supprimer ?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Arrêter de déplacer/redimensionner des éléments"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Démarrer le déplacement/redimensionnement des éléments"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Contenu du tablar"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Supprimer ce tablar"
 
@@ -3067,11 +3064,11 @@ msgstr "Vérification des permissions système"
 msgid "System Check Done"
 msgstr "Vérification du système terminée"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problème de fermeture de session"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -3081,34 +3078,34 @@ msgstr ""
 "de se fermer.<br>Voulez-vous fermer votre session sans attendre <br>la "
 "fermeture de ces applications ?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Fermer immédiatement votre session"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Attendez plus longtemps"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Annuler la fermeture de votre session"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Fermeture de votre session en cours"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Fermeture de votre session en cours.<br><hilight>Veuillez patienter.</"
 "hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment est occupé à traîter une autre requête"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -3118,7 +3115,7 @@ msgstr ""
 "effectuer d'autres actions système<br>lorsqu'une fermeture de session a "
 "commencé."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -3127,7 +3124,7 @@ msgstr ""
 "Enlightenment est train d'éteindre votre système.<br>Vous ne pouvez "
 "effectuer d'autres actions système<br>pendant l'arrêt de votre ordinateur."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -3136,7 +3133,7 @@ msgstr ""
 "Enlightenment est en train de redémarrer votre système.<br>Vous ne pouvez "
 "effectuer d'autres actions systèmes<br>lorsque qu'un redémarrage a commencé."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -3146,7 +3143,7 @@ msgstr ""
 "pouvez effectuer d'autres actions système<br>tant que le roupillonn'est pas "
 "terminée."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
@@ -3156,64 +3153,64 @@ msgstr ""
 "ne pouvez effectuer d'autres actions systèmes<br>tant que ce n'est pas "
 "terminée."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "Saperlipopette, ça devrait pas arriver"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid "Reset failed."
 msgstr "Fichier du bureau"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid "Suspend failed."
 msgstr "Délai avant hibernation"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "L'hibernation de votre système a échoué."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Redémarrage de votre ordinateur.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 #, fuzzy
 msgid "Resetting"
 msgstr "Paramètre du bureau"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 "Redémarrage de votre ordinateur.<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Roupillon"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Roupillon...<br><hilight>Veuillez patienter.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Mise en hibernation"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
@@ -3235,11 +3232,11 @@ msgstr "Sélectionner un thème..."
 msgid "Set Toolbar Contents"
 msgstr "Configurer le contenu du tablar"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Impossible de quitter : fenêtres increvables!"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3249,77 +3246,77 @@ msgstr ""
 "Cela<br>signifie qu'Enlightenment n'autorisera pas une fin de session "
 "jusqu'à ce<br>que ces fenêtres ai été fermé, ou déverrouillé."
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Dans le futur"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Durant la dernière minute"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "il y a %li année(s)"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "il y a %li mois"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "il y a %li semaines"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "il y a %li jours"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "il y a %li heures"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "il y a %li minutes"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Inconnu"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3340,51 +3337,51 @@ msgstr ""
 msgid "Down"
 msgstr "Éteindre"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Ajouter aux favoris"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Dossier parent"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permissions :"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Dernière modification :"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Vous"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protégé"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Lecture seule"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lecture-écriture"
 
@@ -3401,63 +3398,63 @@ msgstr "Paramètres benêts"
 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:137
+#: src/modules/battery/e_mod_config.c:138
 #, fuzzy
 msgid "Check every:"
 msgstr "Controller la batterie tous les:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fichiers"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 #, fuzzy
 msgid "Polling"
 msgstr "Tel quel"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 #, fuzzy
 msgid "Show alert on low battery"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 #, fuzzy
 msgid "Alert when at:"
 msgstr "Alerte dès que le niveau de batterie est inférieur à :"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minutes"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, fuzzy, c-format
 msgid "%1.0f %%"
 msgstr "%3.0f%%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f s"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 #, fuzzy
 msgid "Alert"
 msgstr "Accélérer"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 #, fuzzy
 msgid "Auto Detect"
 msgstr "Caché automatiquement"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3466,13 +3463,13 @@ msgstr "Caché automatiquement"
 msgid "Internal"
 msgstr "Interne"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3480,25 +3477,25 @@ msgstr ""
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Afficher une alerte dès que la batterie est faible"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Batterie"
@@ -3507,23 +3504,23 @@ msgstr "Batterie"
 msgid "Clock"
 msgstr "Horloge"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Paramètre du bureau"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "Paramètre du bureau"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 #, fuzzy
 msgid "Offline"
 msgstr "Délai avant d'éteindre"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "Modules"
@@ -3550,7 +3547,7 @@ msgid "Restart Applications"
 msgstr "Applications à démarrer après restart d'E"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Toutes les applications"
 
@@ -3575,12 +3572,12 @@ msgstr "IBar (autres)"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menus"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Bordure par défaut"
 
@@ -3588,7 +3585,7 @@ msgstr "Bordure par défaut"
 msgid "Window Border Selection"
 msgstr "Choix de la bordure de fenêtre"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 "Se rappeler cette bordure lors de la prochaine apparition de cette fenêtre"
@@ -3596,7 +3593,7 @@ msgstr ""
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3623,7 +3620,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3893,9 +3890,9 @@ msgid "Desktop Name"
 msgstr "Nom du bureau"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nom :"
 
@@ -3965,10 +3962,10 @@ msgstr "%1.0f minutes"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personnel"
@@ -4000,8 +3997,8 @@ msgstr "Afficher sur la zone d'écran :"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -4125,50 +4122,55 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Bureaux virtuels"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 #, fuzzy
 msgid "Dialog Settings"
 msgstr "Paramètres des fenêtres de configuration"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 #, fuzzy
 msgid "Disable Confirmation Dialogs"
 msgstr "Déscativer les confirmations"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 #, fuzzy
 msgid "Normal Windows"
 msgstr "(Aucune fenêtre)"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 #, fuzzy
 msgid "Default Settings Dialogs Mode"
 msgstr "Mode par défaut des boîtes de dialogue"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Mode benêt"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Mode avancé"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Mode par défaut des boîtes de dialogue"
 
@@ -4239,31 +4241,31 @@ msgstr "Redémarrer"
 msgid "Screen Resolution Settings"
 msgstr "Paramètre de résolution de l'écran"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaurer à l'ouverture de session"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Miroir"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Fonctionnalités manquantes"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -4278,11 +4280,11 @@ msgstr ""
 "moment de la compilation<br>d'<hilight>ecore</hilight>, le support de XRandr "
 "n'ait pas été détecté."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Aucun taux de rafraîchissement trouvé"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4343,7 +4345,7 @@ msgid "Power Management"
 msgstr "Gestion d'énergie"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4353,84 +4355,89 @@ msgstr "<Aucun>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Binding Settings"
 msgstr "Paramètres de raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Raccourcis-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 #, fuzzy
 msgid "Add Edge"
 msgstr "Ajouter un gadget"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 #, fuzzy
 msgid "Delete Edge"
 msgstr "Supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 #, fuzzy
 msgid "Modify Edge"
 msgstr "Modifier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tout supprimer"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Restaurer les raccourcis-clavier par défaut"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Paramètres de l'action"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 #, fuzzy
 msgid "General Options"
 msgstr "Paramètres généraux"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Séquence de raccourci-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f secondes"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "Erreur de raccourci-clavier"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4440,27 +4447,27 @@ msgstr ""
 "utilisée<br>par l'action <hilight>%s</hilight>.<br>Veuillez choisir une "
 "autre séquence de raccourci-clavier."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "MAJ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4765,18 +4772,17 @@ msgstr "Enorme"
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Activer les police personnelles"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualisation basique du texte: 123: 我的天空!"
 
@@ -4784,38 +4790,52 @@ msgstr "Pré-visualisation basique du texte: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Classes de police"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Activer la classe de police"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Police"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Styles"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Pré-visualisation avancée de texte...我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Astuces"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Fonte de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nom de la fonte de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Activer les fontes de remplacement"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Pré-visualisation avancée de texte...我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "Fonte de remplacement"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4829,7 +4849,7 @@ msgstr "Thèmes d'icônes"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Thèmes d'icônes"
 
@@ -4902,7 +4922,7 @@ msgstr ""
 "copie."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Langue"
 
@@ -5083,7 +5103,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Marge de défilement automatique du curseur"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Autres options"
 
@@ -5264,26 +5284,26 @@ msgstr "Taille du curseur"
 msgid "Mouse Cursor"
 msgstr "Curseur de souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 #, fuzzy
 msgid "Mouse Settings"
 msgstr "Paramètres du module"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 #, fuzzy
 msgid "Mouse Hand"
 msgstr "Raccourcis-souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Accélération de la souris"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Accéléreration"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Seuil"
 
@@ -5301,7 +5321,7 @@ msgid "Images"
 msgstr "Images"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Thèmes"
 
@@ -5402,40 +5422,40 @@ msgstr "%1.0f collections"
 msgid "Performance"
 msgstr "Performance"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 #, fuzzy
 msgid "Profile Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 #, fuzzy
 msgid "Available Profiles"
 msgstr "Profils disponibles"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "Sélectionner un fichier Edje"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 #, fuzzy
 msgid "Reset"
 msgstr "Changer la taille (resize)"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, fuzzy, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 "Vous avez demandé à supprimer ce tablar.<br><br>Êtes-vous sur de vouloir la "
 "supprimer ?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 #, fuzzy
 msgid "Delete OK?"
 msgstr "Supprimer"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Ajouter un profil"
 
@@ -5610,26 +5630,26 @@ msgstr "Démarrage"
 msgid "Theme Selector"
 msgstr "Sélectionneur de thème"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 #, fuzzy
 msgid " Import..."
 msgstr "Importer..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Catégories"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 #, fuzzy
 msgid "Assign"
 msgstr "Atitrer"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 #, fuzzy
 msgid "Clear All"
 msgstr "Tout supprimer"
@@ -5686,38 +5706,38 @@ msgid "Wallpaper Settings"
 msgstr "Paramètres de fond d'écran"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Utiliser le fond d'écran du thème"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Image..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Dégradé..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Placer ce fond d'écran sur :"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Tous les bureaux"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Ce bureau"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Cet écran"
 
@@ -5738,14 +5758,14 @@ msgid "Fill Options"
 msgstr "Options de remplissage"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5811,37 +5831,37 @@ msgstr "Utiliser le fichier original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Choisir une image..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Erreur lors de l'importation du fichier"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment n'a pu importer l'image<br>à cause d'erreurs de conversion."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Erreur d'importation du fond d'écran"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5849,7 +5869,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 #, fuzzy
 msgid "Exchange wallpapers"
 msgstr "Fond d'écran du thème"
@@ -5966,14 +5986,6 @@ msgstr "Utiliser l'icône manuelle"
 msgid "Prefer application provided icon"
 msgstr "Utiliser l'icône fournie par l'application"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Fenêtre interne"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Toujours se rappeler des fenêtres internes"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Paramètres de focalisation"
@@ -6114,17 +6126,12 @@ msgid "Window Maximize Policy"
 msgstr "Politique de maximisation"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expansion intelligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Étendre la fenêtre"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Remplir l'espace disponible"
 
@@ -6132,20 +6139,20 @@ msgstr "Remplir l'espace disponible"
 msgid "Maximize Policy"
 msgstr "Politique de maximisation"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 #, fuzzy
 msgid "Maximize Directions"
 msgstr "Maximiser horizontalement"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Autoriser la manipulation des fenêtres"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Déplacer/redimensionner automatiquement lorsque le tablar se planque"
 
@@ -6186,58 +6193,68 @@ msgstr "Montrer lors du déplacement ou du redimensionnement"
 msgid "Raise when clicking to focus"
 msgstr "Montrer lors d'un clic de focalisation"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: 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:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Toujours se rappeler des fenêtres internes"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "Toujours se rappeler des fenêtres internes"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 #, fuzzy
 msgid "Delete Remember(s)"
 msgstr "Rappels"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 #, fuzzy
 msgid "Details"
 msgstr "Valeurs par défaut"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 #, fuzzy
 msgid "<No Name>"
 msgstr "Nom de l'icône"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 #, fuzzy
 msgid "Class:"
 msgstr "Classe"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 #, fuzzy
 msgid "<No Class>"
 msgstr "Classe d'icône"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 #, fuzzy
 msgid "Title:"
 msgstr "Titre"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 #, fuzzy
 msgid "<No Title>"
 msgstr "Titre"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 #, fuzzy
 msgid "Role:"
 msgstr "Rôle"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 #, fuzzy
 msgid "<No Role>"
 msgstr "<Aucun>"
@@ -6628,7 +6645,7 @@ msgid "Show Toolbar"
 msgstr "Couleur de l'ombre"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Comportement"
 
@@ -6645,98 +6662,98 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Aller au dossier parent"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "Ajouter une application..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Ouvrir avec..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applications"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Applications spécifiques"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 #, fuzzy
 msgid "Custom Command"
 msgstr "Exécuter une commande"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Supprimer"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Fichier du bureau"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6763,17 +6780,17 @@ msgstr ""
 msgid "To: %s"
 msgstr "Jouets"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "Caché durant.."
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Nom du fichier"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6819,21 +6836,21 @@ msgstr "Fonds d'écran"
 msgid "Gadgets"
 msgstr "Widgets"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 #, fuzzy
 msgid "Free"
 msgstr "Féroé"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 #, fuzzy
 msgid "Always on desktop"
 msgstr "Toujours au-dessus"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 #, fuzzy
 msgid "Add other gadgets"
 msgstr "Ajouter un gadget"
@@ -6873,7 +6890,7 @@ msgstr "Source de Bar sélectionnée"
 msgid "Icon Labels"
 msgstr "Description de l'icône"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Montrer la description de l'icone"
 
@@ -6936,45 +6953,45 @@ msgstr "Créer une icône"
 msgid "Add Application"
 msgstr "Ajouter une applications"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 #, fuzzy
 msgid "IBox Settings"
 msgstr "Paramètres de la box de Login"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Afficher le nom"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Afficher le titre"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Afficher la classe"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Afficher le nom de l'icône"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 #, fuzzy
 msgid "Display Border Caption"
 msgstr "Afficher les informations"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Afficher les fenêtres des autres écrans"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Afficher les fenêtres de l'écran courant"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Afficher les fenêtres de tous les bureaux"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Afficher les fenêtres du bureau actif"
 
@@ -6995,12 +7012,12 @@ msgstr "Changer de bureau avec la molette de la souris"
 msgid "Show desktop names"
 msgstr "Afficher les icônes sur le bureau"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Afficher un message lors changement bureau"
@@ -7010,75 +7027,75 @@ msgstr "Afficher un message lors changement bureau"
 msgid "Show popup for urgent windows"
 msgstr "Afficher les Popup sur le fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Bouton de 'sélectionner/glisser'"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Cliquer pour configurer"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "Bouton de glisser/déposer"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Bureau virtuel"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f pixels"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Résistance aux glisser:"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Vitesse du popup"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 #, fuzzy
 msgid "Popup speed"
 msgstr "Vitesse du popup"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondes"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Paramètres de la liste de fenêtres"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Afficher les Popup sur le fenêtre urgente"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Popup la fenêtre urgente ancrée sur l'écran"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Capture de la touche pour le pager"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -7087,12 +7104,12 @@ msgstr ""
 "hilight> pour annuler.<br>Ou<br><hilight>Suppr</hilight>pour ré-initialisé "
 "le bouton."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 #, fuzzy
 msgid "Attetion"
 msgstr "Action"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -7102,33 +7119,33 @@ msgstr ""
 "Vous ne pouvez pas utiliser le bouton droit de la souris<br>pour cette "
 "action car il est déja utilisé pour les menus contextuels."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Bouton %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Paramètres de popup du Pager"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vers le bureau à droite"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "Vers le bureau à gauche"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Vers le bureau au dessus"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "Vers le bureau en dessous"
@@ -7256,7 +7273,7 @@ msgstr "%1.0f °F"
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Température"
 
@@ -7270,17 +7287,17 @@ msgstr "NetWM"
 msgid "Welcome to Enlightenment"
 msgstr "Bienvenue à Enlightenment 東京"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 #, fuzzy
 msgid "Select one"
 msgstr "Sélectionner une icône"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Profile"
 msgstr "Profils"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7336,17 +7353,17 @@ msgstr "Cliquer pour focaliser"
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 #, fuzzy
 msgid "Select Icons to Add"
 msgstr "Sélectionner une icône"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 #, fuzzy
 msgid "Quick Launch"
 msgstr "Exécuter"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 #, fuzzy
 msgid "Select Applications"
 msgstr "Applications spécifiques"
@@ -7490,19 +7507,58 @@ msgstr "Applications spécifiques"
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 #, fuzzy
 msgid "Systray"
 msgstr "Système"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Vous demandez à Enlightenment de se souvenir des<br>propriétés (tel que "
+#~ "la taille, l'emplacement, le style de bordure etc..)<br>à une fenêtre "
+#~ "<hilight> qui n'est pas définie de façon unique</hilight>.<br><br>Cela "
+#~ "signifie que ses propriétés de Nom/Classe/Transition etc.."
+#~ "<br>s'appliqueront à plus d'une fenêtre sur cette écran qui auront les "
+#~ "mêmes propriétés.<br><br>Vous devriez peut-être activé "
+#~ "l'option<hilight>Sur une seule fenêtre</hilight><br>si vous ne voulez "
+#~ "qu'une seule instance de cette fenêtre soit modifié.<br>Dans ce cas "
+#~ "pressez simplement le bouton <hilight>Appliquer</hilight> ou <hilight>OK</"
+#~ "hilight><br> et vos paramètres seront accepté. Pressez <hilight>Annuler</"
+#~ "hilight> si<br>vous doutez et rien ne sera changé."
+
+#~ msgid "Window name and class"
+#~ msgstr "Nom et classe de fenêtre"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Fenêtre interne"
+
+#~ msgid "Expand the window"
+#~ msgstr "Étendre la fenêtre"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Autoriser la manipulation des fenêtres"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "Répéter"
@@ -9327,9 +9383,6 @@ msgstr "Système"
 #~ msgid "Window"
 #~ msgstr "Fenêtre"
 
-#~ msgid "Window Name"
-#~ msgstr "Nom de fenêtre"
-
 #~ msgid "Window Title"
 #~ msgstr "Titre de fenêtre"
 
@@ -9364,9 +9417,6 @@ msgstr "Système"
 #~ msgid "Font Class Configuration"
 #~ msgstr "Configuration de classe de police"
 
-#~ msgid "Font"
-#~ msgstr "Police"
-
 #~ msgid "Edit Application"
 #~ msgstr "Éditer l'applications"
 
diff --git a/po/he.gmo b/po/he.gmo
index 63cfe1e..a88c908 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 3f4f025..71d5fe0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,40 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-02-18 16:40+0000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-09-11 09:15+0000\n"
 "Last-Translator: Yaron <sh.yaron at gmail.com>\n"
 "Language-Team: Hebrew <he at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "אודות Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "סגור"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -48,13 +50,6 @@ 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 ""
-"כל הזכויות שמורות &copy; 1999-2008, לקבוצת הפיתוח של Enlightenment."
-"<br><br>אנו מקווים כי הינך נהנה להשתמש בתוכנה זו כמו שאנחנו נהנינו ליצור "
-"אותה.<br><br>תוכנה זו מסופקת כמו שהיא ללא אחריות מפורשת או מרומזת. תוכנה זו "
-"כפופה לתנאי רישוי, אנא עיין בקבצי הרשיון COPYING ו־COPYING-PLAIN המותקנים "
-"במערכת שלך.<br><br>Enlightenment נמצאת <hilight>בתהליכי פיתוח כבדים</"
-"hilight> והיא אינה יציבה. תכונות רבות אינן מושלמות או שאינן קיימות ומכילות "
-"תקלות רבות. ראה <hilight>אוזהרת!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -74,70 +69,70 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "האם אתה בטוח שברצונך לחסל חלון זה?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "כן"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "לא"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "ביקשת לצאת מ־Enlightenment.<br><br>האם אתה בטוח שברצונך לצאת?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "אתה בטוח שברצונך להתנתק?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "אתה עומד להתנתק.<br><br>האם אתה בטוח שברצונך לעשות זאת?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "האם אתה בטוח שברצונך לכבות?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "ביקשת לכבות את המחשב שלך.<br><br>האם אתה בטוח שברצונך לכבות?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "האם אתה בטוח שברצונך לאתחל?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "ביקשת לאתחל את המחשב שלך.<br><br>האם אתה בטוח שברצונך לאתחל אותו?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "ביקשת להשהות את המחשב שלך.<br><br>האם אתה בטוח שברצונך להשהות?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "האם אתה בטוח שברצונך לעבור למצב המתנה?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -145,539 +140,535 @@ msgstr ""
 "ביקשת להעביר את המחשב למצב המתנה.<br><br>האם אתה בטוח שברצונך להשהות אל "
 "הכונן?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "חלון : פעולות"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "העבר"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "שנה גודל"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "תפריט"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "תפריט החלון"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "הגבה"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "הנמך"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "חסל"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "חלון : מצב"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "החלפת מצב הדבקה"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "החלפת מצב ממוזער"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "החלפת מצב מסך מלא"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "הגדל"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "הגדל אנכית"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "הגדל אופקית"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "הגדל למסך מלא"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "מצב הגדלה \"חכם\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "מצב הגדלה \"הרחבה\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "מצב הגדלה \"מילוי\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "החלפת מצב הצללה"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "החלפת מצב הצללה תחתית"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "החלפת מצב הצללה שמאלית"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "החלפת מצב הצללה ימנית"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "החלפת מצב ההצללה"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "החלפת מצב המסגרת"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "החלפת מצב הנעיצה"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "שולחן העבודה"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "הפוך את שולחן העבודה שמאלה"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "הפוך את שולחן העבודה ימינה"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "הפוך את שולחן העבודה למעלה"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "הפוך את שולחן העבודה למטה"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "הפוך את שולחן העבודה ב־..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "הצג את שולחן העבודה"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr ""
+msgstr "הצג את המדף"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "הפוך את שולחן העבודה אל..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "הפוך את שולחן העבודה קווית..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "החלף לשולחן העבודה 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "החלף לשולחן העבודה 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "החלף לשולחן העבודה 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "החלף לשולחן העבודה 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "החלף לשולחן העבודה 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "החלף לשולחן העבודה 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "החלף לשולחן העבודה 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "החלף לשולחן העבודה 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "החלף לשולחן העבודה 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "החלף לשולחן העבודה 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "החלף לשולחן העבודה 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "החלף לשולחן העבודה 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "החלף לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "הפוך את שולחן העבודה שמאלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "הפוך את שולחן העבודה ימינה (כל המסכים)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "הפוך את שולחן העבודה למעלה (כל המסכים)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "הפוך את שולחן העבודה למטה (כל המסכים)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "הפוך את שולחן העבודה ב־... (כל המסכים)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "הפוך את שולחן העבודה אל... (כל המסכים)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "הפוך את שולחן העבודה קווית... (כל המסכים)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr ""
+msgstr "הפוך את כיוון שולחן העבודה..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "החלף לשולחן העבודה 0 (כל המסכים)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "החלף לשולחן העבודה 1 (כל המסכים)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "החלף לשולחן העבודה 2 (כל המסכים)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "החלף לשולחן העבודה 3 (כל המסכים)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "החלף לשולחן העבודה 4 (כל המסכים)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "החלף לשולחן העבודה 5 (כל המסכים)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "החלף לשולחן העבודה 6 (כל המסכים)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "החלף לשולחן העבודה 7 (כל המסכים)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "החלף לשולחן העבודה 8 (כל המסכים)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "החלף לשולחן העבודה 9 (כל המסכים)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "החלף לשולחן העבודה 10 (כל המסכים)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "החלף לשולחן העבודה 11 (כל המסכים)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "החלף לשולחן העבודה... (כל המסכים)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "מסך"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "שלח את העכבר למסך 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "שלח את העכבר למסך 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "שלח את העכבר למסך..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "שלח את העכבר מסך 1 קדימה"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "שלח את העכבר מסך 1 אחורה"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "שלח את העכבר קדימה/אחורה בין המסכים..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "חלון : בתנועה"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "לשולחן העבודה הבא"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "לשולחן העבודה הקודם"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "לפי מס' שולחן העבודה..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "לשולחן העבודה..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "הצג תפריט ראשי"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "הצג תפריט מועדפים"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "הצג תפריט כל היישומים"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "הצג תפריט לקוחות"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "הצג תפריט..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "הפעל"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "פקודה"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "יישום"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "הפעל מחדש"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "יציאה"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr ""
+msgstr "צא עכשיו"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "מודול ה־%s של Enlightenment"
+msgstr "Enlightenment : מצב"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "החלפת מצב מסך מלא"
+msgstr "החלפת מצב הצגה"
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "החלפת מצב ההצללה"
+msgstr "החלפת מצב בלתי מקוון"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "מערכת"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "התנתק"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
-msgstr ""
+msgstr "כבה עכשיו"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
-msgstr ""
+msgstr "כבה"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "הפעלה מחדש"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "השהיה"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
-msgstr ""
+msgstr "עבור למצב שינה"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr ""
+msgstr "נעל"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "ניקוי החלונות"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "כללי : פעולות"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "פעולה מעוכבת"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "הגדרה כרקע"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "סריקת קבצי שולחן העבודה הושלמה"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "סריקת קבצי שולחן העבודה"
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
-msgstr ""
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "בוחר צבע"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "אישור"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -688,7 +679,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -697,11 +688,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "ההגדרות שודרגו"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -712,7 +703,7 @@ msgstr ""
 "את<br>מקור השגיאה.<br><br>הקובץ בו ארעה השגיאה הינו:<br>%s<br><br>קובץ זה "
 "נמחק מחשש לנתונים פגומים.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -722,7 +713,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -731,7 +722,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -740,7 +731,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -748,11 +739,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "בעיות בכתיבה להגדרות Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -760,12 +751,12 @@ msgstr "בעיות בכתיבה להגדרות Enlightenment"
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "בסיסי"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "החל"
 
@@ -773,7 +764,7 @@ msgstr "החל"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "מודולים"
 
@@ -782,26 +773,26 @@ msgstr "מודולים"
 msgid "Extensions"
 msgstr "הרחבות"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "מיכל %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "שגיאה - אין תמיכה ב־PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "לא הוטמעה תמיכת PAM ב־Enlightenment, לכן<br>נעילת שולחן העבודה אינה פעילה."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "הנעילה נכשלה"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -809,15 +800,15 @@ msgstr ""
 "נעילת שולחן העבודה נכשלה כיוון שאחד היישומים<br>לכד את המקלדת או העכבר או את "
 "שניהם<br>ולא ניתן לשחרר את לכידתם."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "נא הזינו את סיסמת השיחרור"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "שגיאה במערכת האימות"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -828,22 +819,22 @@ msgstr ""
 "<hilight>%i</hilight>.<br>מצב זה הינו בעייתי ולא אמור לקרות. אנא דווחו על "
 "תקלה זו."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "הפעל מצב מצגת?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -864,7 +855,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "עורך רשומות שולחן העבודה"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -909,7 +900,7 @@ msgstr "קטגוריות"
 msgid "Mime Types"
 msgstr "טיפוסי MIME"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "אפשרויות"
 
@@ -941,23 +932,23 @@ msgstr "בחר סמל"
 msgid "Select an Executable"
 msgstr "בחר קובץהפעלה"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "מחק"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "גזור"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "העתק"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "הדבק"
 
@@ -965,24 +956,24 @@ msgstr "הדבק"
 msgid "Select All"
 msgstr "בחר הכול"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "שגיאת הפעלה"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "שגיאה בהפעלת היישום"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -991,314 +982,307 @@ msgstr ""
 "Enlightenment לא הצליחה להפעיל את היישום:<br><br>%s<br><br>הפעלת היישום "
 "נכשלה."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "שגיאה בהפעלת היישום"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "פעולת %s נעצרה באופן בלתי צפוי."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "נתקבל קוד היציאה %i מ־%s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות הפרעה."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות יציאה."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות ביטול."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת נקודת ציפה."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול ללא־פסק."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "התרחשה הפרעה ליישום %s על ידי כשל קיטוע."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "התרחשה הפרעה ליישום %s על ידי מחרוזת קטועה."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות חיסול."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "התרחשה הפרעה ליישום %s על ידי שגיאת אפיק."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "התרחשה הפרעה ליישום %s על ידי אות מספר %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***שאר הפלט נקטע. שמור את הפלט כדי להציג את השאר.****\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "יומני שגיאות"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "אין הודעת שגיאה"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "שמור הודעה זו"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "יומן שגיאות זה יישמר כ־%s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "נתוני השגיאה"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "נתוני אות השגיאה"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "נתוני הפלט"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "אין פלט."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "נתיב לא קיים"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s לא קיים."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "שגיאת הפעלה"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "שגיאת הפעלה"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "שגיאה"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i קבצים"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "בטל"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "מצב תצוגה"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "רענן תצוגה"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "הצג קבצים מוסתרים"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "זכור את הסדר"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "סדר כעת"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "תיקייה חדשה"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "אודות"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "השתמש בברירת המחדל"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "רשת סמלים"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "סמלים מותאמים אישית"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "רשימה"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "גודל הסמל (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "הגדרה כרקע"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "תכני המדף"
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "יצירת תיקייה חדשה"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "שם התיקייה החדשה:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "שנה את שמה של %s ל־:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "שנה את שם הקובץ"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "נסה שוב"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "לא להכול"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "כן להכול"
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "מתחיל"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "האם אתה בטוח שברצונך למחוק את<br><hilight>%s</hilight> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "התעלם מזה"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "התעלם מהכול"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "ארעה שגיאה בעת ביצוע פעולה.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "אישור מחיקה"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "האם אתה בטוח שברצונך למחוק את<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1311,144 +1295,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "מאפייני הקובץ"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "קובץ:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "גודל:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "שונה לאחרונה:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "סוג הקובץ:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "בעלים:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "אחרים יכולים לקרוא"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "אחרים יכולים לכתוב"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "הבעלים יכולים לקרוא"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "הבעלים יכולים לכתוב"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "תמונה ממוזערת"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "השתמש בסמל זה עבור כל הקבצים מסוג זה"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "נתוני הקישור"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "בחר תמונה"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu ט\"ב"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu ג\"ב"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu מ\"ב"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu ק\"ב"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu ב'"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "נפח לא ידוע"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "התקן נתיק"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "פשוט"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "צמצום"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "חזות"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "גלול את התוכן אוטומטית"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "בעל גודל הניתן לשינוי"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "התחל בהזזת/שינוי הגודל של חפיץ זה"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "הסר חפיץ זה"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "הפסקת הזזת/שינוי הגודל של חפיץ זה"
 
@@ -1460,7 +1448,7 @@ msgstr ""
 "מופע קודם של Enlightenment עודנו פעיל\n"
 "במסך זה. ההפעלה מבוטלת.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "נעילות חלון"
 
@@ -1494,21 +1482,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "איסוף בערימה"
 
@@ -1517,12 +1505,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "מצב הצללה"
 
@@ -1531,7 +1519,7 @@ msgid "Maximized state"
 msgstr "מצב מוגדל"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "מצב מסך מלא"
 
@@ -1539,7 +1527,7 @@ msgstr "מצב מסך מלא"
 msgid "Lock me from changing:"
 msgstr "מנע ממני מלשנות את:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "סגנון המסגרת"
 
@@ -1587,115 +1575,116 @@ msgstr "הסר משולחן העבודה"
 msgid "More..."
 msgstr "עוד...‏"
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "מזער לסמל"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "הגדל למירביות האנכית"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "הגדל למירביות האופקית"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "ביטול ההגדלה"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "קיצורי מקשים"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "לתפריט המועדפים"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "למשגר"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "מסגרת"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "דלג"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "מצב"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "שמור"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "מאפייני החלון"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "תמיד עליון"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "רגיל"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "תמיד מעבר"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "בחר בסגנון המסגרת"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "השתמש בהעדפת הסמל כברירת המחדל של E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "השתמש בסמל שסופק על ידי היישום "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "השתמש בסמל שהוגדר על ידי המשתמש"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "מוצלל"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "דביק"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "מסך מלא"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "רשימת חלונות"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "מחליף סביבות עבודה"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "שורת המשימות"
 
@@ -1711,7 +1700,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "מאפייני ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "כותרת"
 
@@ -1803,11 +1792,11 @@ msgstr "מאפייני NetWM"
 msgid "Modal"
 msgstr "מודלי"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "דלג על שורת המשימות"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "דלג על בוחר החלונות"
 
@@ -1815,15 +1804,15 @@ msgstr "דלג על בוחר החלונות"
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "זכירת חלון"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "מאפייני החלון אינם התאמה ייחודית"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1837,11 +1826,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "לא הוגדרו מאפיינים תואמים"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1849,102 +1838,101 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "כלום"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "גודל ומיקום"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "נעילות"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "גודל, מיקומים ונעילות"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "הכל"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "זכור באמצעות"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "שם החלון והמחלקה"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "תפקיד החלון"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "סוג החלון"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "ארעיות"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "מאפיינים לתזכורת"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "מאפייני הסמל"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "שולחן עבודה וירטואלי"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "המסך הנוכחי"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "דילוג על רשימת החלונות"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "התאמת חלון אחד בלבד"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "הפעלת תוכנית זו עם הכניסה"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "תמיד התמקד בהפעלה"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "הפעלת תוכנית זו עם הכניסה"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "הגדרות"
@@ -1963,24 +1951,24 @@ msgstr "מדף"
 msgid "Module Settings"
 msgstr "הגדרות המודול"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "מודולים זמינים"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "טען מודול"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "מודולים שנטענו"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "פריקת מודול"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2014,8 +2002,8 @@ msgstr "הסרת יישומון"
 msgid "Toolbar Settings"
 msgstr "הגדרות סרגלי הכלים"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "פריסה"
 
@@ -2039,12 +2027,12 @@ msgid "Favorite Applications"
 msgstr "יישומים מועדפים"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "יישומים"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2053,7 +2041,7 @@ msgstr "יישומים"
 msgid "Windows"
 msgstr "חלונות"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "חלונות שאבדו"
 
@@ -2079,141 +2067,138 @@ msgstr "מדפים"
 
 #: src/bin/e_int_menus.c:278
 msgid "Show/Hide All Windows"
-msgstr "הצגת/הסתרת על החלונות"
+msgstr "הצגת/הסתרת כל החלונות"
 
 #: src/bin/e_int_menus.c:575
 msgid "(No Applications)"
 msgstr "(אין יישומים)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "שולחן עבודה וירטואלי"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(אין חלונות)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "אין שם!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(אין מדפים)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "מדף מס'"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "הוסף מדף"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "מחק מדף"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "הגדרות מדף"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "זעיר"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "קטן"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "בינוני"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "גדול"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "ענק"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "תכני המדף"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "מעל להכל"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "מתחת לחלונות"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "מתחת להכל"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "אפשר לחלונות לחפוף מעל למדף"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "צמצמם לגודל התוכן"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f פיקסלים"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "סגנונות"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "הסתר אוטומטית"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "הסתר את המדף אוטומטית"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "הצג עם כניסת העכבר"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "הצג עם לחיצת העכבר"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "משך הזמן עד להסתרה"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f שניות"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "מסך ההסתרה"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "הצג על כל שולחנות העבודה"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "הצג בשולחנות עבודה מסויימים"
 
@@ -2422,7 +2407,7 @@ msgstr "הפעלת התמיכה בבינאום"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הבינאום שלה."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2430,11 +2415,11 @@ msgstr ""
 "Enlightenment לא הצליחה להגדיר את מסך הפתיחה שלה.\n"
 "יתכן שהזכרון אזל?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "בדיקת התמיכה בעיצוב."
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2442,7 +2427,7 @@ msgstr ""
 "Enlightenment מצאה כי Evas לא מצליח ליצור משטח עבודה לחוצץ. אנא בדוק\n"
 "את התמיכה של Evas במנוע חוצץ תוכנתי.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2450,7 +2435,7 @@ msgstr ""
 "Enlightenment מצאה כי Evas לא מצליח לטעון קבצי PNG. בדוק כי ל־Evas\n"
 "ישנה תמיכה בטעינת קבצי PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2458,7 +2443,7 @@ msgstr ""
 "Enlightenment מצאה כי Evas לא מצליח לטעון קבצי JPEG. בדוק כי ל־Evas\n"
 "ישנה תמיכה בטעינת קבצי JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2466,7 +2451,7 @@ msgstr ""
 "Enlightenment מצאה כי Evas לא מצליח לטעון קבצי EET. בדוק כי ל־Evas\n"
 "ישנה תמיכה בטעינת קבצי EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2475,11 +2460,11 @@ msgstr ""
 "Enlightenment מצאה כי Evas לא מצליח לטעון הגופן 'Sans'. בדוק כי ל־Evas\n"
 "ישנה תמיכה ב־fontconfig ושמערכת ה־fontconfig מגדירה את הגופן 'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "הגדרת מסכים"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2487,192 +2472,191 @@ msgstr ""
 "הנסיון של Enlightenment להגדיר את ניהול החלונות עבור כל המסכים שבמערכת שלך\n"
 "נכשל. יתכן שישנו מנהל חלונות אחר פעיל?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "הגדרת שומר המסך"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment לא הצליחה להגדיר את שומר המסך של X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "הגדרת נעילת המסך"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת נעילת המסך שלה."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "הגדרת נתיבים"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "הגדרת פקדי מערכת"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת פיקוד המערכת.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "הגדרת פעולות"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הפעולות שלה."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "הגדרת מערכת הרצת הקבצים"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ה־exec שלה."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "הגדרת זכרונות"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment לא הצליחה להגדיר את הגדרות הזכרון."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "הגדרת מנהל הקבצים"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מנהל הקבצים.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "הגדרת מערכת ההודעות"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment לא הצליחה לטעון את מערכת ההודעות שלה."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "הגדרת DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת ה־dnd שלה."
 
-#: src/bin/e_main.c:869
-#, fuzzy
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr "הגדרת הטיפול בקלט הגרירה"
+msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת הטיפול בקלט הגרירה."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "הגדרת מודולים"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת המודולים שלה."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "הגדרת זכרונות"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment לא הצליחה להגדיר את הגדרות הזכרון."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "הגדרת מחלקות צבע."
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת מחלקות הצבע שלה."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "הגדרת בקרת היישומונים"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת בקרת היישומונים שלה."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "הגדרת DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment לא הצליחה להגדיר את תצורת ה־DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "הגדרת מצבי חסכון בחשמל"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment לא הצליחה להגדיר את מצבי החסכון בחשמל שלה."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "הגדרת רקע שולחן העבודה"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת הרקע לשולחן העבודה שלה."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "הגדרת העכבר"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment לא הצליחה להגדיר את תצורת העכבר."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "הגדרת איגודים"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת האיגודים שלה."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "הגדרת חלוניות התרעה"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת חלוניות ההתרעה שלה."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "הגדרת מדפים"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת המדפים שלה."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "הגדרת ממזער התמונות"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment לא הצליחה להפעיל את מערכת מיזעור התמונות.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "הגדרת סידור הקבצים"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment לא הצליחה להגדיר את מערכת סידור הקבצים שלה."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "טעינת מודולים"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2683,11 +2667,11 @@ msgstr ""
 "בוטלו<br>והם לא יטענו כדי לסייע בהסרת מודולים בעיתיים<br>כלשהם מהתצורה שלך. "
 "חלונית<br>תצורת המודולים אמורה לאפשר לך לבחור<br>במודולים שלך שוב."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment קרסה מוקדם עם ההפעלה והופעלה מחדש"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2698,15 +2682,15 @@ msgstr ""
 "יטענו כדי<br>לסייע בהסרת מודולים בעיתיים כלשהם מהתצורה שלך.<br><br>חלונית "
 "תצורת המודולים אמורה לאפשר לך לבחור<br>במודולים שלך שוב."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "הגדרת מדפים"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "כמעט בוצע"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2715,11 +2699,11 @@ msgstr ""
 "ארעה שגיאה בטעינת המודול בשם: %s<br>לא נמצא מודל בשם %s<br>בתיקיות חיפוש "
 "המודולים.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "שגיאה בטעינת מודול"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2728,11 +2712,11 @@ msgstr ""
 "ארעה שגיאה בטעינת מודול בשם: %s<br>הנתיב המלא למודול זה הינו:<br>%"
 "s<br>השגיאה שדווחה הינה:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "המודול אינו מכיל את כל הפונקציות הנחוצות"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2743,12 +2727,12 @@ msgstr ""
 "צריכה להיות לפחות: %i.<br>מודול ה־API המפורסם על ידי Enlightenment הינו: %i."
 "<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "מודול ה־%s של Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "האם ברצונך לפרוק מודול זה?<br>"
 
@@ -2759,30 +2743,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "האם אתה בטוח שברצונך למחוק מדף זה?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "ביקשת למחוק מדף זה.<br><br>האם אתה בטוח שברצונך למחוק אותו?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "הפסקת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "התחלת הזזה/שינוי גודל לפריטים"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "תכני המדף"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "מחיקת מדף זה"
 
@@ -2799,11 +2782,11 @@ msgstr "בדיקת הרשאות המערכת"
 msgid "System Check Done"
 msgstr "בדיקת המערכת הושלמה"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "בעיות ניתוק"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2812,109 +2795,109 @@ msgstr ""
 "הניתוק אורך זמן רב מדי. כמה<br>מהיישומים מסרבים להסגר.<br>האם ברצונך לסיים "
 "את תהליך הניתוק<br>בכל זאת מבלי לסגור<br>יישומים אלו תחילה?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "התנתק כעת"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "המשך בהמתנה"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "ביטול הניתוק"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "הניתוק מתבצע כעת"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment עסוקה בטיפול בבקשה אחרת."
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "לעזאזל! זה לא אמור לקרות"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "לקראת השהייה"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "לקראת תרדמת"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2927,15 +2910,14 @@ msgid "Set As Theme"
 msgstr "הגדרה כערכת נושא"
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "תכני סרגל הכלים"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "לא ניתן לצאת - חלונות חסיני חיסול."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -2944,77 +2926,77 @@ msgstr ""
 "לכמה מהחלונות נותרה נעילת משך החיים. כלומר<br>ש־Enlightenment לא תרשה לעצמה "
 "לצאת עד שחלונות אלו<br>יסגרו או שתוסר נעילת משך החיים.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f בתים"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f ק\"ב"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f מ\"ב"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f ג\"ב"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "בעתיד"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "בדקה האחרונה"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "לפני %li שנים"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "לפני %li חודשים"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "לפני %li שבועות"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "לפני %li ימים"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "לפני %li שעות"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "לפני %li דקות"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3034,51 +3016,51 @@ msgstr "למעלה"
 msgid "Down"
 msgstr "למטה"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "הוסף למועדפים"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "עלה לתיקיית המבוא"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "הרשאות:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "שונה:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "אתה"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "מוגן"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "לקריאה בלבד"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "אסור"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "קריאה־כתיבה"
 
@@ -3094,57 +3076,57 @@ msgstr "הגדרות בסיסיות"
 msgid "Show alert when battery is low"
 msgstr "הצג התרעה כאשר הסוללה חלשה"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3152,12 +3134,12 @@ msgstr ""
 msgid "Internal"
 msgstr "פנימי"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3165,24 +3147,24 @@ msgstr ""
 msgid "Battery"
 msgstr "סוללה"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "הסוללה שלך חלשה!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "מומלץ לחבר לרשת החשמל."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "לא זמין"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "שגיאה"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "מד הסוללה"
 
@@ -3190,24 +3172,22 @@ msgstr "מד הסוללה"
 msgid "Clock"
 msgstr "שעון"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "פאנל ההגדרות"
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "מיקום"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "מודולים"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3231,7 +3211,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "כל היישומים"
 
@@ -3253,12 +3233,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "תפריטים"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "סגנון המסגרת כברירת המחדל"
 
@@ -3266,14 +3246,14 @@ msgstr "סגנון המסגרת כברירת המחדל"
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3299,7 +3279,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3393,9 +3373,8 @@ msgid "Border Title"
 msgstr "כותרת המסגרת"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "כותרת תיבת האודות"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3568,9 +3547,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
@@ -3636,10 +3615,10 @@ msgstr "%1.0f דקות"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr ""
@@ -3671,8 +3650,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3692,9 +3671,8 @@ msgid "Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "הגדרת רקע שולחן העבודה"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3794,46 +3772,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -3889,31 +3872,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3922,11 +3905,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3981,7 +3964,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3991,102 +3974,107 @@ msgstr ""
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4261,9 +4249,8 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "פאנל ההגדרות"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4382,18 +4369,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4401,37 +4387,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4446,7 +4444,7 @@ msgstr ""
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr ""
 
@@ -4514,7 +4512,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr ""
 
@@ -4684,7 +4682,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr ""
 
@@ -4860,24 +4858,24 @@ msgstr ""
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4894,7 +4892,7 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr ""
 
@@ -4994,33 +4992,33 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5084,9 +5082,8 @@ msgid "%1.2f times"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "מיכל %d"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
@@ -5157,9 +5154,8 @@ msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "הגדרת מנהל הקבצים"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5185,23 +5181,23 @@ msgstr ""
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5254,38 +5250,38 @@ msgid "Wallpaper Settings"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5306,14 +5302,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr ""
 
@@ -5378,40 +5374,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5523,14 +5519,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr ""
@@ -5663,17 +5651,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr ""
 
@@ -5681,19 +5664,19 @@ msgstr ""
 msgid "Maximize Policy"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5732,49 +5715,57 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6085,9 +6076,8 @@ msgid "Icon Size"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "מצב תצוגה"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6098,9 +6088,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "הגודל הבסיסי"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6127,7 +6116,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6143,97 +6132,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "הוסף יישום..."
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "יישומים"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "מחק"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6241,14 +6228,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "נתוני הקישור"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "קובץ:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6260,17 +6246,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "מסך ההסתרה"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "מנהל הקבצים"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6308,19 +6293,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6357,7 +6342,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -6416,43 +6401,43 @@ msgstr ""
 msgid "Add Application"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -6472,11 +6457,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6484,108 +6469,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6709,7 +6694,7 @@ msgstr ""
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr ""
 
@@ -6721,15 +6706,15 @@ msgstr ""
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6776,15 +6761,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6906,22 +6891,20 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "מערכת"
+msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "קובץ:"
+#~ msgid "Window name and class"
+#~ msgstr "שם החלון והמחלקה"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "הגדר שולחנות עבודה וירטואליים"
diff --git a/po/hr.gmo b/po/hr.gmo
index a32f6d5..600fcc0 100644
Binary files a/po/hr.gmo and b/po/hr.gmo differ
diff --git a/po/hr.po b/po/hr.po
index cc176a4..f4877d6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,40 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-04-08 01:16+0000\n"
-"Last-Translator: Miro Glavic <glavicmiro at gmail.com>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-09 18:07+0000\n"
+"Last-Translator: Miro Glavić <glavicmiro at gmail.com>\n"
 "Language-Team: Croatian <hr at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -48,7 +50,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 ""
-"Sva prava pridržana; 1999-2008, Enlightenment Razvojni Tim.<br><br>Nadamo se "
+"Sva prava pridržana; 1999-2009, Enlightenment Razvojni Tim.<br><br>Nadamo se "
 "da uživate koristeći ovaj program isto toliko koliko smo mi uživali praveći "
 "ga.<br><br>Ovaj softver je ponuđen bez ikakvih izričitih ili podrazumjevanih "
 "garancija. Ovaj softver je reguliran licencnim uvjetima, molimo pogledajte "
@@ -76,46 +78,46 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Jeste li sigurni da želite zatvoriti ovaj prozor?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Jeste li sigurni da želite izaći?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Tražili ste da napustite Enlightenment.<br><br>Jeste li sigurni da želite "
 "izaći?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Jeste li sigurni da se želite odjaviti?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Vi se odjavljujete.<br><br>Jeste li sigurni da hoćete da se odjavite?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Jeste li sigurni da želite ugasiti?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -123,11 +125,11 @@ msgstr ""
 "Tražili ste da ugasite vaše Računalo.<br><br>Jeste li sigurni da želite "
 "ugasiti?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Jeste l isigurni da hoćete da ponovno podignete sustav?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -135,7 +137,7 @@ msgstr ""
 "Zahtijevate da ponovno podignete vaše Računalo.<br><br>Jeste li sigurni da "
 "hoćete da restartujete?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -143,11 +145,11 @@ msgstr ""
 "Zatražili ste da suspendirate svoje Računalo.<br><br>Jeste li sigurni da "
 "želite suspendirati?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Jeste li sigurni da želite hibernirati?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -155,497 +157,494 @@ msgstr ""
 "Zatražili ste da hibernirate svoje Računalo.<br><br>Jeste li sigurni da "
 "želite hibernirati?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Prozor: Akcije"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Premjesti"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Promijeni veličinu"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Izbornik"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Prozorni Izbornik"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Uzdigni"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Spusti"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Zatvori"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Prozor: Stanje"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Preklopnik Ljepljivog Moda"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Preklopnik Ikoniziranog Moda"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Preklopnik Moda Cijelog Zaslona"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksimiziraj"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maksimiziraj Vertikalno"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maksimiziraj horizontalno"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maksimiziraj Cijeli Ekran"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimiziraj \"Pametan\" Mod"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maksimiziraj Mod \"Proširiti\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maksimiziraj Mod \"Popuni\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Preklopnik Moda Gornje Sjenke"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Preklopnik Moda Donje Sjenke"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Preklopnik Moda Lijeve Sjenke"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Preklopnik Moda Desne Sjenke"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Preklopnik Moda Sjenke"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Preklopnik Bezrubnog Stanja"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Preklopnik Pribodenog Stanja"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Radna površina"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Okreni Radnu Površinu Lijevo"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Okreni Radnu Površinu Desno"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Okreni Radnu Površinu Gore"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Okreni Radnu Površinu Dolje"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Okreni Radnu Površinu Za..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Prikaži Radnu Površinu"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Prikaži Policu"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Okreni Radnu Površinu Na..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Okreni Radnu Površinu Linearno"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Prebaci na Radnu Površinu 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Prebaci na Radnu Površinu 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Prebaci na Radnu Površinu 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Prebaci na Radnu Površinu 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Prebaci na Radnu Površinu 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Prebaci na Radnu Površinu 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Prebaci na Radnu Površinu 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Prebaci na Radnu Površinu 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Prebaci na Radnu Površinu 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Prebaci na Radnu Površinu 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Prebaci na Radnu Površinu 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Prebaci na Radnu Površinu 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Prebaci na Radnu Površinu..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Okreni Radnu Površinu Lijevo (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Okreni Radnu Površinu Desno (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Okreni Radnu Površinu Gore (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Okreni Radnu Površinu Dolje (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Okreni Radnu Površinu Za... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Okreni Radnu Površinu Na... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Okreni Radnu Površinu Linearno... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Preokreni Radnu Površinu U Smjeru..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 0 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 1 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 2 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 3 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 4 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 5 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 6 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 7 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 8 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 9 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 10 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Prebaci Na Radnu Površinu 11 (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Prebaci Na Radnu Površinu... (Svi Zasloni)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Zaslon"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Pošalji Miša Na Zaslon 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Pošalji Miša Na Zaslon 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Pošalji Miša Na Zaslon..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Pošalji Miša Naprijed 1 Zaslon"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Pošalji Miša Nazad 1 Zaslon"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Pošalji Miša Napred/Natrag na Ekrane..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Prozor: Pomjeranje"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Na Slijedeću Radnu Površinu"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Na Prethodnu Radnu Površinu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Po Radnoj Površini #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Na Radnu Površinu..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Prikaži Glavni Izbornik"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Prikaži Omiljeni Izbornik"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Prikaži Izbornik Svih Aplikacija"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Prikaži Izbornik Klijenata"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Prikaži Izbornik..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Pokreni"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Naredba"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplikacija"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Ponovo pokreni"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Izlaz"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Izađi Odmah"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s Modul"
+msgstr "Enlightenment : Mod"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Preklopnik Moda Cijelog Zaslona"
+msgstr "Mijenjaj Način Prezentacije"
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Preklopnik Moda Sjenke"
+msgstr "Mijenjaj Način Isključenja"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sustav"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Odjava"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Ugasi Odmah"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Ugasi"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Ponovno podigni sustav"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Suspendiraj"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernirati"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Zaključaj"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Očisti Prozore"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Uopćeno : Akcije"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Odgođena Akcija"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Postavi Kao Pozadinu"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Skeniranje datoteka radne površine je gotovo"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Skeniranje datoteka radne površine"
 
@@ -653,41 +652,40 @@ msgstr "Skeniranje datoteka radne površine"
 msgid "Color Selector"
 msgstr "Odabirač Boja"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "U redu"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Poništi"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -706,7 +704,7 @@ msgstr ""
 "rekonfigurirati  stvari<br>po vašoj želji. Izvinjavamo se zbog problema sa "
 "vašim postavkama.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -720,11 +718,11 @@ msgstr ""
 "i radi predostrožnosti vaše postavke su vraćene u<br>originalno stanje. "
 "Izvinjavamo se zbog neugodnosti.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Postavke Unaprijeđene"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -736,7 +734,7 @@ msgstr ""
 "<br>%s<br><br>Ova datoteka je uklonjena da bi se izbjegla korupcija podataka."
 "<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -751,7 +749,7 @@ msgstr ""
 "direktorija.<br><br>Datoteka kod koje je greška otkrivena:<br>%s<br><br>je "
 "uklonjena da bi se izbjegla korupcija podataka.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -764,7 +762,7 @@ msgstr ""
 "zamijeniti.<br>Datoteka kod koje je greška otkrivena: <br>%s<br><br>je "
 "uklonjena da bi se izbjegla korupcija podataka.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -777,7 +775,7 @@ msgstr ""
 "ste pebacili svoj limit.<br><br>Datoteka kod koje je greška otkrivena:<br>%"
 "s<br><br>je uklonjena da bi se izbjegla korupcija podataka.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -789,11 +787,11 @@ msgstr ""
 "otkrivena:<br>%s<br><br>je uklonjena da bi se izbjegla korupcija podataka."
 "<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemi Pisanja Enlightenment Postavki"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -801,12 +799,12 @@ msgstr "Problemi Pisanja Enlightenment Postavki"
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Primijeni"
 
@@ -814,7 +812,7 @@ msgstr "Primijeni"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduli"
 
@@ -823,27 +821,27 @@ msgstr "Moduli"
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Kontejner %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Greška - bez PAM podrške"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Podrška za PAM nije ugrađena u Enlightenment, što je onemogućilo "
 "zaključavanje radne površine."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Neuspjelo Zaključavanje"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -851,15 +849,15 @@ msgstr ""
 "Zaključavanje radne površine je neuspjelo jer je neka aplikacija<br>zgrabila "
 "ili tipkovnicu ili miša ili oboje i ovoga se nije moguće riješiti."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Molimo unesite vašu lozinku za otključavanje"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Greška Sistema Autorizacije"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -870,24 +868,27 @@ msgstr ""
 "greške je<hilight>%i</hilight>.<br>Ovo je loše i se nije smjelo dogoditi. "
 "Molimo prijavite ovaj problem."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Aktiviraj Način Prezentiranja"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Vi ste prebrzo otključali radnu površinu.<br><br>Hoćete li osposobiti način "
+"</b>prezentiranja</b> i privremeno onesposobiti zaštitnika zaslona, bravu  i "
+"uštedu energije?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Ne, ali povećaj vrijeme neaktivnosti"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Ne, i prestani pitati"
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
@@ -911,7 +912,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Urednik Unosa u Radnu Površinu"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -956,7 +957,7 @@ msgstr "Kategorije"
 msgid "Mime Types"
 msgstr "Mime tipovi"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opcije"
 
@@ -988,23 +989,23 @@ msgstr "Odaberi Ikonu"
 msgid "Select an Executable"
 msgstr "Odaberi Izvršni"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Zalijepi"
 
@@ -1012,24 +1013,24 @@ msgstr "Zalijepi"
 msgid "Select All"
 msgstr "Odaberi sve"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Greška kod Izvođenja"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nije mogao razdvojiti nemoćan proces:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Greška izvođenja aplikacije"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1038,313 +1039,307 @@ msgstr ""
 "Enlightenment nije u mogućnosti da izvede aplikaciju:<br><br>%"
 "s<br><br>Neuspješan start aplikacije."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Greška Izvršenja Aplikacije"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s je neočekivano zaustavio izvođenje"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Izlazni kod %i je vraćen iz %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je prekinut Interrupt Signalom"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je prekinut Quit Signalom"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je prekinut Abort Signalom"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s je prekinut Floating Point Greškom"
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s je prekinut Uninterruptable Kill Signalom"
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s je prekinut Segmentation Greškom"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s je prekinut od Slomljene Cijevi"
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je prekinut Termination Signalom"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s je prekinut Bus Greškom"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s je prekinut signalom broj %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Preostali izlaz je okrnjen. Pohrani izlaz u pogled.***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Pogrešni Logovi"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Nema poruke o grešci."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Pohrani Ovu Poruku"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Zapis ove greške će biti pohranjen kao %s/%s. zapis"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informacije o Grešci"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informacije o Signalu Greške"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Izlazni Podaci"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Nije bilo izlaza."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Nepostojeći put"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s ne postoji."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Greška kod montiranja"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Nemoguće montirati uređaj"
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Greška kod montiranja"
+msgstr "Greška kod demontiranja"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Nemoguće demontirati uređaj"
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Greška"
+msgstr "Greška kod izbacivanja"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "Nemoguće izbaciti uređaj"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Datoteke"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Odustani"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Preuzmi izvorne postavke"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Pregled"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Osvježi Pogled"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Prikaži Skrivene Datoteke"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Zapamti Redoslijed"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Sortiraj Sada"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Novi Direktorij"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "Demontiraj"
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Bezvučan"
+msgstr "Monitraj"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
-msgstr ""
+msgstr "Izbaci"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Svojstva"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Upotrijebi zadane vrijednosti"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Mrežne Ikone"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Posebne Ikone"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Veličinia Ikone (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Postavi Kao Pozadinu"
+msgstr "Postavi pozadinu..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr ""
+msgstr "Postavi oblogu..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Očisti"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Kreiraj"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Naziv Novog Direktorija:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj %s na:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Preimenuj Datoteku"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Ponovi"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Greška"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Ne za sve"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Da za sve"
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Početak"
+msgstr "Upozorenje"
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Jeste li sigurni da želite obrisati<br><hilight>%s</hilight> ?"
+msgstr "Datoteka već postoji, prepiši preko?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignoriraj ovo"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignoriraj sve"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Pojavila se greška u izvođenju radnje<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Potvrda Brisanja"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Jeste li sigurni da želite obrisati<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1357,144 +1352,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Svojstva datoteke"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Veličina:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Zadnja Promjena:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Vrsta Datoteke:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Dozvole"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Vlasnik:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Ostali mogu čitati"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Ostali mogu pisati"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Vlasnik može čitati"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Vlasnik može pisati"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Pregled"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Zadano"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Sličica"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Prilagođeni"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Upotrijebi ovu ikonu za sve datoteke ovog tipa"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Infomacije o linku"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Odaberi Sliku"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Nepoznata Jačina"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Odstranjiv Uređaj"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Makni ovu spravicu u"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Običan"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Umetak"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Izgled"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Automatski listaj sadržaj"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Moguće promijeniti veličinu"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Počni pomakni/promjeni veličinu ovog aparata"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Ukloni ovaj aparat"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Zaustavi pomjeranje/promjenu veličine ovog aparata"
 
@@ -1504,7 +1503,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr "Prethodna Enlightenment instanca je još uvijek aktivna.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Prozorske Brave"
 
@@ -1538,21 +1537,21 @@ msgid "Lock program changing:"
 msgstr "Promjena programa zaključavanja"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Veličina"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Slaganje"
 
@@ -1561,12 +1560,12 @@ msgid "Iconified state"
 msgstr "Stanje Ikoniziranja"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Ljepljivost"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Sjenčeno stanje"
 
@@ -1575,7 +1574,7 @@ msgid "Maximized state"
 msgstr "Maksimizirano stanje"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Stanje cijelog ekrna"
 
@@ -1583,7 +1582,7 @@ msgstr "Stanje cijelog ekrna"
 msgid "Lock me from changing:"
 msgstr "Zaključaj me kod promjena:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Vrsta Bordure"
 
@@ -1631,115 +1630,116 @@ msgstr "Skini sa Radne Površine"
 msgid "More..."
 msgstr "Više..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Ikonizirati"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maksimiziraj vertikalno"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maksimiziraj horizontalno"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Odmaksimiziraj"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Tipkovnička Prečica"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Do Omiljenog Izbornika"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Ka Pokretaču"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Bordura"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Preskoči"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Stanje"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Zapamti"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Svojstva Prozora"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Uvijek na vrhu"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Uvijek Ispod"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Odaberi Vrstu Bordure"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Upotrijebi E17 Standardne Postavke Ikone"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Upotrijebi Ikonu Snabdjevenu Aplikacijom "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Upotrijebi Ikonu Definiranu od Korisnika"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Sjenčeno"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Ljepljivo"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Cijeli ekran"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista Prozora"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Preglednik"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Taskbar"
 
@@ -1755,7 +1755,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Svojstva"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Naslov"
 
@@ -1847,11 +1847,11 @@ msgstr "NetWM Svojstva"
 msgid "Modal"
 msgstr "Modalni"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Preskoči Alatnu Traku"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Izostavi Preglednika"
 
@@ -1859,15 +1859,15 @@ msgstr "Izostavi Preglednika"
 msgid "Hidden"
 msgstr "Skriven"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Zapamti Prozor"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Svojstva prozora nemaju jedinstvenu podudarnost"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1891,11 +1891,11 @@ msgstr ""
 "postavke će biti prihvaćene. Pritisnite <hilight>Poništi</hilight> "
 "ako<br>niste sigurni, bez ikakvih promjena."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Podudarna svojstva nisu postavljena"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1907,115 +1907,101 @@ msgstr ""
 "specificiranja kako da to zapamti</hilight>.<br><br>Morate specificirati "
 "barem 1 način kako zapamtiti ovaj prozor."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Vi pokušavate zatražiti da Enlightenment zapamti primijeniti<br>svojstva "
-"(kao veličinu, lokaciju, vrstu obruba itd) na<br>prozor koji <hilight>nema "
-"jedinstvena svojstva</hilight>.<br><br>Ovo znači da dijeli Ime/Klasu, "
-"Prolaznost, Ulogu i druga svojstva<br>sa ostalim prozorima na zaslonu i da "
-"bi primjena zapamćenih<br>svojstava ovog prozora bila primjenjena na sve "
-"ostale prozore<br>koji imaju slična svojstva.<br><br>Možda želite osposobiti "
-"<hilight>Uskladi samo jedan prozor</hilight> opciju<br> ako ste namjeravali "
-"promijeniti samo jednu instancu ovog prozora, sa <br>dodatnim instancama "
-"nepromijenjenim.<br><br>Ovo je samo upozorenje u slučaju da ovo niste "
-"namjeravali uraditi.<br>Ako jeste, pritisnite <hilight>Primijeni</hilight> "
-"ili <hilight>U redu</hilight> gumbe,<br>i vaše postavke će biti prihvaćene. "
-"Pritisnite <hilight>Poništi</hilight> ako<br>niste sigurni, bez ikakvih "
-"promjena."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Ništa"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Veličina i Pozicija"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Brave"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Veličina, Pozicija i Brave"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Sve"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Zapamti upotrijebiti"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Ime i klasa prozora"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Ime prozora"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Klasa prozora"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Funkcija prozora"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Vrsta prozora"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "podudarnosti zamjenskih znakova su dozvoljene"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Prolaznost"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Zapamti svojstva"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Postavke ikone"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtualna Radna Površina"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktualni Ekran"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Preskoči Listu Prozora"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Naziv ili datoteka aplikacije (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Uskladi samo jedan prozor"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Pokreni ovaj program loginom"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Uvijek fokusiraj na start"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Zadrži trenutna svojstva"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Pokreni ovaj program loginom"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Postavke"
@@ -2034,24 +2020,24 @@ msgstr "Polica"
 msgid "Module Settings"
 msgstr "Postavke Modula"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Raspoloživi Moduli"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Unesi Modul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Unešeni Moduli"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Iznesi Module"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2085,8 +2071,8 @@ msgstr "Ukloni Aparat"
 msgid "Toolbar Settings"
 msgstr "Postavke Alatne Trake"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Raspored"
 
@@ -2113,12 +2099,12 @@ msgid "Favorite Applications"
 msgstr "Omiljene Aplikacije"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplikacije"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2127,7 +2113,7 @@ msgstr "Aplikacije"
 msgid "Windows"
 msgstr "Prozori"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Izgubljeni Prozori"
 
@@ -2160,134 +2146,131 @@ msgid "(No Applications)"
 msgstr "(Nema Aplikacija)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Virtualne Radne Površine"
+msgstr "Postavi Virtualne Radne Površine"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Nema Prozora)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Nema imena!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Nema Polica)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Polica #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "dodaj Policu"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Ukloni Policu"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Postavke Police"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Sićušno"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Malo"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Srednji"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Velik"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Ogroman"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Sadržaj Police"
+msgstr "Postavi Sadržaj..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Iznad Svega"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Ispod Prozora"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Ispod Svega"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Dozvoli da prozori prekriju police"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Stisni do Veličine Sadržaja"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f piksela"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Stilovi"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automatski Sakrij"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Auto-sakrij policu"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Prikaži kad je miš u"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Prikaži pri kliku miša"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Sakrij vrijeme neaktivnosti"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundi"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Sakrij trajanje"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Prikaži na svim Radnim Površinama"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Prikaži na specificiranim Radnim Površinama"
 
@@ -2322,7 +2305,7 @@ msgstr ""
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2349,29 +2332,31 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Opcije:\n"
-"\t-izložak IZLOŽAK\n"
-"\t\tPrikopčaj na izložak zvani IZLOŽAK.\n"
-"\t\tEG: -izložak :1.0\n"
+"Options:\n"
+"\t-prikaz PRIKAZ\n"
+"\t\tPoveži na prikaz zvani PRIKAZ.\n"
+"\t\tEG: -prikaz :1.0\n"
 "\t-lažni-xinerama-zaslon WxH+X+Y\n"
-"\t\tDodaj lažni xinerama zaslon (namjesto stvarnih)\n"
-"\t\timajući na umu geometriju. Dodajte koliko želite. Oni svi\n"
-"\t\tzamjenjuju stvarne xinerama zaslone. Ovo možete\n"
-"\t\tupotrijebiti da simulirate xinerama.\n"
+"\t\tDodaj LAŽNI xinerama zaslon (namjesto stvarnih)\n"
+"\t\timajući u vidu geometriju. Dodajte ih koliko hoćete. Ovi svi\n"
+"\t\tzamjenjuju stvarne xinerama zaslone. Ovo može\n"
+"\t\tbiti korišteno da simulira xinerama.\n"
 "\t\tEG: -lažni-xinerama-zaslon 800x600+0+0 -lažni-xinerama-zaslon 800x600+800"
 "+0\n"
-"\t-profil CONF_PROFIL\n"
-"\t\tUpotrijebi konfiguracijski profil CONF_PROFIL namjesto zadano po "
-"korisniku ili samo \"zadano\".\n"
-"\t-dobro\n"
+"\t-profil CONF_PROFILE\n"
+"\t\tUpotrijebi konfiguracioni profil CONF_PROFILE namjesto korisnički "
+"odabranog standarda ili samo \"standardan\".\n"
+"\t-dobar\n"
 "\t\tBudi dobar.\n"
-"\t-loš\n"
-"\t\tBudi loš.\n"
+"\t-zao\n"
+"\t\tBudi zao.\n"
 "\t-psihotičan\n"
 "\t\tBudi psihotičan.\n"
 "\t-zaključan\n"
-"\t\tkreni sa zaključanom radnom površinom, tako da lozinka bude "
-"zahtijevana.\n"
+"\t\tPočni sa zaključanom radnom površinom, tako da lozinka mora biti "
+"zatražena.\n"
+"\t-ja-znam-što-radim-i-prihvaćam-svu-odgovornost-za-to-\n"
+"\t\tAko trebate ovu pomoć, onda ne trebate ovu opciju.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2529,7 +2514,7 @@ msgstr "Pokretanje Međunarodne Podrške"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne može postaviti svoj intl sistem."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2537,11 +2522,11 @@ msgstr ""
 "Enlightenment ne može postaviti init ekran.\n"
 "Možda nemate dovoljno memorije?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Testiranje Podrške Formata"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2550,7 +2535,7 @@ msgstr ""
 "provjerite\n"
 "da Evas ima podršku za Softver Bafer mašinu.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2558,7 +2543,7 @@ msgstr ""
 "Enlightenment je otkrio da Evas ne može učitavati PNG datoteke. Provjeri \n"
 "da li Evas ima podršku učitavanja za PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2566,7 +2551,7 @@ msgstr ""
 "Enlightenment je otkrio da Evas ne može učitavati JPEG datoteke. Provjeri \n"
 "da li Evas ima podršku učitavanja za JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2574,7 +2559,7 @@ msgstr ""
 "Enlightenment je otkrio da Evas ne može učitavati EET datoteke. Provjeri \n"
 "da li Evas ima podršku učitavanja za EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2584,11 +2569,11 @@ msgstr ""
 "da li Evas ima fontconfig podršku i da sustavni fontconfig definira 'Sans' "
 "pismo.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Postavi Ekrane"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2597,193 +2582,192 @@ msgstr ""
 "sustavu\n"
 "nije uspio. Možda je neki drugi upravitelj prozora aktivan?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Postavka ÄŒuvara Zaslona"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne može konfigurirati X čuvar zaslona."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Postavi Zaključavanje Radne Površine"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment ne može postaviti svoj sistem zaključavanja radne površine."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Postavke Puteva"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Postavljanje Kontrola Sustava"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne može inicijalizirati Sustavne Naredbe\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Postavi Akcije"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne može postaviti svoj sistem akcija."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Postavljanje Izvršnog Sistema"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne može postaviti svoj exec sistem."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Postavi Podsjetnike"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ne može postaviti postavke podsjetnika."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Postavi FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne može inicijalizirati svoj Datotečni Upravitelj.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Postavi Sistem Poruka"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne može postaviti svoj msg sistem."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Postavi DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne može postaviti svoj DND sistem."
 
-#: src/bin/e_main.c:869
-#, fuzzy
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr "Postavka Rukovanja Grabljenja Unosa"
+msgstr "Postavke Rukovanja Masovnog Unosa"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment ne može postaviti svoj sustav rrkovanja grabljenja unosa"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Postavi Module"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenmet ne može postaviti svoj sistem modula."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Postavi Podsjetnike"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne može postaviti postavke podsjetnika."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Postavi Klase Boja"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne može postaviti svoj sistem klasiranja boja."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Postavi Gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment ne može postaviti svoj sistem kontrole aparata"
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Postavi DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne može konfigurirati DPMS postavke."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Postavi modove Å tednje energije"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment ne može postaviti svoje modove štednje energije."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Postavi Tapetu"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne može postaviti svoj sistem pozadine radne površine"
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Postavi Miša"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne može konfigurirati postavke miša."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Postavljanje Poveznika"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne može postaviti svoj sistem poveznika"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Postavi Pop-ups"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne može postaviti svoj pop-up sistem."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Postavi Police"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ne može postaviti svoj sistem polica."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Postavi Urednika Sličica"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne može inicijalizirati sustav Postavljanja Sličica.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Postavi Raspored Datoteka"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne može postaviti svoj sistem rasporeda datoteka."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Unesi Module"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2795,13 +2779,13 @@ msgstr ""
 "problemni<br>moduliu vašoj konfiguraciji. Dijalog konfiguracije modula<br>će "
 "vam omogućiti ponovni odabir vaših modula."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 "Enlightenment je pao prilikom ranijeg starta i morao je biti ponovno "
 "podignut."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2813,15 +2797,15 @@ msgstr ""
 "moduliu vašoj konfiguraciji.<br><br>Dijalog konfiguracije modula će vam "
 "omogućiti ponovni odabir<br>vaših modula."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Konfiguriraj Police"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Skoro Gotovo"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2830,11 +2814,11 @@ msgstr ""
 "Potkrala se greška učitavanja modula: %s.<br>Modul sa imenom %s nije "
 "pronađen u<br>direktorijima za pretragu modula.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Greška kod unošenja Modula"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2843,11 +2827,11 @@ msgstr ""
 "Potkrala se greška učitavanja modula: %s.<br>Kompletan put do ovog modula je:"
 "<br>%s<br>Prijavljena greška je:<br>%s.<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modul ne sadrži sve neophodne funkcije"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2858,12 +2842,12 @@ msgstr ""
 "zahtijeva najmanju inačicu API modula: %i.<br>API modul kojeg Enlightenment "
 "reklamira je: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Da li želite isprazniti ovaj modul?<br>"
 
@@ -2873,31 +2857,33 @@ msgid ""
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Vi ste prebrzo onesposobili zaštitnika zaslona.<br><br>Hoćete li osposobiti "
+"način </b>prezentiranja</b> i privremeno onesposobiti zaštitnika zaslona, "
+"bravu  i uštedu energije?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jeste li sigurni da hoćete ukloniti ovu policu?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Zatražili ste da uklonite ovu policu.<br>Jeste li sigurni?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Zaustavi Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Počni Pomicanje/Promjenu Veličine Stvari"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Sadržaj Police"
+msgstr "Postavi Sadržaj Police"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Ukloni ovu Policu"
 
@@ -2914,11 +2900,11 @@ msgstr "Provjeravanje Sustavnih Dozvola"
 msgid "System Check Done"
 msgstr "Provjera Sustava Završena"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Odjavni Problemi"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2927,31 +2913,31 @@ msgstr ""
 "Odjava traje predugo. Neke aplikacije<br>nije moguće zatvoriti.<br>Da li "
 "hoćete završiti odjavljivanje<br>bez zatvaranja ovih aplikacija?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Odjavi se odmah"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Čekaj još malo"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Odustani od Odjave"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Odjava u procesu"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Odjava u procesu.<br><hilight>Molimo sačekajte.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je trenutno zaposlen na drugom zahtjevu."
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2959,7 +2945,7 @@ msgstr ""
 "Odjavljivanje.<br>Ne možete izvoditi druge sustavne akcije<br>kad je proces "
 "odjave već pokrenut."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2967,7 +2953,7 @@ msgstr ""
 "Gašenje sustava.<br>Ne možete uraditi nijednu sustavnu funkciju<br>kad je "
 "gašenje već započeto."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2975,7 +2961,7 @@ msgstr ""
 "Ponovno postavljanje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>kad "
 "je ponovno postaljanje već započeto."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2983,7 +2969,7 @@ msgstr ""
 "Suspendiranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok "
 "suspendiranje nije završeno."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2991,55 +2977,55 @@ msgstr ""
 "Hiberniranje.<br>Ne možete uraditi nijednu sustavnu funkciju<br>dok ovo nije "
 "završeno."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! Ovo se nije trebalo dogoditi."
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Gašenje neuspjelo."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Ponovno postavljanje nije uspjelo"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Suspendiranje nije uspjelo"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Hiberniranje nije uspjelo"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Gašenje"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Gašenje.<br><hilight>Molimo čekajte.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Ponovno postavljanje"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Ponovno postavljanje.<br><hilight>Molimo pričekajte.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Suspendiranje"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Suspendiranje.<br><hilight>Molimo pričekajte.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hiberniranje"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hiberniranje.<br><hilight>Molimo pričekajte.</hilight>"
 
@@ -3052,15 +3038,14 @@ msgid "Set As Theme"
 msgstr "Postavi Kao Temu"
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Sadržaj Alatne Trake"
+msgstr "Postavi Sadržaj Alatne Trake"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Nije moguće izaći - neuništivi prozori"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3070,77 +3055,77 @@ msgstr ""
 "znači<br>da Enlightenment neće dozvoliti da se zatvori dok se ovi<br>prozori "
 "ne zatvore ili se ukloni Lifespan brava.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%' .0f Bajta"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%' .0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%' .0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'  .1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Ubuduće"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "U zadnjoj Minuti"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "prije %li godina"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "prije %li Mjeseci"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "prije %li Tjedana"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "prije %li Dana"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "prije %li Sati"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "prije %li Minuta"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nepoznat"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3160,51 +3145,51 @@ msgstr "Gore"
 msgid "Down"
 msgstr "Dolje"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Dodaj u Omiljene"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Jedan Direktorij Više"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Dozvole:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificirano:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Vi"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Zaštićen"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Samo za ÄŒitanje"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Zabranjen"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Čitaj-Piši"
 
@@ -3220,57 +3205,57 @@ msgstr "Osnovne Postavke"
 msgid "Show alert when battery is low"
 msgstr "Prikaži alarm kad je baterija niska"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Provjeri svaki:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f otkucaja"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Prozivanje"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Prikaži alarm na niskoj bateriji"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Alarm kad je na:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Automatski odbaci u..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Alarm"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Automatski Otkrij"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3278,12 +3263,12 @@ msgstr "Automatski Otkrij"
 msgid "Internal"
 msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardver"
 
@@ -3291,24 +3276,24 @@ msgstr "Hardver"
 msgid "Battery"
 msgstr "Baterija"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Baterija je niska"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "AC energija je preporučena"
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "Nedostupno"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "GREÅ KA"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Baterijski Mjerač"
 
@@ -3316,25 +3301,22 @@ msgstr "Baterijski Mjerač"
 msgid "Clock"
 msgstr "Sat"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Panel Postavki"
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Ponovno postavljanje"
+msgstr "Prezentacija"
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Isključeno Vrijeme"
+msgstr "Isključen"
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Moduli"
+msgstr "Načini"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3358,7 +3340,7 @@ msgid "Restart Applications"
 msgstr "Aplikacije kod Ponovnog Podizanja Sustava"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Sve Aplikacije"
 
@@ -3380,12 +3362,12 @@ msgstr "IBar Ostalo"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Izbornici"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Zadani Stil Bordure"
 
@@ -3393,14 +3375,14 @@ msgstr "Zadani Stil Bordure"
 msgid "Window Border Selection"
 msgstr "Odabir Obruba Prozora"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamti ovu Borduru kad se ovaj prozor slijedeći put pojavi."
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3426,7 +3408,7 @@ msgstr "Grupiraj po"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3520,9 +3502,8 @@ msgid "Border Title"
 msgstr "Naslov Bordure"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "O Naslovu Dijaloga"
+msgstr "Postavljanje Naslova za Dijalog"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3695,9 +3676,9 @@ msgid "Desktop Name"
 msgstr "Naziv Radne Površine"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Naziv:"
 
@@ -3707,9 +3688,8 @@ msgstr "Tapeta Radne Površine"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Rastegni"
+msgstr "Postavi"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
@@ -3732,9 +3712,8 @@ msgid "Lock when X screensaver activates"
 msgstr "Zaključaj kad se X čuvar zaslona aktivira"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "Vrijeme dok se X čuvar zaslona ne izmijeni"
+msgstr "vrijeme nakon aktiviranja zaštitnika zaslona"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3765,10 +3744,10 @@ msgstr "%1.0f minuta"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Osobno"
@@ -3800,8 +3779,8 @@ msgstr "Prikaži na zoni zaslona #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3821,24 +3800,23 @@ msgid "Theme Wallpaper"
 msgstr "Tematska Tapeta"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Upotrijebi Tematsku Tapetu"
+msgstr "Korisnička Tapeta"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
 msgid "Enter Presentation Mode"
-msgstr ""
+msgstr "Unesi Način Prezentacije"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:435
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:197
 msgid "Suggest entering presentation mode"
-msgstr ""
+msgstr "Predloži unos načina prezentacije"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:439
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:202
 msgid "If deactivated before"
-msgstr ""
+msgstr "Ako je deaktivirano prije"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
@@ -3906,64 +3884,68 @@ msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Promjena Pozadine"
+msgstr "Paniranje Pozadine"
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
 msgid "%.2f X-axis pan factor"
-msgstr ""
+msgstr "%.2f X-osovina pan faktor"
 
 #: src/modules/conf_desks/e_int_config_desks.c:325
 #, c-format
 msgid "%.2f Y-axis pan factor"
-msgstr ""
+msgstr "%.2f Y-osovina pan faktor"
 
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "Virtualne Radne Površine"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Postavke Dijaloga"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Opće Postavke"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Onesposobi Potvrdne Dijaloge"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normalni Prozori"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Zadane Postavke Moda Dijaloga"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Osnovni Mod"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Napredni Mod"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr "Zapamti veličine i pozicije dijaloga."
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Zadani Dijalog Mod"
 
@@ -4031,31 +4013,31 @@ msgstr "Obnovi"
 msgid "Screen Resolution Settings"
 msgstr "Postavke Razlučivosti Ekrana"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Razlučivost"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Obnovi kod prijavljivanja"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotacija"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Zrcaljenje"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Nedostaju Značajke"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4068,11 +4050,11 @@ msgstr ""
 "zaslona bez<br>podrške za ovaj nastavak. Moguće je da<br>u vrijeme kad "
 "je<hilight>ecore</hilight>urađen, nije<br>otkrivena podrška za XRandR"
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Brzine Osvježavanja Nisu Pronađene"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4132,7 +4114,7 @@ msgid "Power Management"
 msgstr "Upravitelj Energije"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4142,77 +4124,80 @@ msgstr "<Nijedan>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Molimo odaberite rub,<br>ili kliknite <hilight>Zatvori</hilight> da "
-"prekinete.<br> Da promijenite zastoj ove akcije,<br>upotrijebite klizač."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Postavke Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Povezivanje Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Dodaj Rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Izbriši Rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Promijeni Rub"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Obriši Sve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Obnovi Zadane Poveznike"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcija"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametri Akcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Generalne Opcije"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Dozvoli aktivaciju povezivanja sa cijelim zaslonom prozora"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Sekvenca Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekunde"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Greška Povezivanja Ruba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4222,27 +4207,27 @@ msgstr ""
 "<br><hilight>%s</hilight> akcije.<br>Molimo odaberite drugu sekvencu "
 "povezivanja ruba."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4420,9 +4405,8 @@ msgid "Textblock Big"
 msgstr "Veliki Blok Teksta"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Panel Postavki"
+msgstr "Zaglavlje Postavki"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4541,18 +4525,17 @@ msgstr "Vrlo Velik"
 msgid "%d pixels"
 msgstr "%d piksela"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Omogući Posebne Klase Pisama"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Pisma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Osnovni tekst pregleda : 123: 我的天空!"
 
@@ -4560,38 +4543,50 @@ msgstr "Osnovni tekst pregleda : 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Klase Pisama"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Osposobi Klasu Pisma"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Font"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Stil"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Napredni Tekst Pregleda.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Savjetovanje"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bajtkod"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatski"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Rezervne Varijante Pisma"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Naziv Rezervne Varijante"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Osposobi Rezervne Varijante"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Napredni Tekst Pregleda.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Aludiranje / Rezerve"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4605,7 +4600,7 @@ msgstr "Teme Sličica"
 msgid "Icon theme overrides general theme"
 msgstr "Tema ikone nadvladava generalnu temu"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema Sličica"
 
@@ -4676,7 +4671,7 @@ msgstr ""
 "Enlightenment nije mogao da uveze konfiguraciju<br>zbog greške u kopiji."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Jezik"
 
@@ -4703,9 +4698,8 @@ msgid "%1.0f pixels"
 msgstr "%1.0f piksela"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
-#, fuzzy
 msgid "Threshold for applying drag momentum"
-msgstr "Granica za primjenjivanje inercije pomicanja"
+msgstr "ko"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 #, c-format
@@ -4852,7 +4846,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Margina Autoklizanja Pokazivača"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Razne Opcije"
 
@@ -5031,24 +5025,24 @@ msgstr "Veličina Pokazivača"
 msgid "Mouse Cursor"
 msgstr "Pokazivač Miša"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Postavke Miša"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Ruka Miša"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Ubrzanje Miša"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Ubrzavanje"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Prag"
 
@@ -5065,7 +5059,7 @@ msgid "Images"
 msgstr "Slike"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Teme"
 
@@ -5165,33 +5159,33 @@ msgstr "%1.0f kolekcije"
 msgid "Performance"
 msgstr "Učinkovitost"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Odabirač Profila"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Raspoloživi Profili"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Odaberi Profil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Ponovno Postavljanje"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Vi želite ukloniti \"%s\" profil.<br>Jeste li sigurni?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Je li OK za ukloniti?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Dodaj Novi Profil"
 
@@ -5255,9 +5249,8 @@ msgid "%1.2f times"
 msgstr "%1.2f puta"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Spremnik"
+msgstr "Ograničenja"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
@@ -5328,9 +5321,8 @@ msgstr "Konfiguriraj Police"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Postavi FM"
+msgstr "Postavka"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5358,23 +5350,23 @@ msgstr "Pokretanje"
 msgid "Theme Selector"
 msgstr "Odabirač Teme"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Uvoz..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Povezan"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Kategorije Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Pripiši"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Očisti Sve"
 
@@ -5429,38 +5421,38 @@ msgid "Wallpaper Settings"
 msgstr "Postavke Tapete"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Upotrijebi Tematsku Tapetu"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Slika..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradijent..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Povezan"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Gdje smjestiti Tapetu"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Sve Radne Površine"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Ova Radna Površina"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Ovaj Ekran"
 
@@ -5481,14 +5473,14 @@ msgid "Fill Options"
 msgstr "Opcije Popune"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Vodoravno"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Okomito"
 
@@ -5513,9 +5505,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Iz nekog razloga, Enlightenment nije mogao kreirati gradijent."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Postavke Tapete"
+msgstr "Postavljanje tapete..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5554,34 +5545,34 @@ msgstr "Upotrijebi Originalnu Datoteku"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Odaberi Sliku..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Greška Uvoza Slike"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "enlightenment nije mogao uvesti sliku<br>zbog grešaka u konverziji."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Greška Uvoza Tapete"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr "Enlightenment nije mogao uvesti tapetu<br>zbog greške u kopiranju."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5589,7 +5580,7 @@ msgstr ""
 "Enlightenment nije mogao uvesti tapetu.<br><br>Jeste li sigurni da je ovo "
 "važeća tapeta?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Razmijeni tapete"
 
@@ -5702,14 +5693,6 @@ msgstr "Ikona definirana od povlaštenog korisnika"
 msgid "Prefer application provided icon"
 msgstr "Ikona oskrbljena povlaštenom aplikacijom"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Interni Prozori"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Uvijek zapamti interni prozor"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Postavke Fokusa"
@@ -5842,17 +5825,12 @@ msgid "Window Maximize Policy"
 msgstr "Odredbe Maksimiziranja Prozora"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Inteligentno proširivanje"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Proširi prozor"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Popuni raspoloživi prostor"
 
@@ -5860,19 +5838,19 @@ msgstr "Popuni raspoloživi prostor"
 msgid "Maximize Policy"
 msgstr "Pravila Maksimiziranja"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Pravac Maksimiziranja"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Oboje"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Dozvoli manipulaciju prozora"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr "Dozvoli manipuliranje miksimiziranih prozora"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automatski pomakni/promjeni veličinu prozora pri autoskrivanju police"
 
@@ -5911,49 +5889,57 @@ msgstr "Uzdigni na početku pomjeranja ili promjene veličine"
 msgid "Raise when clicking to focus"
 msgstr "Uzdigni kod klika za fokus"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Prozorni Podsjetnici"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr "Zapamti interne dijaloge"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr "Zapamti fileman prozore"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Ukloni Podsjetnike"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detalji"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Bez Imena>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Klasa:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Bez Klase>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Naslov:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Bez Naslova>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Uloga:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Bez Uloge>"
 
@@ -6285,9 +6271,8 @@ msgid "Icon Size"
 msgstr "Veličina Ikone"
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "Pregled"
+msgstr "Pogled"
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6298,9 +6283,8 @@ msgid "Sort Dirs First"
 msgstr "Sortiraj Direktorije Prvo"
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Osnovna Veličina"
+msgstr "Osjetljiv na Veličinu Slova"
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6308,7 +6292,7 @@ msgstr "Upotrijebi Jedan Klik"
 
 #: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
-msgstr ""
+msgstr "Koristi Naizmjenične Modifikatore Odabira"
 
 #: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
@@ -6327,7 +6311,7 @@ msgid "Show Toolbar"
 msgstr "Prikaži Alatnu Traku"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Ponašanje"
 
@@ -6337,142 +6321,138 @@ msgstr "Prikaži HAL Ikone na Radnoj Površini"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "Postavi jačine pri ubacivanju"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Otvori upravitelja datoteka pri montiranju"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Idi na Izvorni Direktorij"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Dodaj Aplikaciju..."
+msgstr "Druga aplikacija..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Otvori"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Otvori s..."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "Aplikacije"
+msgstr "Poznate Aplikacije"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Specifična Aplikacija"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Posebne Naredbe"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Kopiranje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "Pomicanje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Brisanje je prekinuto"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
-msgstr ""
+msgstr "Nepoznata operacija pomoćnika je prekinuta"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "Kopiranje %s je završeno"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "Kopiranje %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "Pomicanje %s je završeno"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "Pomicanje %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Izbriši Rub"
+msgstr "Brisanje završeno"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Ponovno postavljanje nije uspjelo"
+msgstr "Brisanje datoteka..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
-msgstr ""
+msgstr "Nepoznata operacija pomoćnika %d"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Infomacije o linku"
+msgstr "(bez podataka)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Datoteka:"
+msgstr "Datoteka: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "Od: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "Do: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Sakrij trajanje"
+msgstr "Procesiranje %d operacija"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Upravitelj datotekama"
+msgstr "Upravitelj datoteka je neaktivan"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "EFM Operativne Informacije"
 
 #: src/modules/gadman/e_mod_config.c:58
 msgid "Gadgets Manager"
@@ -6508,19 +6488,19 @@ msgstr "Pozadina"
 msgid "Gadgets"
 msgstr "Aparati"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Slobodno"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Uvijek na radnoj površini"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Uporno na vrhu"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Dodaj ostale aparate"
 
@@ -6557,7 +6537,7 @@ msgstr "Odabrani Izvor Trake"
 msgid "Icon Labels"
 msgstr "Oznake Ikone"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Prikaži Oznaku Ikone"
 
@@ -6618,43 +6598,43 @@ msgstr "Napravi Novu Ikonu"
 msgid "Add Application"
 msgstr "Dodaj Aplikaciju"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBOX Postavke"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Prikaži Ime"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Prikaži Naslov"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Prikaži Klasu"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Prikaži Ime Ikone"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Zaglavlje Obruba Izložka"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Prikaži prozore sa svih ekrana"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Prikaži prozore sa trenutnog ekrana"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Prikaži prozore sa svih radnih površina"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Prikaži prozore sa aktivne radne površine"
 
@@ -6674,11 +6654,11 @@ msgstr "Okreni radnu površinu kotačićem miša"
 msgid "Show desktop names"
 msgstr "Prikaži imena radnih površina"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Pop-up Postavke"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Prikaži pop-up pri promjeni radne površine"
 
@@ -6686,69 +6666,69 @@ msgstr "Prikaži pop-up pri promjeni radne površine"
 msgid "Show popup for urgent windows"
 msgstr "Prikaži pop-up za hitne prozore"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Gumb za Odabir i Klizanje"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Klikni da postaviš"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Gumb za Vući i Spustiti"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Pomakni cijelu radnu površinu"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Visina pop-upa za osnovnu radnju"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Otpor pomicanju"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Visina Pregledničkog Pop-upa"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Pop-up brzina"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekundi"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Hinte Postavke Prozora"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Prikaži po-up na hitnom prozoru"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Pop-up na hitnom prozoru se zaljepljuje za ekran"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Zgrabiti Gumb Preglednika"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6756,11 +6736,11 @@ msgstr ""
 "Molimo pritisnite gumb miša.<br>Pritisnite <hilight>Escape</hilight> da "
 "prekinete.<br>Ili <hilight>Del</hilight> da ponovno postavite gumb."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Pozor"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6770,29 +6750,29 @@ msgstr ""
 "internom kodu<br>za kontekstualne izbornike. <br>Ovaj gumb radi samo u Pop-"
 "up."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Dugme %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Prikaži Preglednički Pop-up"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Pop-up Radna Površina Desno"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Pop-up Radna Površina Lijevo"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Pop-up Radna Površina Gore"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Pop-up Radna Površina Dolje"
 
@@ -6916,7 +6896,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6928,15 +6908,15 @@ msgstr "Slijedeći"
 msgid "Welcome to Enlightenment"
 msgstr "Dobrodošli u Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Odaberi Jedan"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6986,15 +6966,15 @@ msgstr "Klikni da fokusiraš prozore"
 msgid "Mouse over focuses windows"
 msgstr "Miš preko će fokusirati prozore"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Odaberi Ikone za Dodati"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Brzo Pokretanje"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Odaberi Aplikacije"
 
@@ -7118,25 +7098,20 @@ msgstr "Specifičan Uređaj"
 msgid "Networks"
 msgstr "Mreže"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
-msgstr ""
+msgstr "Postoji drugi systray"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
-msgstr ""
+msgstr "Može postojati samo jedan systray uređaj, i jedan već postoji."
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Sustav"
-
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Pločica"
+msgstr "Systray"
 
-#~ msgid "Mount of device failed"
-#~ msgstr "Neuspjelo montiranje uređaja"
+#~ msgid "Window name and class"
+#~ msgstr "Ime i klasa prozora"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Konfiguriraj Virtualne Radne Površine"
@@ -7153,15 +7128,24 @@ msgstr "Sustav"
 #~ msgid "Configure Toolbar Contents"
 #~ msgstr "Konfiguriraj Sadržaj Alatne Trake"
 
-#~ msgid "Configure Dialog Title"
-#~ msgstr "Konfiguriraj Naslov Dijaloga"
-
 #~ msgid "Configure"
 #~ msgstr "Konfiguriraj"
 
+#~ msgid "Internal Windows"
+#~ msgstr "Interni Prozori"
+
+#~ msgid "Expand the window"
+#~ msgstr "Proširi prozor"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Dozvoli manipulaciju prozora"
+
 #~ msgid "Configure Heading"
 #~ msgstr "Konfiguriraj Zaglavlje"
 
+#~ msgid "Configure Dialog Title"
+#~ msgstr "Konfiguriraj Naslov Dijaloga"
+
 #~ msgid "Scaling Factors"
 #~ msgstr "Faktori Skaliranja"
 
@@ -7173,3 +7157,35 @@ msgstr "Sustav"
 
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Posebne Pametne Mrežne Ikone"
+
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Vi pokušavate zatražiti da Enlightenment zapamti primijeniti<br>svojstva "
+#~ "(kao veličinu, lokaciju, vrstu obruba itd) na<br>prozor koji "
+#~ "<hilight>nema jedinstvena svojstva</hilight>.<br><br>Ovo znači da dijeli "
+#~ "Ime/Klasu, Prolaznost, Ulogu i druga svojstva<br>sa ostalim prozorima na "
+#~ "zaslonu i da bi primjena zapamćenih<br>svojstava ovog prozora bila "
+#~ "primjenjena na sve ostale prozore<br>koji imaju slična svojstva."
+#~ "<br><br>Možda želite osposobiti <hilight>Uskladi samo jedan prozor</"
+#~ "hilight> opciju<br> ako ste namjeravali promijeniti samo jednu instancu "
+#~ "ovog prozora, sa <br>dodatnim instancama nepromijenjenim.<br><br>Ovo je "
+#~ "samo upozorenje u slučaju da ovo niste namjeravali uraditi.<br>Ako jeste, "
+#~ "pritisnite <hilight>Primijeni</hilight> ili <hilight>U redu</hilight> "
+#~ "gumbe,<br>i vaše postavke će biti prihvaćene. Pritisnite "
+#~ "<hilight>Poništi</hilight> ako<br>niste sigurni, bez ikakvih promjena."
+
+#~ msgid "Mount of device failed"
+#~ msgstr "Neuspjelo montiranje uređaja"
diff --git a/po/hu.gmo b/po/hu.gmo
index d54f2a9..4f012e5 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 09af51e..2577986 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,40 +8,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-06-30 20:43+0000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-10-24 09:18+0000\n"
 "Last-Translator: lisovszki <lisovszki at gmail.com>\n"
 "Language-Team: Hungarian <pclinuxos-i18n at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Az Enlightenmentrõl"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Bezárás"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,14 +52,14 @@ 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 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<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>"
+"Copyright &copy; 1999-2009, az Enlightenment fejlesztői csapat. Minden jog "
+"fenntartva.<br><br>Reméljük ugyanannyira élvezed a szoftver használatát, "
+"mint ahogy mi élveztük a megírását.<br><br>Ez a szoftver mindenféle garancia "
+"nélkül került fel. A szoftver el lett látva liszensz feltételekkel, ezért "
+"kérlek olvasd el a Másolásra és az ehhez tartozó feltelepített fájlokat."
+"<br><br>Az Enlightenment <hilight>KEMÉNY FEJLESZTÉS</hilight> áll, és nem "
+"stabil. Néhány képesség nem működik, vagy még be sem került, esetleg hibás. "
+"<hilight>FIGYELMEZTETVE LETTÉL!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -78,571 +80,571 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Tényleg be akarod zárni ezt az ablakot?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Igen"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nem"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Az Enlightenmentbõl való kilépést választottad.<br><br>Biztos, hogy ezt "
 "akarod?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Tényleg ki akarsz lépni?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 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:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Tényleg ki akarod kapcsolni a gépet?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "A számítógép kikapcsolását választottad.<br><br>Biztosan ki akarod kapcsolni?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Biztosan újra akarod indítani?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "A számítógép újraindítását választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 "Az számítógép felfüggesztését választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Tényleg hibernálni akarod a gépet?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "A számítógép hibernálását választottad.<br><br>Biztos, hogy ezt akarod?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mozgatás"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Ablak menü"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Felemelés"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Alsó"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Kilövés"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Ablak : Állapot"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Ragadós módra vált"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Ikonizált módra vált"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Teljes képernyő módra vált"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximalizálás"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximalizálás függőlegesen"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximalizálás vízszintesen"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Teljes képernyő maximalizálás"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximalizálási mód \"Intelligens\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximalizálási mód \"Kitöltés\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximalizálási mód \"Bőséges\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Felgördítés fel módra vált"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Felgördítés le módra vált"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Felgördítés balra módra vált"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Felgördítés jobbra módra vált"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Felgördítés módra vált"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Szegély nélküli állapotra vált"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Rögzített állapotra vált"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Munkaasztal"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Asztal váltás fel"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Asztal váltás ezzel..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Munkaasztal megjelenítése"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Mutasd a polcot"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Asztal váltása ide..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Vízszintes asztal váltás..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Váltás a 0-ás asztalra"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Váltás az 1-es asztalra"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Váltás a 2-es asztalra"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Váltás a 3-as asztalra"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Váltás a 4-es asztalra"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Váltás az 5-ös asztalra"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Váltás a 6-os asztalra"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Váltás a 7-es asztalra"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Váltás a 8-as asztalra"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Váltás a 9-es asztalra"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Váltás a 10-es asztalra"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Váltás a 11-es asztalra"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Asztal váltás balra"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Asztal váltás jobbra"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Asztal válát fel"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Asztal váltás le"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Asztalváltás ennyivel..."
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Lineáris asztalváltás"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Munkaasztal forgatása a megadott irányba..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Váltás a 0. asztalra"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Váltás a 1. asztalra"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Váltás a 2. asztalra"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Váltás a 3 asztalra"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Váltás a 4. asztalra"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Váltás a 5. asztalra"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Váltás a 6. asztalra"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Váltás a 7. asztalra"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Váltás a 8. asztalra"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Váltás a 9. asztalra"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Váltás a 10. asztalra"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Váltás a 11. asztalra"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Váltás erre az asztalra..."
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Az egér küldése a 0-ás képernyőre"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Az egér küldése a 1-es képernyőre"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Egér küldése erre a képernyőre..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Egér küldése előre 1 képernyőt"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Egér vissza 1 képernyőt"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Egér küldése előre/Vissza képernyőket..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Ablak : Mozgatás"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "A következő asztalra"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Az előző asztalra"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "#... Asztal által..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Erre az asztalra..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Saját Menü mutatása"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Kedvencek menü megjelenítése"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Minden alkalmazás menü megjelenítése"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Ablakok menü megjelenítése"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Menü megjelenítése..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Indítás"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Parancs"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Alkalmazás"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Kilépés"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Kilépés most"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment: Mód"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Bemutató mód"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Offline mód"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Rendszer"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Kikapcsolás most"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Kikapcsolás"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Újraindítás"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernálás"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Lezárás"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Ablakok tisztogatása"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Ablak : Műveletek"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Késleltetett folyamat"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Beállítás háttérként"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Desktop fájlok keresése kész"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Desktop fájl keresés"
 
@@ -650,41 +652,40 @@ msgstr "Desktop fájl keresés"
 msgid "Color Selector"
 msgstr "Szín választó"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -701,7 +702,7 @@ msgstr ""
 "és<br>ezek az elõzõ fájlokból hiányoztak. Mindent visszaállíthatsz,<br>ahogy "
 "neked tetszik. Az esetleges galibákért elnézést kérünk!<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -715,11 +716,11 @@ msgstr ""
 "Ez így nem túl jó, és figyelmez-<br>tetésként a beállítások visszaálltak az "
 "alapértelmezésre.<br>A galibákért elnézést kérünk!<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Beállítások frissítve"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -730,7 +731,7 @@ msgstr ""
 "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:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -745,7 +746,7 @@ msgstr ""
 "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:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -758,7 +759,7 @@ msgstr ""
 "<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:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -770,7 +771,7 @@ msgstr ""
 "<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:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -781,11 +782,11 @@ msgstr ""
 "megszakadt. Ez nagyon szokatlan.<br><br>A fájl, ahol a hiba keletkezett:<br>%"
 "s<br><br> A fájl törölve lett.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment konfiguráció írási problémák"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -793,12 +794,12 @@ msgstr "Enlightenment konfiguráció írási problémák"
 msgid "Advanced"
 msgstr "Speciális"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Alap"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -806,7 +807,7 @@ msgstr "Alkalmaz"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Modulok"
 
@@ -815,27 +816,27 @@ msgstr "Modulok"
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "%d tároló"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Hiba - nincs PAM támogatás"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 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:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Zárolás nem sikerült!"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -843,15 +844,15 @@ msgstr ""
 "Nem tudtam az asztalt zárolni, mert egy alkalmazás<br>használja az egeret "
 "vagy billentyûzetet, vagy mindkettõt<br>és nem tudom tõle elszakítani õket."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Kérlek írd be a feloldási jelszavad"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Hiba az azonosítási rendszerben!"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -861,11 +862,11 @@ msgstr ""
 "A PAM azonosítás hibával járt.<br>A hibakód <highlight>%i</highlight>.<br>Ez "
 "így nem jó, és nem kellene megtörténnie. Kérlek jelentsd ezt a hibát!"
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Aktiválod a bemutató üzemmódot?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -875,11 +876,11 @@ msgstr ""
 "ha az energiatakarékosság érdekében átváltanánk <b>bemutató</b> módra, és "
 "letiltanánk átmenetileg a képernyővédőt?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Ne, de növelje a késleltetési időt"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Ne, és ne kérdezősködj"
 
@@ -904,7 +905,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Munkaasztal bejegyzés szerkesztő"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -949,7 +950,7 @@ msgstr "Kategóriák"
 msgid "Mime Types"
 msgstr "Mime Típus"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Beállítások"
 
@@ -981,23 +982,23 @@ msgstr "Válassz egy ikont"
 msgid "Select an Executable"
 msgstr "Egy futtatható kiválasztása"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Beillesztés"
 
@@ -1005,13 +1006,13 @@ msgstr "Beillesztés"
 msgid "Select All"
 msgstr "Mindent kijelöl"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Futási hiba"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -1019,320 +1020,320 @@ 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Hiba az alkalmazás futtatásakor"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Hiba az alkalmazás végrehajtásakor"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s váratlanul befejezte mûködését."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%i kilépési értékkel tért vissza a %s-től."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s futtatását megszakította egy megszakítót jel."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s futtatását megszakította egy kilépés jel."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s futtatását megszakította egy elvetõ jel."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s futtatása megszakadt szegmens hiba miatt"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, 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:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s futtatása megszakadt bus hiba miatt"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Hiba bejegyzések"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Nem volt hibaüzenet."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Mentsd el ezt az üzenetet"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "A hiba bejegyzés elmentbe ide: %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Hiba információ"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Hiba szignál információk"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Kimeneti adat"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Nem volt kimenet"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Nem létező útvonal"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nem létezik."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr ""
+msgstr "Csatolási hiba"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Nam lehet csatlakoztatni az eszközt"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr ""
+msgstr "Leválasztási hiba"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Nem lehet leválasztani az eszközt"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr ""
+msgstr "Kiadási hiba"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "Nem lehet kiadni a lemezt"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i fájlok"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Megszakítás"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Szülő beállítások öröklése"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Nézetmód"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "A nézet frissítése"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Emlékezz az utasításokra"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Rendezés Most"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Új könyvtár"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "Leválasztás"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr ""
+msgstr "Csatolás"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
-msgstr ""
+msgstr "Lemez kiadása"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Tulajdonságok"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Alapértelmezés használata"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Rács Ikonok"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Egyéni Ikonok"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonméret (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Háttér beállítása..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Overlay beállítása..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Törlés"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Új könyvtár létrehozása"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Új könyvtár neve:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s átnevezése erre:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Fájl átnevezése"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Újra"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Hiba"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Nem, ne mindet"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Igen, mindet"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "A fájl már létezik, felülírod?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Elveti ezt"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Mindent elvet"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Hiba történt egy folyamat végzése közben.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "A törlés megerősítése"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Biztosan törölni akarod a(z) <br><hilight>%s</hilight> nevû fájlt?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1345,144 +1346,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Fájljellemzők"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Méret:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Utoljára módosítva:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Fájl típus:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Jogosultságok"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Tulajdonos:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Bárki olvashatja"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Bárki írhatja"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Tulajdonos olvashatja"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Tulajdonos írhatja"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Előnézeti kép"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Egyéni"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Használd ezt az ikont az összes ilyen fájltípushoz"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Link információ"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Válassz egy képet"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MeB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Ismeretlen érték"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Cserélhető adathordozójú eszköz"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Modul nozgatása ide:"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Egyszerű"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Beágyazott"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Megjelenés"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Tartalom automatikus görgetése"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Átméretezhetõ"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Modul áthelyezésének/átméretezésének kezdése"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Modul eltávolítása"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Modul áthelyezésének/átméretezésének leállítása"
 
@@ -1494,7 +1499,7 @@ 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_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Ablak zárolások"
 
@@ -1528,21 +1533,21 @@ 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:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Halomba rakás"
 
@@ -1551,12 +1556,12 @@ 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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Árnyékoltság"
 
@@ -1565,7 +1570,7 @@ msgid "Maximized state"
 msgstr "Maximalizált állapot"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Teljes képernyõs állapot"
 
@@ -1573,7 +1578,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Keret stílus"
 
@@ -1621,115 +1626,116 @@ msgstr "Vedd el erről az asztalról"
 msgid "More..."
 msgstr "Több..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Ikonméret"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Teljes méretû függõlegesen"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Teljes méretû vízszintesen"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Kicsinyítés"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Gyorsbillentyű"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "A Kedvencek menühöz"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Az indítóhoz"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Szegély"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Állapot"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Megjegyez"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Ablak tulajdonságok"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Mindig legfelül"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normál"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Mindig alul"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Keret stílus kiválasztása"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "használd az alapértelmezett E17 ikon beállítást"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Az alkalmazás ikonjának használata "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Felhasználó által megadott ikon használata"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Árnyékolt"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Ragadós"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Ablaklista"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Lapozó"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Feladatlista"
 
@@ -1745,7 +1751,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM tulajdonságok"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Cím"
 
@@ -1837,11 +1843,11 @@ msgstr "NetWM tulajdonságok"
 msgid "Modal"
 msgstr "Kizárólagos"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Feladatlista kihagyása"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Lapozó kihagyása"
 
@@ -1849,15 +1855,15 @@ msgstr "Lapozó kihagyása"
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Ablak emlékek"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Az ablak tulajdonságai nem egyediek"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1880,11 +1886,11 @@ msgstr ""
 "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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nincs illeszkedõ tulajdonságtábla"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1895,111 +1901,101 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Arra kéred az Enlightenmentet, hogy alkalmazza a beállításokat<br>(mint pl. "
-"méret, hely, keret stílus) egy olyan ablakra,<br>amelynek <hilight>nincsenek "
-"egyedi tulajdonságai</hilight>.<br><br>Ez annyit jelent, hogy az ablak "
-"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>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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Semmi"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Méret és hely"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Zárolások"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Méret, hely és zárolások"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Minden"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Ezek alapján emlékezz:"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Az ablak neve és osztálya"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Ablak név"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Ablak osztály"
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Ablak szerepe"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Ablak típusa"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "wildcard egyezésed  engedélyezve"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Mulandóság"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Tulajdonságok, amire emlékezz"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Ikon tulajdonságok"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuális asztal"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktuális képernyő"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ablak lista kihagyása"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Alkalamzás fájl vagy név (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Csak egy ablakkal egyezzen"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Indítsd ezt a programot a bejelentkezéskor"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Induláskor mindig figyeld"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Jelenlegi beállítások megtartása"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Indítsd ezt a programot a bejelentkezéskor"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Beállítások"
@@ -2018,24 +2014,24 @@ msgstr "Polc"
 msgid "Module Settings"
 msgstr "Modul beállítások"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Elérhető modulok"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Modul betöltése"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Betöltött modulok"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Modul kikapcsolása"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2069,8 +2065,8 @@ msgstr "Modul eltávolítása"
 msgid "Toolbar Settings"
 msgstr "Eszköztár beállítások"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Elrendezés"
 
@@ -2097,12 +2093,12 @@ msgid "Favorite Applications"
 msgstr "Kedvencek"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Alkalmazások"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2111,7 +2107,7 @@ msgstr "Alkalmazások"
 msgid "Windows"
 msgstr "Ablakok"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Elveszett ablakok"
 
@@ -2147,129 +2143,128 @@ msgstr "(Nincs alkalmazás)"
 msgid "Set Virtual Desktops"
 msgstr "Virtuális asztalok beállítása"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Nincsenek ablakok)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Nincs név!!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Nincsenek polcok)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Polc #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Polc hozzáadása"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Polc törlése"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Polc beállítások"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Apró"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Kicsi"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Nagy"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "nagyon nagy"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Összetevők beállítása..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Minden felett"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Ablakok alatt"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Minden alatt"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Az ablakok eltakarhatják a polcot"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Tartalom méretének összehúzása"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Stílusok"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automatikus elrejtés"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Polc automatikus elrejtése"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Mutasd ha az egér rajta van"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Mutasd egér kattintásra"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Elrejtés ennyi idő után"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f másodperc"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Elrejtés időtartama"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Mutasd minden asztalon"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Mutrasd a kiválasztott asztalon"
 
@@ -2488,7 +2483,7 @@ msgstr "Nemzetközi támogatás indítása"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Az E17 nem tudta felállítani az intl rendszerét."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2496,11 +2491,11 @@ msgstr ""
 "Az E17 nem tudta felállítani az induló képernyõt.\n"
 "Lehet, hogy kevés a memória?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Formátum támogatás tesztelése"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2508,7 +2503,7 @@ msgstr ""
 "Az Evas nem tudja megcsinálni a puffer vásznat. Kérlek ellenõrizd\n"
 "hogy az Evas támogatja-e a Software Buffer engine-t\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2516,7 +2511,7 @@ msgstr ""
 "Az Evas nem tudja betölteni a PNG fájlokat. Kérlek ellenõrizd,\n"
 "hogy az Evas támogatja-e a PNG töltõt.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2524,7 +2519,7 @@ msgstr ""
 "Az Evas nem tudja betölteni a JPEG fájlokat. Kérlek ellenõrizd,\n"
 "hogy az Evas támogatja-e a JPEG töltõt.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2532,7 +2527,7 @@ msgstr ""
 "Az Evas nem tudja betölteni a EET fájlokat. Kérlek ellenõrizd,\n"
 "hogy az Evas támogatja-e a EET töltõt.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2542,11 +2537,11 @@ msgstr ""
 "hogy az Evas támogatja-e a betűtípusbeállítást, és hogy a rendszer "
 "betűtípusa a 'Sans'-e.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "képernyők beállítása"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2554,191 +2549,191 @@ msgstr ""
 "Az E17 nem tudta elindítani az ablakkezelőt. Lehet, hogy fut már egy másik\n"
 "ablakkezelõ?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Képernyőkímélő beállítása"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Az E17 nem tudta elindítani az X képernyővédőt!"
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Asztal zárolás beállítása"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Az E17 nem tudta felállítani az asztalzár-rendszert."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Útvonalak beállítása"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Rendszer felügyeletek beállítása"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Folyamatok beállítása"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Az E17 nem tudta elindítani az akció-rendszerét."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Végrehajtó rendszer beállítása"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Az E17 nem tudta elindítani a exec rendszert."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Emlékezések beállítása"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "FM beállítása"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Az E17 nem tudta elindítani a fájlkezelõt!\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Üzenet rendszer beállítása"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Az E17 nem tudta felállítani az üzenet-rendszert."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "FÉV beállítása"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Az E17 nem tudta felállítani a fogd-és-vidd rendszert."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr ""
+msgstr "Grab Input kezelés beállítása"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Az E17 nem tudta elindítani a beviteli mozdulat-kezelõt."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Modulok beállítása"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Az E17 nem tudta elindítani a modul rendszert."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Emlékezések beállítása"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "szín osztályok beállítása"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Az E17 nem tudta elindítani a szín-osztály rendszert."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Modulkezelő beállítása"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Az E17 nem tudta elindítani a modul kezelõ rendszert."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "DPMS Beállítás"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Az E17 nem tudta felállítani az emlékezési beállításokat."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Energiatakarékosság beállítása"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Az e17 nem tudta felállítani az energiatakarékossági rendszert."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Háttérkép beállítása"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Az E17 nem tudta beállítani az asztal háttér-rendszert."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Egér beállítása"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Az Enlightenment nem tudja beállítani az egér opciókat."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Billentyûkombinációk"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 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:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "felugró ablakok beállítása"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Az E17 nem tudta beállítani a felugró-ablak rendszert."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Polcok beállítása"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Az E17 nem tudta elindítani a polc-rendszert."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Előkép beállítása"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Az E17 nem tudta elindítani a elõkép-generátort!\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Fájl utasítás beállítása"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Az E17 nem tudta elindítani a fájl utasítás rendszert."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Modulok betöltése"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2750,11 +2745,11 @@ msgstr ""
 "távolítod a hibákat<br>a beálításodból. a modul beállítások ablak<br>újra "
 "lehetővé teszi, hogy kiválaszd a <br>moduljaidat ismét."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Az E17 sérült már az indítás elején, ezért újra lett indítva."
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2766,15 +2761,15 @@ msgstr ""
 "távolítod a hibákat<br>a beálításodból. a modul beállítások ablak<br>újra "
 "lehetővé teszi, hogy kiválaszd a <br>moduljaidat ismét."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Polcok beállítása"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Madnem kész"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2783,11 +2778,11 @@ msgstr ""
 "Hiba a %s modul betöltésekor<br>Nincs %s nevû modul a modul könyvtárakban."
 "<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Hiba a modul betöltésekor"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2796,11 +2791,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "A modul nem tartalmazza az összes szükséges funkciót"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2810,12 +2805,12 @@ msgstr ""
 "Modul API hiba<br>Hiba a modul betöltésekor: %s<br> Ennek a modulnak "
 "legalább %i verziójú api kell<br>Az Enlightenment API verziója: %i<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Szeretnéd a modult kikapcsolni?<br>"
 
@@ -2829,29 +2824,29 @@ msgstr ""
 "energiatakarékossági szempontok miatt engedélyeznéd a <b>bemutató</b> módot "
 "és átmenetileg letiltanád a képernyővédőt?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Biztosan törölni akarod ezt a polcot?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "A polc törlését választottad.<br><br>Biztosan törölni akarod?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Elemek mozgatásának/átméretezésének leállítása"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Elemek mozgatása/átméretezése"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Polc tartalmának beállítása"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
@@ -2868,11 +2863,11 @@ msgstr "Rendszer jogosultságok ellenőrzése"
 msgid "System Check Done"
 msgstr "Rendszer ellenőrzés kész"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Kijelentkezési problémák"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2881,31 +2876,31 @@ 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:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Kijelentkezés most"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Várakozás"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Mégsem lép ki"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Kijelentkezés folyamatban"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Kijelentkezés folyamatban.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Az E17 foglalt egy másik kérés által"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2913,7 +2908,7 @@ msgstr ""
 "Kijelentkezés.<br>Nem végezhetsz más rendszerműveleteket<br>, ha már a "
 "kijelentkezés elkezdődött."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2921,7 +2916,7 @@ msgstr ""
 "Leállítás.<br>Nem végezhetsz más rendszerműveleteket<br>, ha a leállítás már "
 "elkezdődött."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2929,7 +2924,7 @@ msgstr ""
 "Újraindítás.<br>Nem végezhetsz más rendszerműveletet<br>, ha az újraindítás "
 "már elkezdődött."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2937,7 +2932,7 @@ msgstr ""
 "Felfüggesztés.<br>A felfüggesztés alatt nem végezhetsz<br> semmilyen más "
 "rendszerműveletet."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2945,55 +2940,55 @@ msgstr ""
 "Hibernálás.<br>Nem végezhetsz semmilyen egyéb rendszerműveletet<br> a "
 "hibernálás alatt."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! Ez nem történhet meg"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "leállítás nem sikerült."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Újraindítás nem sikerült."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Felfüggesztés nem sikerült."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Hibernálás nem sikerült."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Kikapcsolás"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kikapcsolás.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Újraindítás"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Újraindítás.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Felfüggesztés"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Felfüggesztés.<br><hilight>Kérlek várj.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernálás"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernálás.<br><hilight>Kérlek várj.</hilight>"
 
@@ -3009,11 +3004,11 @@ msgstr "Beállítás témának"
 msgid "Set Toolbar Contents"
 msgstr "Eszköztár tartalmának a beállítása"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Nem tudok kilépni - halhatatlan ablakok"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3023,77 +3018,77 @@ msgstr ""
 "Enlightenment nem tud addig kilépni, amíg ezek az ablakok nyitva "
 "vannak<br>vagy az Élettartam zár el nem lett távolítva<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bájt"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "A jövőben"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Az utolsó percben"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li éve"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li hónapja"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li hete"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li napja"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li órája"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li perce"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3113,51 +3108,51 @@ msgstr "Fel"
 msgid "Down"
 msgstr "Le"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Hozzáadás a Kedvencekhez"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Egy könyvtárt fel"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Jogosultságok:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Módosítva:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Te"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Védett"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Csak olvasható"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Tiltott"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Olvasás-Írás"
 
@@ -3173,57 +3168,57 @@ msgstr "Alapbeállítások"
 msgid "Show alert when battery is low"
 msgstr "Figyelmeztetés, ha a telep töltöttség alacsony"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Ellenőrzési időközök:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f fájl"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Szavazás"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Figyelmeztetés alacsony töltöttségi szintnél"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Figyelmeztetés ekkor:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f perc"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Automatikus mellőzés ekkor:"
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f másodperc"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Figyelmeztetés"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Automatikus azonosítás"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3231,12 +3226,12 @@ msgstr "Automatikus azonosítás"
 msgid "Internal"
 msgstr "Belső"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hárdver"
 
@@ -3244,24 +3239,24 @@ msgstr "Hárdver"
 msgid "Battery"
 msgstr "Akkumulátor"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Hamarosan le fog merülni az akku!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "AC áramforrás ajánlott."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "HIBA"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Akkumulátor mérő"
 
@@ -3269,20 +3264,20 @@ msgstr "Akkumulátor mérő"
 msgid "Clock"
 msgstr "Óra"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Beállító panel"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Bemutató"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Offline"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Módok"
 
@@ -3308,7 +3303,7 @@ msgid "Restart Applications"
 msgstr "Alkalmazások újraindítása"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Alkalmazások"
 
@@ -3330,12 +3325,12 @@ msgstr "IBar egyéb"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menük"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Alapértelmezett keret stílus"
 
@@ -3343,14 +3338,14 @@ msgstr "Alapértelmezett keret stílus"
 msgid "Window Border Selection"
 msgstr "Ablakkeret választása"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Megjegyez Szegély for ablak következő idő"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3376,7 +3371,7 @@ 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3644,9 +3639,9 @@ msgid "Desktop Name"
 msgstr "Asztal név"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Név:"
 
@@ -3712,10 +3707,10 @@ msgstr "%1.0f perc"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Személyes"
@@ -3747,8 +3742,8 @@ msgstr "Megjelenítés ezen a képernyõn #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3869,46 +3864,51 @@ msgstr "%.2f Y-axis pan faktor"
 msgid "Virtual Desktops"
 msgstr "Virtuális asztalok"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Párbeszédablak beállításai"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Jóváhagyási párbeszédablakok tiltása"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normál ablakok"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Alapértelmezett párbeszédablak mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Alap mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Szakértői mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Alapértelmezett párbeszédablak mód"
 
@@ -3977,31 +3977,31 @@ msgstr "Visszaállít"
 msgid "Screen Resolution Settings"
 msgstr "Képernyő felbontás beállítások"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Állítsd vissza bejelentkezéskor!"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Forgatás"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Tükrözés"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Hiányzó képességek"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4015,11 +4015,11 @@ msgstr ""
 "<br>Előfordulhat, hogy az <hilight>ecore</hilight>, a forgatásakor nem "
 "érzékelt<br> XRandR támogatást."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Nem találtam frissítési sebességeket"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4079,7 +4079,7 @@ msgid "Power Management"
 msgstr "Energiakezelés"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4089,78 +4089,80 @@ msgstr "<None>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Kérlek válassz egy szegélyt,<br>vagy nyomd meg a <hilight>Bezár</hilight> "
-"gombot a megszakításhoz.<br><br>A folyamat késleltetésének<br> a "
-"beállításához használd a csúszkát:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Szegélykötés beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Szegélykötések"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Szegély hozzáadása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Szegély törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Szegély módosítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Mind törlése"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Alapértelmezettek visszaállítása"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Művelet"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Művelet paraméterei"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Általános beállítások"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Kötés aktiválás jóváhagyása teljes képernyős ablakoknál"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Szegélykötés sorozat"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f másodperc"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Szegélykötés hiba"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4169,27 +4171,27 @@ msgstr ""
 "Ez a kötés kulcssorozat, amit választottál, már <br>használatban van a "
 "következő folyamat által:<hilight>%s</hilight>.<br>Kérlek válassz másikat."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4486,18 +4488,17 @@ msgstr "Nagyon nagy"
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Egyedi betûk engedélyezése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Alap szöveg előnézet: 123: 我的天空!"
 
@@ -4505,38 +4506,50 @@ msgstr "Alap szöveg előnézet: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Betű osztályok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Betű osztály engedélyezése"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Betűtípus"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Stílus"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Speciális szöveg előnézet.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Megjelenítési információk (hinting)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bájtkód"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Háttér betûtípusok"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Betûtípus neve"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Háttér betûtípusok engedélyezése"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Speciális szöveg előnézet.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Útalás / Útmutatások"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4550,7 +4563,7 @@ msgstr "Ikon témák"
 msgid "Icon theme overrides general theme"
 msgstr "Az ikon téma felülírja az alapt émát"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Ikon téma"
 
@@ -4620,7 +4633,7 @@ msgid ""
 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
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Nyelv"
 
@@ -4648,7 +4661,7 @@ msgstr "%1.0f pixel"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
 msgid "Threshold for applying drag momentum"
-msgstr ""
+msgstr "Alkalmazott húzómomentum határértéke"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 #, c-format
@@ -4794,7 +4807,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Autoscroll mutató margók"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Egyéb beállítások"
 
@@ -4973,24 +4986,24 @@ msgstr "Kurzor mérete"
 msgid "Mouse Cursor"
 msgstr "Egér Kurzor"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Egér beállítások"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Egér kezelés"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Egér gyorsítás"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Gyorsítás"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Küszöb"
 
@@ -5007,7 +5020,7 @@ msgid "Images"
 msgstr "Képek"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Témák"
 
@@ -5107,33 +5120,33 @@ msgstr "%1.0f gyűjtemény"
 msgid "Performance"
 msgstr "Teljesítmény"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profil választó"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "A rendelkezésre álló profilok"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Válassz egy profilt"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Visszaállítás"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "A \"%s\" profil törlését választottad.<br><br>Biztos vagy benne?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Törlés mehet?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Új profil hozzáadása"
 
@@ -5297,23 +5310,23 @@ msgstr "Indítás"
 msgid "Theme Selector"
 msgstr "Téma választó"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Importálás..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Téma kategóriák"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Hozzárendelés"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Az összes törlése"
 
@@ -5369,38 +5382,38 @@ msgid "Wallpaper Settings"
 msgstr "Háttérkép beállítások"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "A téma hátterének használata"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Kép..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Átmenet..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Online..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "A háttérkép helye"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Minden munkaasztal"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Ez a munkaasztal"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Ez a képernyő"
 
@@ -5421,14 +5434,14 @@ msgid "Fill Options"
 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_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Vízszintes"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Függőleges"
 
@@ -5493,37 +5506,37 @@ msgstr "Eredeti fájl használata"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Válassz egy képet..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Kép importálás hiba"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Az Enlightenment nem képes importálni a képet, <br> átalakítási hibák miatt."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Háttérkép importálás hiba"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Az Enlightenment nem tudja a háttérképet importálni, <br>egy másolási hiba "
 "miatt."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5531,7 +5544,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Háttérképek váltása"
 
@@ -5644,14 +5657,6 @@ msgstr "Felhasználó által megadott ikon előnyben"
 msgid "Prefer application provided icon"
 msgstr "Alkalmazás által nyújtott ikon előnyben"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Belső ablakok"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Mindig emlékezz a belső ablakokra"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Fókusz beállítások"
@@ -5786,17 +5791,12 @@ msgid "Window Maximize Policy"
 msgstr "Ablak maximalizálási házirend"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Intelligens expanzió"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Ablak kiterjesztése"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Kitöltés az elérhető helyre"
 
@@ -5804,19 +5804,19 @@ msgstr "Kitöltés az elérhető helyre"
 msgid "Maximize Policy"
 msgstr "Maximalizálási házirend"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Maximalizálás vízszintesen"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Mindkettő"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Ablak manipukáció engedélyezése"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automatikus ablak mozgatás/átméretezés polc elrejtéskor"
 
@@ -5855,49 +5855,57 @@ msgstr "Előtérbe hozás indításkor, mozgatáskor és átméretezéskor"
 msgid "Raise when clicking to focus"
 msgstr "Előtérbe hozás amikor a fókuszra kattint"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Ablak emlékek"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Emlék(ek) törlése"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Részletek"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Nincs név>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Osztály:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Nincs osztály>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Cím:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Nincs cím>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Feladat:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Nincs feladat>"
 
@@ -6264,7 +6272,7 @@ msgid "Show Toolbar"
 msgstr "Az eszköztár megjelenítése"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Viselkedés"
 
@@ -6274,136 +6282,136 @@ msgstr "HAL ikonok megjelenítése a munkaasztalon"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "Kötetek automatikus felcsatolása"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Fájlkezelő megnyitása felcsatoláskor"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Vissza az előző könyvtárba"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Más alkalmazás..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Megnyitás"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Megnyitás ezzel..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Ismert alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Megadott alkalmazások"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Egyéni parancs"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Másolás megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "Mozgatás megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Törlés megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
-msgstr ""
+msgstr "Ismeretlen másodlagos müvelet megszakítva"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "A %s másolása kész"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "%s másolása (még: %d másodperc)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "%s áthelyezése befejezve"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "%s áthelyezése (még: %d másodperc)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
-msgstr ""
+msgstr "Törlés végrehajtva"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr ""
+msgstr "Fájlok törlése..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
-msgstr ""
+msgstr "Ismeretlen müvelet innen: %d"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
 msgid "(no information)"
-msgstr ""
+msgstr "(nincs információ)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
 #, c-format
 msgid "File: %s"
-msgstr ""
+msgstr "Fájl: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "Innen: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "Ide: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "%d müvelet(ek) végrehajtása"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr ""
+msgstr "A fájlkezelő elfoglalt"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "EFM művelet info"
 
@@ -6441,19 +6449,19 @@ msgstr "Háttér"
 msgid "Gadgets"
 msgstr "Bigyók"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Szabad"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Mindig a munkaasztalon"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Fent nyomva"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Egyéb bigyók hozzáadása"
 
@@ -6490,7 +6498,7 @@ msgstr "Kijelölt IBar forrás"
 msgid "Icon Labels"
 msgstr "Ikon címkék"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Ikon címke megjelenítése"
 
@@ -6549,43 +6557,43 @@ msgstr "Új ikon létrehozása"
 msgid "Add Application"
 msgstr "Alkalmazás hozzáadása"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBox beállítások"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Név megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Cím megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Osztály megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Ikon név megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Szegély felirat megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Ablakok megjelenítése az összes képernyőről"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Ablakok megjelenítése az aktuális képernyőről"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Minden asztal ablakainak megjelenítése"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Ablakok megjelenítése az aktív asztalról"
 
@@ -6605,11 +6613,11 @@ msgstr "Asztal váltás az egérgörgővel"
 msgid "Show desktop names"
 msgstr "Munkaasztal nevek megjelenítése"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Felugró ablakok beállításai"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Asztal váltáskor mutasd"
 
@@ -6617,69 +6625,69 @@ msgstr "Asztal váltáskor mutasd"
 msgid "Show popup for urgent windows"
 msgstr "Sürgős ablakoknak"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Kijelölés és csúsztatás gomb"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Beállításhoz kattint"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Fogd és vidd gomb"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Húzd az egész asztalt"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Billentyűfolyamat felugró ablak magassága"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Ellenállás a fogásnak"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Felugró lapozó magasság"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Felugró sebessége"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f másodperc"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Sürgős ablak beállításai"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Felugró megjelenítése a sürgős ablakon"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Felugró és sürgős ablak címkék a képernyőn"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Lapozó gomb elkapás"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6688,11 +6696,11 @@ msgstr ""
 "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:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Figyelem"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6701,29 +6709,29 @@ 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:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "%i gomb"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Lapozó felugró ablak megjelenítése"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Felugró asztal jobbra"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Felugró asztal balra"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Felugró asztal fel"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Felugró asztal le"
 
@@ -6847,7 +6855,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Hőmérséklet"
 
@@ -6859,15 +6867,15 @@ msgstr "Következő"
 msgid "Welcome to Enlightenment"
 msgstr "Üdvözlünk az Enlightenmentben"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Válassz egy"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6917,15 +6925,15 @@ msgstr "Kattints a fókuszáláshoz"
 msgid "Mouse over focuses windows"
 msgstr "Csúsztasd a mutatót az újonnan megnyitot, fókuszált ablakra"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Hozzáadni kívánt ikonok kiválasztása"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Gyorsindító"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Alkalmazások kiválasztása"
 
@@ -7049,18 +7057,67 @@ msgstr "Megadott eszköz"
 msgid "Networks"
 msgstr "Hálózatok"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Egy másik rendszertálca már létezik"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Itt csak egy rendszertálca modul lehet, de már egy létezik."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Rendszertálca"
 
+#~ msgid ""
+#~ "Copyright &copy; 1999-2008, by the Enlightenment Development Team."
+#~ "<br><br>We hope you enjoy using this software as much as we enjoyed "
+#~ "writing it.<br><br>This software is provided as-is with no explicit or "
+#~ "implied warranty. This software is governed by licensing conditions, so "
+#~ "please see the COPYING and COPYING-PLAIN licence files installed on your "
+#~ "system.<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</"
+#~ "hilight> and it is not stable. Many features are incomplete or even non-"
+#~ "existant yet and may have many bugs. You have been <hilight>WARNED!</"
+#~ "hilight>"
+#~ msgstr ""
+#~ "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<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>"
+
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Arra kéred az Enlightenmentet, hogy alkalmazza a beállításokat<br>(mint "
+#~ "pl. méret, hely, keret stílus) egy olyan ablakra,<br>amelynek "
+#~ "<hilight>nincsenek egyedi tulajdonságai</hilight>.<br><br>Ez annyit "
+#~ "jelent, hogy az ablak 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>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."
+
+#~ msgid "Window name and class"
+#~ msgstr "Az ablak neve és osztálya"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Virtuális asztalok beállítása"
 
@@ -7085,11 +7142,14 @@ msgstr "Rendszertálca"
 #~ msgid "Configure Heading"
 #~ msgstr "Címsor beállítása"
 
-#~ msgid "Scaling Factors"
-#~ msgstr "Skálázási tényezők"
+#~ msgid "Internal Windows"
+#~ msgstr "Belső ablakok"
 
-#~ msgid "Personal scaling factor"
-#~ msgstr "Személyes skálázási tényező"
+#~ msgid "Expand the window"
+#~ msgstr "Ablak kiterjesztése"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Ablak manipukáció engedélyezése"
 
 #~ msgid "Custom Grid Icons"
 #~ msgstr "Egyéni rács ikonok"
@@ -7097,8 +7157,11 @@ msgstr "Rendszertálca"
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Egyéni, intelligens rács ikonok"
 
-#~ msgid "Flip when moving mouse to the screen edge"
-#~ msgstr "Válts asztalt, ha az egér a kép szélén van"
+#~ msgid "Scaling Factors"
+#~ msgstr "Skálázási tényezők"
+
+#~ msgid "Personal scaling factor"
+#~ msgstr "Személyes skálázási tényező"
 
 #~ msgid "Defined Command"
 #~ msgstr "Megadott parancs"
@@ -7142,6 +7205,21 @@ msgstr "Rendszertálca"
 #~ msgid "%1.0f percent"
 #~ msgstr "%1.0f százalék"
 
+#~ msgid "Dismiss alert automatically"
+#~ msgstr "Riasztás elvetése automatikusan"
+
+#~ msgid "Dismiss alert after:"
+#~ msgstr "Riasztás elutasítása ezután:"
+
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Válts asztalt, ha az egér a kép szélén van"
+
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr "Válts asztalt, ha az egér a kép szélén van"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Ennyi ideig várj a váltás elõtt:"
+
 #~ msgid ""
 #~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
 #~ "this profile?"
@@ -7157,18 +7235,6 @@ msgstr "Rendszertálca"
 #~ msgid "Clone Current Profile"
 #~ msgstr "Jelenlegi profil klónozása"
 
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "Válts asztalt, ha az egér a kép szélén van"
-
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "Ennyi ideig várj a váltás elõtt:"
-
-#~ msgid "Dismiss alert automatically"
-#~ msgstr "Riasztás elvetése automatikusan"
-
-#~ msgid "Dismiss alert after:"
-#~ msgstr "Riasztás elutasítása ezután:"
-
 #~ msgid "Choose a website from list..."
 #~ msgstr "Válassz egy oldalt a listából..."
 
diff --git a/po/it.gmo b/po/it.gmo
index 8a12cda..9c0aaa5 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 9eca8b1..1973e8a 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: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-01 13:22+0200\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-10-03 12:28+0200\n"
 "Last-Translator: Massimo Maiurana <maiurana at gmail.com>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -18,28 +18,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Informazioni su Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -48,7 +48,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 ""
-"Copyright &copy; 1999-2008, del Enlightenment Development Team.<br><br>Ci "
+"Copyright &copy; 1999-2009, del Enlightenment Development Team.<br><br>Ci "
 "auguriamo che vi piacerà usare questo software tanto quanto a noi è piaciuto "
 "scriverlo.<br><br>Questo software viene fornito così-com'è senza alcuna "
 "garanzia esplicita o implicita. Questo software è regolato dalle condizioni "
@@ -77,59 +77,59 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Siete sicuri di voler uccidere questa finestra?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sì"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "No"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Siete sicuri di voler uscire?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Avete chiesto di uscire da Enlightenment.<br><br>Siete sicuri di voler "
 "uscire?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Siete sicuri di voler chiudere la sessione?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Avete richiesto la chiusura della sessione.<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Siete sicuri di voler arrestarre il sistema?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Avete richiesto di arrestare il sistema.<br><br>Siete sicuri di volerlo fare?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Siete sicuri di voler riavviare?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -137,7 +137,7 @@ msgstr ""
 "Avete richiesto di riavviare il sistema.<br><br>Siete sicuri di volerlo "
 "fare??"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -145,505 +145,505 @@ msgstr ""
 "Avete richiesto di sospendere il computer.<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Siete sicuri di voler ibernare?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Avete chiesto di ibernare il computer.<br><br>Siete sicuri di volerlo fare?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Finestre : Azioni"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Sposta"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menù"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menù finestra"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Eleva"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Abbassa"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Uccidi"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Finestre : Stato"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Commuta stato appiccicata"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Commuta stato iconificata"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Commuta stato a tutto schermo"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Massimizza"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Massimizza a tutto schermo"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo massimizzazione intelligente"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo massimizzazione espansivo"
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo massimizzazione riempitivo"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Commuta contrazione verso l'alto"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Commuta contrazione verso il basso"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Commuta contrazione verso sinistra"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Commuta contrazione verso destra"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Commuta contrazione"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Commuta stato senza bordo"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Commuta stato attaccata"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Cambia desktop verso sinistra"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Cambia desktop verso destra"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Cambia desktop verso l'alto"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Cambia desktop verso il basso"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Cambia desktop di..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Mostra il desktop"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Mostra la mensola"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Cambia desktop a..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Cambia desktop linearmente..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Passa al desktop 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Passa al desktop 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Passa al desktop 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Passa al desktop 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Passa al desktop 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Passa al desktop 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Passa al desktop 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Passa al desktop 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Passa al desktop 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Passa al desktop 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Passa al desktop 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Passa al desktop 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Passa al desktop..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Cambia desktop verso sinistra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Cambia desktop verso destra (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Cambia desktop verso l'alto (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Cambia desktop verso il basso (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Cambia desktop di...  (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Cambia desktop a... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Cambia desktop linearmente... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Cambia desktop in direzione..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Passa al desktop 0 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Passa al desktop 1 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Passa al desktop 2 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Passa al desktop 3 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Passa al desktop 4 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Passa al desktop 5 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Passa al desktop 6 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Passa al desktop 7 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Passa al desktop 8 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Passa al desktop 9 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Passa al desktop 10 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Passa al desktop 11 (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Passa al desktop... (tutti gli schermi)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Invia mouse allo schermo 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Invia mouse allo schermo 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Invia mouse allo schermo..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Invia mouse avanti di 1 schermo"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Invia mouse indietro di 1 schermo"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Invia mouse avanti/indietro di schermi..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Finestre : Spostamento"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Al desktop successivo"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Al desktop precedente"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Di # desktop..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Al desktop..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Mostra menù principale"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Mostra menù preferiti"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Mostra menù applicazioni"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Mostra menù dei client"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Mostra menù..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Esecuzione"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Applicazione"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Esci adesso"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modalità"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Commuta modalità presentazione"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Commuta modalità non in linea"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Esci"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Spegni adesso"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Spegni"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Riavvia"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Sospendi"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Iberna"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Blocca"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Ordina Finestre"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Generica : Azioni"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Azione ritardata"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Imposta come sfondo"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Scansione file desktop eseguita"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Scansione file desktop"
 
@@ -651,41 +651,40 @@ msgstr "Scansione file desktop"
 msgid "Color Selector"
 msgstr "Selettore colore"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -705,7 +704,7 @@ msgstr ""
 "funzionalità.<br>Adesso è possibile riconfigurare le cose a proprio "
 "piacimento.<br>Ci scusiamo per il disagio.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -720,11 +719,11 @@ msgstr ""
 "male, quindi la vostra configurazione è<br>stata ripristinata a scopo "
 "precauzionale ai valori predefiniti. Ci<br>scusiamo per l'inconveniente.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Impostazioni aggiornate"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -736,7 +735,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:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -752,7 +751,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:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -766,7 +765,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -780,7 +779,7 @@ msgstr ""
 "l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -792,11 +791,11 @@ msgstr ""
 "avvenuto l'errore è:<br>%s<br><br>Questo file è stato cancellato per "
 "evitare<br>corruzione di dati.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problemi scrittura configurazione di Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -804,12 +803,12 @@ msgstr "Problemi scrittura configurazione di Enlightenment"
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Basilari"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Applica"
 
@@ -817,7 +816,7 @@ msgstr "Applica"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduli"
 
@@ -826,27 +825,27 @@ msgstr "Moduli"
 msgid "Extensions"
 msgstr "Estensioni"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Contenitore %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Errore - supporto PAM mancante"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Il supporto per PAM non è stato compilato in Enlightenment,<br>quindi il "
 "blocco dello schermo viene disabilitato."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Blocco non riuscito"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -855,15 +854,15 @@ msgstr ""
 "impossessata della tastiera e/o del<br>mouse e Enlightenment non può "
 "riappropiarsene."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Inserire la password di sblocco"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Errore del sistema di autenticazione"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -874,11 +873,11 @@ msgstr ""
 "di autenticazione. Il codice d'errore è <hilight>%i</hilight>.<br>Questo è "
 "male e non dovrebbe succedere.<br>Si prega di riportare questo bug."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Attivare modalità presentazione?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -888,11 +887,11 @@ msgstr ""
 "modalità <b>presentazione</b> e disabilitare temporaneamente lo screensaver, "
 "il bloccaschermo e la gestione energetica?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "No, ma aumenta la temporizzazione"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "No, e non chiedere più"
 
@@ -919,7 +918,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor file desktop"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -964,7 +963,7 @@ msgstr "Categorie"
 msgid "Mime Types"
 msgstr "Tipi Mime"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opzioni"
 
@@ -996,23 +995,23 @@ msgstr "Seleziona un'icona"
 msgid "Select an Executable"
 msgstr "Seleziona un'eseguibile"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Copia"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Incolla"
 
@@ -1020,13 +1019,13 @@ msgstr "Incolla"
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Errore di esecuzione"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -1034,11 +1033,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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1047,308 +1046,308 @@ msgstr ""
 "Enlightenment non ha potuto avviare l'applicazione:<br><br>%"
 "s<br><br>L'applicazione non è partita"
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Errore d'esecuzione dell'applicazione"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "L'esecuzione di %s è terminata inaspettatamente"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s ha restituito il codice d'uscita %1$i."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s è stato fermato da un segnale d'interruzione"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s è stato fermato da un segnale di uscita"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s è stato fermato da un segnale di aborto"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s è stato fermato da un errore di segmentazione"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s è stato fermato da una pipe rotta"
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s è stato fermato da un segnale di terminazione"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s è stato fermato da un errore del bus"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s è stato fermato dal segnale numero %i"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Log di errore"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Non ci sono messaggi d'errore."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Salva questo messaggio"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informazioni sull'errore"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informazioni sui segnali d'errore"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Dati dell'output"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Non ci sono output."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Percorso inesistente"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s non esiste."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Errore di montaggio"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Impossibile montare il dispositivo"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr "Errore di smontaggio"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Impossibile smontare il dispositivo"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Errore di espulsione"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Impossibile espellere il dispositivo"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i File"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Collega"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Abortisci"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Eredita impostazioni genitore"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modalità visualizzazione"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Aggiorna vista"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Ricorda ordinamento"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Ordina adesso"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nuova directory"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Rinomina"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Smonta"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Monta"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Espelli"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Proprietà"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Usa predefinito"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Icone"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Icone personalizzabile"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Elenco"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Dimensione icona (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Imposta sfondo..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Imposta sfumatura..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Crea nuova directory"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nome directory:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Rinomina %s in:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Rinomina file"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Ritenta"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Errore"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "No a tutti"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Sì a tutti"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Avvertimento"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Il file esiste già, lo sovrascrivo?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignora questo"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignora tutto"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "C'è stato un errore nell'esecuzione di un'operazione.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Conferma eliminazione"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1361,144 +1360,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Proprietà del file"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "File:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Modificato:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tipo di file"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permessi"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Proprietario:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Altri possono leggere"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Altri possono scrivere"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Proprietario può leggere"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Proprietario può scrivere"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Predefinito"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Personalizzata"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Usa questa icona per tutti i file di questo tipo"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Informazioni collegamento"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Seleziona un'immagine"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume sconosciuto"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Dispositivo rimovibile"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Sposta questo gadget"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Liscio"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Incassato"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Scorri automaticamente contenuto"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Ridimensionabile"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Inizio spostamento/ridimensionamento di questo gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Elimina questo gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Fine spostamento/ridimensionamento di questo gadget"
 
@@ -1510,7 +1513,7 @@ msgstr ""
 "Un'istanza precedente di Enlightenment è ancora\n"
 "attiva su questo schermo. Abortisco l'avvio.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Blocchi finestre"
 
@@ -1544,21 +1547,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Livello"
 
@@ -1567,12 +1570,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Stato di contratta"
 
@@ -1581,7 +1584,7 @@ msgid "Maximized state"
 msgstr "Stato di massimizzata"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Stato a tutto schermo"
 
@@ -1589,7 +1592,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Stile di bordo"
 
@@ -1637,115 +1640,116 @@ msgstr "Stacca dal desktop"
 msgid "More..."
 msgstr "Altro..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Iconifica"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Massimizza verticalmente"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Massimizza orizzontalmente"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Dimensioni normali"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Scorciatoia di tastiera"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Al menù preferiti"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Alla barra"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Bordo"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Salta"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Stato"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Ricorda..."
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Proprietà della finestra"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Sempre sulle altre"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normale"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Sempre sotto le altre"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Seleziona stile del bordo"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Usa preferenza predefinita per l'icona"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Usa icona fornita dall'applicazione"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Usa icona impostata dall'utente"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Contratta"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Appiccicata"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "A tutto schermo"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista finestre"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Taskbar"
 
@@ -1761,7 +1765,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Proprietà ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titolo"
 
@@ -1853,11 +1857,11 @@ msgstr "Proprietà NetWM"
 msgid "Modal"
 msgstr "Modale"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Salta Taskbar"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Salta Pager"
 
@@ -1865,15 +1869,15 @@ msgstr "Salta Pager"
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Ricordi finestra"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "La finestra non ha proprietà univoche"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1898,11 +1902,11 @@ msgstr ""
 "impostazioni saranno accettate. Nel dubbio<br>premere <hilight>Annulla</"
 "hilight> e nulla cambierà."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nessuna corrispondenza impostata"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1914,115 +1918,101 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"State cercando di chiedere ad Enlightenment di ricordarsi di<br>applicare "
-"caratteristiche (come dimensione, locazione, stile<br>di bordo ecc.) ad una "
-"finestra che <hilight>non ha proprietà<br>univoche</hilight>.<br><br>Questo "
-"significa che condivide proprietà come nome/classe,<br>transitorietà, ruolo, "
-"eccetera con più di un'altra finestra<br>presente sullo schermo, e quindi le "
-"stesse caratteristiche<br>saranno ricordate anche per le altre finestre con "
-"le stesse<br>proprietà.<br><br>Si può abilitare l'opzione <hilight>Ricorda "
-"solo una finestra</hilight> se si<br>desidera che venga modificata una sola "
-"istanza di questa finestra<br>invece che tutte le istanze.<br><br>Questo è "
-"solo un avvertimento per il caso in cui non si voglia<br>che questo accada. "
-"Se lo si desidera, basta premere il bottone<br><hilight>Applica</hilight> o "
-"<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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nulla"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Dimensione e posizione"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Blocchi"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Dimensione, posizione e blocchi"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Tutto"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Ricorda per mezzo di:"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nome e classe"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Nome"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Classe"
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Ruolo"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tipo"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "I caratteri jolly sono permessi"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Transitorietà"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Proprietà da ricordare:"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Preferenza icona"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Desktop virtuale"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Schermo attuale"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Fuori lista finestre"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "File o nome applicazione (.desktop)"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Ricorda solo una istanza"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Avvia questo programma al login"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Prendi sempre fuoco all'avvio"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Mantieni proprietà attuali"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Avvia questo programma al login"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Impostazioni"
@@ -2041,24 +2031,24 @@ msgstr "Mensola"
 msgid "Module Settings"
 msgstr "Gestione moduli"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Moduli disponibili"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Carica modulo"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Moduli caricati"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Scarica modulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2092,8 +2082,8 @@ msgstr "Elimina gadget"
 msgid "Toolbar Settings"
 msgstr "Impostazioni barra strumenti"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Posizione"
 
@@ -2120,12 +2110,12 @@ msgid "Favorite Applications"
 msgstr "Applicazioni preferite"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2134,7 +2124,7 @@ msgstr "Applicazioni"
 msgid "Windows"
 msgstr "Finestre"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Finestre perse"
 
@@ -2170,129 +2160,128 @@ msgstr "(Nessuna Applicazione)"
 msgid "Set Virtual Desktops"
 msgstr "Imposta desktop virtuali"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Nessuna Finestra)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Nessun nome!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Nessuna mensola)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Mensola #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Aggiungi mensola"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Elimina mensola"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Impostazioni mensole porta-gadget"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Piccolissima"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Piccolo"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Media"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Grandissima"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Imposta contenuti..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Al di sopra di tutto"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Al di sotto delle finestre"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Al di sotto di tutto"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Consenti alle finestre di sovrapporsi alla mensola"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Riduci alla dimensione del contenuto"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixel"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Stili"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Scomparsa automatica"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Nascondi automaticamente la mensola"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Mostra al passaggio del mouse"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Mostra al clic del mouse"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Timeout per la scomparsa"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f secondi"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Durata scomparsa"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Mostra su tutti i desktop"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Mostra sui desktop specificati"
 
@@ -2549,7 +2538,7 @@ msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di intl (internazionalizzazione)."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2557,11 +2546,11 @@ msgstr ""
 "Enlightenment non riesce a configurare la schermata d'avvio.\n"
 "Forse siete a corto di memoria?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Test supporto formato"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2570,7 +2559,7 @@ msgstr ""
 "buffer. Controllare che Evas abbia il supporto per il motore di\n"
 "rendering software Buffer.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2578,7 +2567,7 @@ msgstr ""
 "Enlightenment ha riscontrato che Evas non può caricare file PNG.\n"
 "Controllare che Evas abbia il supporto per il loader PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2586,7 +2575,7 @@ msgstr ""
 "Enlightenment ha riscontrato che Evas non può caricare file JPEG.\n"
 "Controllare che Evas abbia il supporto per il loader JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2594,7 +2583,7 @@ msgstr ""
 "Enlightenment ha riscontrato che Evas non può caricare file EET.\n"
 "Controllare che Evas abbia il supporto per il loader EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2604,11 +2593,11 @@ msgstr ""
 "Controllare che Evas abbia il supporto per fontconfig e che il\n"
 "fontconfig di sistema dfeinisca un font 'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Impostazione schermi"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2617,233 +2606,233 @@ msgstr ""
 "da parte di Enlightenment è fallita. Forse c'è un altro window\n"
 "manager in esecuzione?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Impostazione screensaver"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 "Enlightenment non riesce a configurare lo\n"
 "screensaver di X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Impostazione bloccashermo"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di blocco dello schermo."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Impostazione percorsi"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Controlli di sistema"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 "Enlightenment non riesce a il sistema di comandi di sistema.\n"
 "\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Impostazione azioni"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di azioni."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Sistema di esecuzione"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema \"exec\"."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Ripristino impostazioni da ricordare"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr ""
-"Enlightenment non riesce a configurare le\n"
-"impostazioni da ricordare."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Impostazione file manager"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment non riesce ad inizializzare il File manager.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Sistema di messaggi"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di messaggi."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Impostazione drag and drop"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di 'drag & drop'."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr "Impostazioni gestione cattura dell'input"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di gestione dell'input catturato."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Impostazione moduli"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di moduli."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Ripristino impostazioni da ricordare"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+"Enlightenment non riesce a configurare le\n"
+"impostazioni da ricordare."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Impostazione classi colore"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di classi colore."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Controllo dei gadget"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di controllo dei gadget."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Impostazione DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 "Enlightenment non riesce a configurare le\n"
 "impostazioni DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Imposta modi risparmio energetico"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di modi risparmio energetico."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Impostazione sfondo"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di sfondi del desktop."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Impostazione mouse"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 "Enlightenment non riesce a configurare le\n"
 "impostazion del mouse."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Combinazioni tastiera e mouse"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di binding (associazioni)."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Finestre popup"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di popup."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Impostazione mensole porta-gadget"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di mensole porta-gadget."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Generatore miniature"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di thumbnailing (anteprime).\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Ordinamento dei file"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 "Enlightenment non riesce a configurare il suo\n"
 "sistema di ordinamento file."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Carica moduli"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2856,11 +2845,11 @@ msgstr ""
 "finestra di configurazione<br>dei moduli dovrebbe permettervi di "
 "selezionare<br>nuovamente i vostri moduli."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment è andato subito in crash ed è stato riavviato"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2873,15 +2862,15 @@ msgstr ""
 "finestra di configurazione<br>dei moduli dovrebbe permettervi di "
 "selezionare<br>nuovamente i vostri moduli."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Configura mensole porta-gadget"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Quasi fatto"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2890,11 +2879,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Errore nel caricamento del modulo"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2903,11 +2892,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Il modulo non contiene tutte le funzioni necessarie"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2918,12 +2907,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Modulo %s di Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Volete disattivare questo modulo?<br>"
 
@@ -2937,11 +2926,11 @@ msgstr ""
 "modalità <b>presentazione</b> e disabilitare temporaneamente lo screensaver, "
 "il bloccaschermo e la gestione energetica?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Siete sicuri di voler eliminare questa mensola?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2949,19 +2938,19 @@ msgstr ""
 "Avete chiesto di eliminare questa mensola.<br><br>Siete sicuri di volerla "
 "eliminare?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Fine spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Inizio spostamento/ridimensionamento oggetti"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Imposta contenuti della mensola"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Elimina questa mensola"
 
@@ -2978,11 +2967,11 @@ msgstr "Controllo permessi del sistema"
 msgid "System Check Done"
 msgstr "Controllo sistema eseguito"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problemi chiusura sessione"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2992,31 +2981,31 @@ msgstr ""
 "applicazioni rifiutano di chiudersi.<br>Volete chiudere comunque la sessione "
 "senza aspettare<br>prima la chiusura di queste applicazioni?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Esci adesso"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Attendi ancora"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Annulla chiusura"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Chiusura in corso"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Chiusura in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment è occupato con un'altra richiesta"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -3024,7 +3013,7 @@ msgstr ""
 "Chiusura un corso.<br>Non è possibile richiedere ulteriori azioni di "
 "sistema<br>una volta che è stata richiesta la chiusura di sessione."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -3032,7 +3021,7 @@ msgstr ""
 "Spegnimento in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>una volta che è iniziato l'arresto del sistema."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -3040,7 +3029,7 @@ msgstr ""
 "Riavvio in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>una volta che è iniziato il riavvio del sistema."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -3048,7 +3037,7 @@ msgstr ""
 "Sospensione in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>finchè non è terminata la procedura di sospensione."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -3056,55 +3045,55 @@ msgstr ""
 "Ibernazione in corso.<br>Non è possibile eseguire ulteriori azioni di "
 "sistema<br>finchè non è terminata la procedura di ibernazione."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! Questo non dovrebbe succedere"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Spegnimento fallito."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Riavvio fallito."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Sospensione fallita."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Ibernazione fallita."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Spegnimento"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Spegnimento in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Riavvio"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Riavvio in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Sospensione"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Sospensione in corso.<br><hilight>Attendere prego.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Ibernazione in corso"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Ibernazione in corso.<br><hilight>Attendere prego.</hilight>"
 
@@ -3120,11 +3109,11 @@ msgstr "Imposta come tema"
 msgid "Set Toolbar Contents"
 msgstr "Imposta contenuti della barra strumenti"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Impossibile uscire - finestre immortali."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3134,77 +3123,77 @@ msgstr ""
 "<br>Questo significa che Enlightenment non uscirà finchè queste "
 "finestre<br>non saranno chiuse o avranno il blocco Perpetua disabilitato.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Byte"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f MB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "In futuro"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Nell'ultimo minuto"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li anni fa"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li mesi fa"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li settimane fa"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li giorni fa"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li ore fa"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuti fa"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3224,51 +3213,51 @@ msgstr "Su"
 msgid "Down"
 msgstr "Giù"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Aggiungi ai preferiti"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Directory superiore"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permessi:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificato:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Tu"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protetto"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Sola lettura"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Proibito"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Lettura-scrittura"
 
@@ -3284,57 +3273,57 @@ msgstr "Impostazioni di base"
 msgid "Show alert when battery is low"
 msgstr "Allarme se il livello batteria è basso"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Controlla ogni:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tick"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Campionamento"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Mostra allarme a batteria quasi scarica"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Soglia allarme batteria:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Soglia distacco automatico:"
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sec"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Allarme"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Rileva automaticamente"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3342,12 +3331,12 @@ msgstr "Rileva automaticamente"
 msgid "Internal"
 msgstr "Interni"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardware"
 
@@ -3355,24 +3344,24 @@ msgstr "Hardware"
 msgid "Battery"
 msgstr "Battery"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Basso livello batteria!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Consigliata alimentazione AC."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/D"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Indicatore di carica"
 
@@ -3380,20 +3369,20 @@ msgstr "Indicatore di carica"
 msgid "Clock"
 msgstr "Clock"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Pannello impostazioni"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Presentazione"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Non in linea"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Modalità"
 
@@ -3419,7 +3408,7 @@ msgid "Restart Applications"
 msgstr "Applicazioni per il riavvio"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Tutte le applicazioni"
 
@@ -3441,12 +3430,12 @@ msgstr "IBar, altri"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menù"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Stile di bordo predefinito"
 
@@ -3454,14 +3443,14 @@ msgstr "Stile di bordo predefinito"
 msgid "Window Border Selection"
 msgstr "Selezione bordo della finestra"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Ricorda questo bordo alla prossima apertura della finestra"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3487,7 +3476,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3755,9 +3744,9 @@ msgid "Desktop Name"
 msgstr "Nome desktop"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nome:"
 
@@ -3823,10 +3812,10 @@ msgstr "%1.0f minuti"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personali"
@@ -3858,8 +3847,8 @@ msgstr "Mostra sulla zona #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3980,46 +3969,51 @@ msgstr "Fattore dell'asse Y %.2f"
 msgid "Virtual Desktops"
 msgstr "Desktop virtuali"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Impostazioni finestre di dialogo"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Impostazioni generali"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Disabilita finestre di conferma"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Finestre normali"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Modo predefinito finestre di configurazione"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Impostazioni di base"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Impostazioni avanzate"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr "Ricorda dimensione e posizione finestre di dialogo"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Modo predefinito finestre di dialogo"
 
@@ -4088,31 +4082,31 @@ msgstr "Ripristina"
 msgid "Screen Resolution Settings"
 msgstr "Risoluzione dello schermo"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Ripristina al login"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Aggiornamento"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotazione"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Specularità"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Funzionalità mancanti"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4126,11 +4120,11 @@ msgstr ""
 "dovuto al fatto che quando si<br>è compilato <hilight>ecore</hilight> non è "
 "stato rilevato<br>il supporto XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Frequenza di refresh non trovata"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4190,7 +4184,7 @@ msgid "Power Management"
 msgstr "Gestione energetica"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4200,78 +4194,84 @@ msgstr "<Nessuna>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
-"Selezionare un bordo dello schermo<br> o cliccare <hilight>Chiudi</hilight> "
-"per abortire.<br><br>Per cambiare il ritardo di questa<br>azione usare il "
-"cursore:"
+"Selezionare un bordo dello schermo<br>o cliccare <hilight>Chiudi</hilight> "
+"per abortire.<br><br>Si può anche specificare un ritardo<br> per questa "
+"azione usando il cursore,<br>oppure fare in modo che risponda ai<br>clic del "
+"mouse sul bordo:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Configurazione azioni sui bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Bordi dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Aggiungi bordo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Elimina bordo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Modifica bordo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Cancella tutto"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Ripristina associazioni predefinite"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametri azione"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Opzioni generali"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Consenti azioni con finestre a tutto schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Sequenza bordo dello schermo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f secondi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr "Bordo cliccabile"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Errore azione sul bordo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4281,27 +4281,27 @@ msgstr ""
 "dall'azione <hilight>%s</hilight>.<br>Si prega di scegliere una sequenza "
 "diversa."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "Ctrl"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "Alt"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "Maiuscole"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "Windows"
 
@@ -4599,18 +4599,17 @@ msgstr "Molto grande"
 msgid "%d pixels"
 msgstr "%d pixel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Abilita classi font personalizzate"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Testo anteprima di base: 123: 我的天空!"
 
@@ -4618,38 +4617,50 @@ msgstr "Testo anteprima di base: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Configurazione classi font"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Abilita classe font"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Font"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Stile"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Testo anteprima avanzato.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Hinting (ottimizzazione)"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Font alternativi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nome font alternativo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Abilita font alternativi"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Testo anteprima avanzato.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Hinting / alternative"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4663,7 +4674,7 @@ msgstr "Temi delle icone"
 msgid "Icon theme overrides general theme"
 msgstr "Il tema icone prevale sul tema generale"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema icone"
 
@@ -4735,7 +4746,7 @@ msgstr ""
 "errore di copia."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Lingua"
 
@@ -4909,7 +4920,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Margine di autoscorrimento del cursore"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Opzioni varie"
 
@@ -5088,24 +5099,24 @@ msgstr "Dimensione del puntatore"
 msgid "Mouse Cursor"
 msgstr "Puntatore del mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Impostazioni del mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Mano utilizzata"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Accelerazione mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Accelerazione"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Soglia"
 
@@ -5122,7 +5133,7 @@ msgid "Images"
 msgstr "Immagini"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temi"
 
@@ -5222,35 +5233,35 @@ msgstr "%1.0f collezioni"
 msgid "Performance"
 msgstr "Prestazioni"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Selettore profili"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Profili disponibili"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Selezionare un profilo"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Riavvia"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 "Avete chiesto di eliminare il profilo \"%s\".<br><br>Siete sicuri di volerlo "
 "fare?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Confermate cancellazione?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Aggiungi nuovo profilo"
 
@@ -5415,23 +5426,23 @@ msgstr "Avvio"
 msgid "Theme Selector"
 msgstr "Selettore temi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr "Importa..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr "Online..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Categorie dei temi"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Assegna"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Pulisci tutto"
 
@@ -5488,38 +5499,38 @@ msgid "Wallpaper Settings"
 msgstr "Impostazioni sfondo"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Usa sfondo del tema"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Immagine..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradiente..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Online..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Posizionamento dello sfondo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Tutti i desktop"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Questo desktop"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Questo schermo"
 
@@ -5540,14 +5551,14 @@ msgid "Fill Options"
 msgstr "Opzioni di riempimento"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Orizzontale"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Verticale"
 
@@ -5612,38 +5623,38 @@ msgstr "Usa file originale"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Selezionare un'immmagine..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Errore importazione immagine"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment non ha potuto importare l'immagine<br>a causa di errori di "
 "conversione."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Errore importazione sfondo"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5651,7 +5662,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Sfondi su Exchange"
 
@@ -5763,14 +5774,6 @@ msgstr "Preferisci icona dell'utente"
 msgid "Prefer application provided icon"
 msgstr "Preferisci icona dell'applicazione"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Finestre interne"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Ricorda sempre finestre interne"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Fuoco delle finestre"
@@ -5903,17 +5906,12 @@ msgid "Window Maximize Policy"
 msgstr "Regole massimizzazione finestra"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Intelligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Espansiva"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Riempitiva"
 
@@ -5921,19 +5919,19 @@ msgstr "Riempitiva"
 msgid "Maximize Policy"
 msgstr "Regole di massimizzazione"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Direzione massimizzazione"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Entrambi"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Consenti manipolazione finestre"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr "Consenti manipolazione finestre massimizzate"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Sposta/ridimensiona finestre alla scomparsa della mensola"
 
@@ -5972,49 +5970,57 @@ msgstr "Eleva quando si muove/ridimensiona"
 msgid "Raise when clicking to focus"
 msgstr "Eleva quando la si clicca per il fuoco"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: 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:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr "Ricorda finestre di dialogo interne"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr "Ricorda finestre del file manager"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Elimina impostazioni da ricordare"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Dettagli"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Nessun nome>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Classe:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Nessuna classe>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titolo:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Nessun titolo>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Nessun ruolo>"
 
@@ -6388,7 +6394,7 @@ msgid "Show Toolbar"
 msgstr "Mostra barra strumenti"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Comportamento"
 
@@ -6404,95 +6410,95 @@ msgstr "Monta volumi all'inserimento"
 msgid "Open filemanager on mount"
 msgstr "Apri filemanager al montaggio"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Directory superiore"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Altre applicazioni..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Apri"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Apri con..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Applicazioni conosciute"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Applicazioni specifiche"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Comando personalizzato"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr "Copiatura abortita"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr "Spostamento abortito"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr "Eliminazione abortita"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr "Operazione sconosciuta dallo slave abortita"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr "Copiatura di %s eseguita"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr "Copio %s (rimangono %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr "Spostamento di %s eseguito"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr "Sposto %s (rimangono %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr "Eliminazione eseguita"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr "Eliminazione file..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6518,16 +6524,16 @@ msgstr "Da: %s"
 msgid "To: %s"
 msgstr "A: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr "Processo %d operazioni"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr "Filemanager in attesa"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "Info operazioni EFM"
 
@@ -6565,19 +6571,19 @@ msgstr "Sfondo"
 msgid "Gadgets"
 msgstr "Gadget"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Libero"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Sempre sul desktop"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "Sopra le finestre premendo"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Aggiungi altri gadget"
 
@@ -6614,7 +6620,7 @@ msgstr "Fonte delle icone"
 msgid "Icon Labels"
 msgstr "Etichette icone"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Mostra etichette icone"
 
@@ -6675,43 +6681,43 @@ msgstr "Crea nuova icona"
 msgid "Add Application"
 msgstr "Aggiungi applicazione"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Impostazioni di IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Mostra nome"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Mostra titolo"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Mostra classe"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Mostra nome icona"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Visualizza didascalia del bordo"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Mostra finestre di tutti gli schermi"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Mostra finestre dello schermo attuale"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Mostra finestre di tutti i desktop"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Mostra finestre del desktop attivo"
 
@@ -6731,11 +6737,11 @@ msgstr "Cambia desktop con la rotella del mouse"
 msgid "Show desktop names"
 msgstr "Mostra nomi dei desktop"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Impostazioni del popup"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Mostra popup al cambio di desktop"
 
@@ -6743,69 +6749,69 @@ msgstr "Mostra popup al cambio di desktop"
 msgid "Show popup for urgent windows"
 msgstr "Mostra popup con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Selezione e trasferimento"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Clicca per impostare"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Bottone per trascinamento e rilascio"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Trascina l'intero desktop"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Altezza popup da tastiera"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Resistenza al trascinamento"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Altezza del pager"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Velocità del popup"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f secondi"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Impostazioni finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Mostra popup con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Appicica popup sullo schermo con finestre urgenti"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Cattura bottone"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6813,11 +6819,11 @@ msgstr ""
 "Premere un pulsante del mouse,<br><br>o <hilight>Escape</hilight> per "
 "abortire"
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Attenzione"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6827,29 +6833,29 @@ msgstr ""
 "usato dal codice<br>interno per il menù contestuale.<br>Questo tasto "
 "funziona solo nel popup."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Bottone %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Mostra popup del pager"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Popup del desktop a destra"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Popup del desktop a sinistra"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Popup del desktop sopra"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Popup del desktop sotto"
 
@@ -6973,7 +6979,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperature"
 
@@ -6985,15 +6991,15 @@ msgstr "Avanti"
 msgid "Welcome to Enlightenment"
 msgstr "Benvenuti in Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Selezionarne una"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profilo"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7043,15 +7049,15 @@ msgstr "Cliccare per dare fuoco a finestre"
 msgid "Mouse over focuses windows"
 msgstr "Passare mouse per dare fuoco a finestre"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Selezionare le icone da aggiungere"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Avvio veloce da barra"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Selezionare le applicazioni"
 
@@ -7176,33 +7182,16 @@ msgstr "Dispositivo specifico"
 msgid "Networks"
 msgstr "Reti"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
-msgstr "Esiste un'altro vassoio di sistema"
+msgstr "Esiste un'altra istanza di Systray"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
-"Può esserci un solo vassoio di sistema, e attualmente ne esiste già un'altro."
+"Può esserci una sola istanza di Systray, e attualmente ne esiste già "
+"un'altra."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Vassoio di sistema"
-
-#~ msgid "Wallpaper 2"
-#~ msgstr "Sfondo 2"
-
-#~ msgid "Loading files..."
-#~ msgstr "Caricamento file..."
-
-#~ msgid "Run Everything Dialog"
-#~ msgstr "Lanciatore universale"
-
-#~ msgid "Run Everything"
-#~ msgstr "Lanciatore"
-
-#~ msgid "Everything Settings"
-#~ msgstr "Impostazioni del lanciatore universale"
-
-#~ msgid "idle"
-#~ msgstr "in attesa"
+msgstr "Systray"
diff --git a/po/ja.gmo b/po/ja.gmo
index 6d2b5c8..5734165 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index b536beb..11d7d45 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-01-18 16:33+0900\n"
 "Last-Translator: Yasufumi Haga <yasufumi.haga at nifty.com>\n"
 "Language-Team: E17-jp <LL at li.org>\n"
@@ -19,28 +19,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment について"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "閉じる"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -69,578 +69,578 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "本当にこのウィンドウを強制終了しますか"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "はい"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "いいえ"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "本当に終了しますか"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Enlightenment を終了しようとしています.<br><br>本当に終了しますか."
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "本当にログアウトしますか"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "ログアウトしようとしています.<br><br>本当にログアウトしますか"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "本当にシャットダウンしますか"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "シャットダウンしようとしています.<br><br>本当にシャットダウンしますか"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "本当に再起動しますか"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "再起動しようとしています.<br><br>本当に再起動しますか"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "サスペンドしようとしています.<br><br>本当にサスペンドしますか"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "ハイバネートしようとしています.<br><br>本当にハイバネートしますか"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "ウィンドウ: 動作"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "サイズ変更"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "メニュー"
 
 #
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "ウィンドウメニュー"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "上げる"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "下げる"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "強制終了"
 
 #
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "ウィンドウ: 状態"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "常時表示モード反転"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "アイコンモード反転"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "全画面モード反転"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "最大化"
 
 #
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "垂直に最大化"
 
 #
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "全面表示"
 
 #
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化モード \"賢く\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化モード \"拡大\""
 
 #
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化モード \"空きまで"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "上方シェード反転"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "下方シェード反転"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "左方シェード反転"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "右方シェード反転"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "シェード状態反転"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "ボーダー無し状態反転"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "位置固定状態反転"
 
 #
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "下のデスクトップへ移動する"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "デスクトップを指定分移動する"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "デスクトップ背景を出す"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "シェルフを出す"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "デスクトップを順に移動する..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "デスクトップ 0 に切り替える"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "デスクトップ 1 に切り替える"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "デスクトップ 2 に切り替える"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "デスクトップ 3 に切り替える"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "デスクトップ 4 に切り替える"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "デスクトップ 5 に切り替える"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "デスクトップ 6 に切り替える"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "デスクトップ 7 に切り替える"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "デスクトップ 8 に切り替える"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "デスクトップ 9 に切り替える"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "デスクトップ 10 に切り替える"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "デスクトップ 11 に切り替える"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "指定のデスクトップに切り替える"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "左のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "右のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "上のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "下のデスクトップへ移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "デスクトップを指定分移動する(全スクリーン)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "指定のデスクトップへ移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "デスクトップを順に移動する...(全スクリーン)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "指定のデスクトップへ移動する..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "デスクトップ 0 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "デスクトップ 1 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "デスクトップ 2 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "デスクトップ 3 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "デスクトップ 4 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "デスクトップ 5 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "デスクトップ 6 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "デスクトップ 7 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "デスクトップ 8 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "デスクトップ 9 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "デスクトップ 10 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "デスクトップ 11 に切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "指定のデスクトップに切り替える(全スクリーン)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "画面"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "マウスをスクリーン 0 へ移す"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "マウスをスクリーン 1 へ移す"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "マウスを指定のスクリーンへ移す..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "マウスを次のスクリーンへ移す"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "マウスを前のスクリーンへ戻す"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "マウスを指定のスクリーン分だけ前後に移す..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "ウィンドウ: 移動"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "次のデスクトップへ"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "前のデスクトップへ"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "指定分のデスクトップを移動"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "指定のデスクトップへ..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "メインメニューを表示する"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "お気に入りメニューを表示する"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "全アプリケーションメニューを表示する"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "クライアントメニューを表示する"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "指定のメニューを表示する..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "コマンドの実行"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "コマンド"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "アプリケーション"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "終了"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 #, fuzzy
 msgid "Exit Now"
 msgstr "終了"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s モジュール"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "全画面モード反転"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "シェード状態反転"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "システム"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "再起動"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "ハイバネート"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 #, fuzzy
 msgid "Lock"
 msgstr "ロック"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "ウィンドウ整頓"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "一般: 動作"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "遅延動作"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "背景に設定する"
 
 #
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "desktop ファイルスキャン完了"
 
 #
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "desktop ファイルスキャン"
 
@@ -649,41 +649,40 @@ msgstr "desktop ファイルスキャン"
 msgid "Color Selector"
 msgstr "プロファイルの選択"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "了解"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -700,7 +699,7 @@ msgstr ""
 "いデフォルト設定<br>を追加すれば更新されます. これで好きなように設定できます."
 "ちょっと面倒ですが, <br>よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -714,11 +713,11 @@ msgstr ""
 "<br>これではまずいので, 念のためデフォルトの設定に置き換えました.<br>ご不便を"
 "おかけしますが, よろしくお願いします.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "設定が更新されました"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -730,7 +729,7 @@ msgstr ""
 "ルです.<br>%s<br><br>壊れたデータが使われないように, このファイルは削除されま"
 "した.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -745,7 +744,7 @@ msgstr ""
 "のは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, このファ"
 "イルは削除されました.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -758,7 +757,7 @@ msgstr ""
 "時に処理していたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われない"
 "ように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -771,7 +770,7 @@ msgstr ""
 "ていたのは以下のファイルです.<br>%s<br><br>壊れたデータが使われないように, こ"
 "のファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -782,11 +781,11 @@ msgstr ""
 "ん.<br><br>エラー発生時に処理していたのは以下のファイルです.<br>%s<br><br>壊"
 "れたデータが使われないように, このファイルは削除されました.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment の設定書込時の問題"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -794,12 +793,12 @@ msgstr "Enlightenment の設定書込時の問題"
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "基本設定"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "適用"
 
@@ -807,7 +806,7 @@ msgstr "適用"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "モジュール"
 
@@ -816,26 +815,26 @@ msgstr "モジュール"
 msgid "Extensions"
 msgstr "拡張機能"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "コンテナ %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "エラー - PAMがサポートされていません"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "EnlightenmentにPAMサポートが組み込まれていないため, デスクロックは無効です."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "ロックに失敗しました."
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -843,15 +842,15 @@ msgstr ""
 "キーボードかマウス, またはその両方を掴んで離さないアプリケーションがあるため,"
 "<br>デスクトップをロックできませんでした."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "ロック解除パスワードを入力して下さい"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "認証システムエラー"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -862,22 +861,22 @@ msgstr ""
 "コードは <hilight>%i</hilight> です.<br>これはまずいですね. 起きてはいけない"
 "ことです. ぜひバグ報告して下さい."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -904,7 +903,7 @@ msgid "Desktop Entry Editor"
 msgstr "デスクトップエントリエディタ"
 
 #
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -949,7 +948,7 @@ msgstr "カテゴリ"
 msgid "Mime Types"
 msgstr "MIME タイプ"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "オプション"
 
@@ -982,23 +981,23 @@ msgstr "アイコンを選択する"
 msgid "Select an Executable"
 msgstr "プログラムの選択"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "削除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "カット"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "コピー"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "貼り付け"
 
@@ -1006,13 +1005,13 @@ msgstr "貼り付け"
 msgid "Select All"
 msgstr "すべて選択"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "実行エラー"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -1020,11 +1019,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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1033,320 +1032,320 @@ msgstr ""
 "Enlightenment で以下のアプリケーションが実行できませんでした.<br><br>%"
 "s<br><br>このアプリケーションの起動に失敗しました."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "アプリケーション実行エラー"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s が突然停止しました"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s から終了コード %1$i が返りました"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s に割り込みシグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s に Quit シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s に Abort シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s に浮動小数点エラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s に割り込み不能 kill シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s にセグメンテーションフォールトによる割り込みが入りました"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s に Broken Pipe による割り込みが入りました"
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s に終了シグナルによる割り込みが入りました"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s にバスエラーによる割り込みが入りました"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s にシグナル番号 %i の割り込みが入りました"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***残りは切り捨てられました. 出力を保存してから参照してください.***\n"
 
 #
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "エラーログ"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "エラーメッセージはありませんでした"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "このメッセージを保存する"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "このエラーログは %s/%s.log に保存されます"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "エラー情報"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "エラーシグナル情報"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "出力データ"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "出力はありませんでした"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "存在しないパス"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s が存在しません"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "実行エラー"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "実行エラー"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
 #
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "エラー"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "ファイル数 %i"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 #, fuzzy
 msgid "Link"
 msgstr "定速で動かす"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "中止"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "インタラクションの設定"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "表示モード"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "内容を更新する"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "隠しファイルを表示する"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "順序をを記憶する"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "ただちにソートする"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新しいディレクトリ"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "名前変更"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "ミュート"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "プロパティ"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "デフォルトを使う"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "グリッドアイコン"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "カスタムアイコン"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "リスト"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "アイコンサイズ (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "背景に設定する"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "シェルフの中身の設定"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "解除"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "ディレクトリを新規作成する"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "新しいディレクトリ名"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "名前を %s から変更:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "ファイル名を変更する"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "再実行"
 
 #
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "エラー"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "すべて拒否"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "すべて了承"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "起動中"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "以下が削除できません.<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "これを無視"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "すべて無視"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "操作中にエラーが起きました.<br>%s"
 
 #
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "削除確認"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "以下を本当に削除しますか.<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1359,144 +1358,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "ファイルプロパティ"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "ファイル:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "サイズ:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "最終更新日:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "ファイルタイプ:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "許可情報"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "所有者"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "誰でも読める"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "誰でも書ける"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "所有者が読める"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "所有者が書ける"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "デフォルト"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "サムネイル"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "ユーザー指定"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "この型のファイルはすべてこのアイコンを使う"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "リンク情報"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "画像を選択する"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知のボリュームです"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "着脱可能媒体"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "このガジェットを削除する"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "普通"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "埋め込む"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "外観"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "自動的にスクロールする"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "大きさを変える"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を始める"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "このガジェットを削除する"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "このガジェットの移動/大きさ変更を終了する"
 
@@ -1508,7 +1512,7 @@ msgstr ""
 "このスクリーンにはEnlightenmentの前回のインスタンスがまだ残っています.\n"
 "起動を中止します.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "ウィンドウロック"
 
@@ -1544,21 +1548,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "積み重ね順"
 
@@ -1568,13 +1572,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "シェード状態"
 
@@ -1585,7 +1589,7 @@ msgstr "最大化状態"
 
 #
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "全面表示状態"
 
@@ -1594,7 +1598,7 @@ msgid "Lock me from changing:"
 msgstr "ユーザーに対して以下の変更を禁止する"
 
 #
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "ボーダースタイル"
 
@@ -1644,116 +1648,117 @@ msgstr "デスクトップ内で位置固定を解除にする"
 msgid "More..."
 msgstr "その他..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "アイコン化"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "垂直に最大化"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "水平に最大化"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "通常サイズ"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "キーボードショートカットに追加"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "お気に入りメニューに追加"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "ランチャーに追加"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "ボーダー"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "スキップ"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "状態"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "記憶"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "ウィンドウプロパティ"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "常に一番上に"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "普通"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "常に一番下に"
 
 #
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "ボーダースタイルを選ぶ"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "E17デフォルトのアイコンプリファレンスを使う"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "アプリケーション付属のアイコンを使う"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "ユーザー定義アイコンを使う"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "シェード"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "常時表示"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "全面表示"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "ウィンドウリスト"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "ページャ"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "タスクバー"
 
@@ -1769,7 +1774,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "ICCCMプロパティ"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "タイトル"
 
@@ -1861,11 +1866,11 @@ msgstr "NetWMプロパティ"
 msgid "Modal"
 msgstr "モーダル"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "タスクバースキップ"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "ページャスキップ"
 
@@ -1873,15 +1878,15 @@ msgstr "ページャスキップ"
 msgid "Hidden"
 msgstr "隠蔽"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "ウィンドウ属性の記憶"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "ウィンドウのプロパティが一意ではありません."
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1905,11 +1910,11 @@ msgstr ""
 "<br>適用されます.<br>よく分からなければ<hilight>取消</hilight>ボタンを押して"
 "下さい. そうすれば何も変更されません."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "一致するプロパティが設定されていません"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1920,114 +1925,106 @@ msgstr ""
 "置, ボーダースタイルなどの<br>プロパティを必ず適用するよう Enlightenment に要"
 "求しています.<br><br>最低 1 種類は記憶方法を指定して下さい."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"<hilight>プロパティが一意になっていない</hilight>ウィンドウに, サイズや位置, "
-"ボーダースタイルといった<br>プロパティを必ず適用するよう Enlightenment に要求"
-"しています. つまり, 名前やクラス,<br>トランジェンス, ロールなどの一致するウィ"
-"ンドウがこの画面には他にもあるため, このウィン<br>ドウに関して記憶された内容"
-"は, そのプロパティが一致する他のすべてのウィンドウにも適用<br>されてしまうと"
-"いうことです.<br><br>このウィンドウのインスタンス 1 つだけを対象にしたい場合"
-"は, <hilight>このウィンドウだけに適用する</hilight><br>オプションを有効にした"
-"方がいいかもしれません.<br>以上, 一言注意しておきます.<br>そうなってもよけれ"
-"ば<hilight>適用</hilight>ボタンか<hilight>了解</hilight>ボタンを押して下さ"
-"い. それで,ここで設定した内容が<br>適用されます.<br>よく分からなければ"
-"<hilight>取消</hilight>ボタンを押して下さい. そうすれば何も変更されません."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "無し"
 
 #
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "サイズと位置"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "ロック"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "サイズ, 位置, およびロック"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "すべて"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "記憶する基準は"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "ウィンドウの名前とクラス"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "ウィンドウ名"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "ウィンドウクラス"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "ウィンドウロール"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "ウィンドウタイプ"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "トランジェンス"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "記憶するプロパティ"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "アイコン・プリファレンス"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "仮想デスクトップ"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "現在のスクリーン"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "ウィンドウリストをスキップする"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "アプリケーション実行エラー"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "このウィンドウだけに適用する"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "ログイン時にこのプログラムを実行する"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "起動時に必ずフォーカスを当てる"
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "アイコンのプロパティを変える"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "ログイン時にこのプログラムを実行する"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "設定"
@@ -2046,25 +2043,25 @@ msgstr "シェルフ"
 msgid "Module Settings"
 msgstr "モジュールの設定"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "利用できるモジュール"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "モジュールをロードする"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "ロード済みモジュール"
 
 #
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "モジュールをアンロードする"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2098,8 +2095,8 @@ msgstr "ガジェットを削除する"
 msgid "Toolbar Settings"
 msgstr "ツールバーの設定"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "配置"
 
@@ -2126,12 +2123,12 @@ msgid "Favorite Applications"
 msgstr "お気に入りのアプリケーション"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2140,7 +2137,7 @@ msgstr "アプリケーション"
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "迷子なウィンドウ"
 
@@ -2177,130 +2174,129 @@ msgstr "(アプリケーション無し)"
 msgid "Set Virtual Desktops"
 msgstr "仮想デスクトップ"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(ウインドウ無し)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "名前無し"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(シェルフ無し)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "シェルフ #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "シェルフを追加する"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "シェルフを削除する"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "シェルフの設定"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "とても小さい"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "普通"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "極めて大きい"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "シェルフの中身の設定"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "常に一番上"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "ウィンドウの下"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "常に一番下"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "ウィンドウがこのシェルフと重なることを許可する"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "中身の大きさに合わせて縮小する"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f px"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "スタイル"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "自動隠蔽"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "シェルフを自動的に隠す"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "マウスが乗ったら出す"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "マウスをクリックしたら出す"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "指定時間後に隠蔽開始"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "隠蔽に要する時間"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "全デスクトップに表示する"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "指定のデスクトップに表示する"
 
@@ -2540,7 +2536,7 @@ msgstr "国際化機能を起動中"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment で国際化システムが準備できません."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2548,11 +2544,11 @@ msgstr ""
 "Enlightenment で初期スクリーンが準備できません.\n"
 "メモリー不足かもしれません."
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "フォーマットのサポート状態を確認中"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2561,7 +2557,7 @@ msgstr ""
 "Evas にソフトウェアバッファエンジンがサポートされていることを確認して下さ"
 "い.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2569,7 +2565,7 @@ msgstr ""
 "Evas で PNG ファイルがロードできません.\n"
 "Evas で PNG ローダーがサポートされていることを確認して下さい.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2577,7 +2573,7 @@ msgstr ""
 "Evas で JPEG ファイルがロードできません.\n"
 "Evas で JPEG ローダーがサポートされていることを確認して下さい.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2585,7 +2581,7 @@ msgstr ""
 "Evas で EET ファイルがロードできません.\n"
 "Evas で EET ローダーがサポートされていることを確認して下さい.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2596,11 +2592,11 @@ msgstr ""
 "およびシステムの fontconfig で 'Sans' フォントが\n"
 "定義されていることを確認して下さい.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "スクリーンを準備中"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2608,196 +2604,196 @@ msgstr ""
 "Enlightenment でこのシステムのすべての画面に対するウィンドウ管理が\n"
 "準備できませんでした. 別のウィンドウマネージャが動いているかもしれません.\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "スクリーンセーバーを準備中"
 
 #
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment で X スクリーンセーバーが設定できません."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "デスクロックを準備中"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment で デスクロックシステムが準備できません."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "パスを設定中"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "システムコントロールを準備中"
 
 #
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment でシステムコマンドの処理システムが初期化できません.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "アクションを準備中"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment でアクションシステムが準備できません."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "実行システムを準備中"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment で exec システムが準備できません."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "記憶機能を準備中"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment で記憶機能の設定が準備できません."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "ファイルマネージャを準備中"
 
 #
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment でファイルマネージャが初期化できません.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "メッセージシステムを準備中"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment で メッセージシステムが準備できません."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "DNDシステムを準備中"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment で dnd システムが準備できません."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "入力グラブ処理システムを準備中"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment で入力グラブ処理システムが準備できません."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "モジュールを準備中"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment でモジュールシステムが準備できません."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "記憶機能を準備中"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment で記憶機能の設定が準備できません."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "色クラスを準備中"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment でカラークラスシステムが準備できません."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Gadconを準備中"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment でガジェット管理システムが準備できません."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "DPMSを準備中"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment で DPMS が設定できません."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "省電力モードを設定中"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment で省電力モードが準備できません."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "壁紙を準備中"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment でデスクトップ背景システムが準備できません."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "マウスを準備中"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment でマウスが設定できません."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "バインドを準備中"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment でバインディングシステムが準備できません."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "ポップアップを準備中"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment でポップアップシステムが準備できません."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "シェルフを準備中"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment でシェルフシステムが準備できません."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "サムネイル機能を準備中"
 
 #
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment でサムネイル処理システムが初期化できません.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "orderファイルシステムを準備中"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment で order ファイルシステムが準備できません."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "モジュールをロード中"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2805,11 +2801,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2817,15 +2813,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "シェルフを設定中"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "ほぼ終了"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2834,11 +2830,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>モジュール %s はモジュール"
 "の検索パスにありません.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "モジュールのロードエラー"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2847,11 +2843,11 @@ msgstr ""
 "モジュール %s のロード中にエラーが発生しました.<br>このモジュールのフルパスは"
 "以下のとおりです.<br>%s<br>エラーの内容は以下のとおりです.<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "モジュールに不足している機能があります."
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2862,12 +2858,12 @@ msgstr ""
 "モジュール API が必要です.<br>Enlightenment で提供されているモジュール API の"
 "バージョンは %i です.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s モジュール"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "このモジュールをアンロードしますか?<br>"
 
@@ -2878,30 +2874,30 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "このシェルフを本当に削除しますか."
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "このシェルフを削除しようとしています.<br><br>本当に削除しますか."
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を終了する"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "搭載ガジェットの位置と大きさの変更を始める"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "シェルフの中身の設定"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "このシェルフを削除する"
 
@@ -2918,11 +2914,11 @@ msgstr "システムパーミッションを確認中"
 msgid "System Check Done"
 msgstr "システム確認終了"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "ログアウトに問題があります"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2932,32 +2928,32 @@ msgstr ""
 "めです.<br>このアプリケーションを無視して、とにかくログアウトを完了させます"
 "か."
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "ただちにログアウトする"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "待機する"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "ログアウトを取り消す"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "ログアウト中"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "ログアウト処理中です.<br><hilight>しばらくお待ち下さい</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment は現在他の処理で手一杯です."
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -2966,7 +2962,7 @@ msgstr ""
 "Enlightenment でログアウト処理中です.<br>ログアウト処理が始まったら他のシステ"
 "ム処理はできません."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -2975,7 +2971,7 @@ msgstr ""
 "Enlightenment でシャットダウン処理中です.<br>シャットダウン処理が始まったら他"
 "のシステム処理はできません."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -2984,7 +2980,7 @@ msgstr ""
 "Enlightenment で再起動処理中です.<br>再起動処理が始まったら他のシステム処理は"
 "できません."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -2993,7 +2989,7 @@ msgstr ""
 "Enlightenment でシステムをサスペンド中です.<br>サスペンドが完了するまでは他の"
 "システム処理はできません."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
@@ -3002,63 +2998,63 @@ msgstr ""
 "Enlightenment でシステムをハイバネート中です.<br>ハイバネートが完了するまでは"
 "他のシステム処理はできません."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "ありゃりゃ, これはまずいよ"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
 #
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid "Reset failed."
 msgstr "desktop ファイル"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid "Suspend failed."
 msgstr "サスペンド時間"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "ハイバネートに失敗しました"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "再起動中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 #, fuzzy
 msgid "Resetting"
 msgstr "デスクの設定"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "再起動中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "サスペンド中"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "サスペンド中です.<br><hilight>しばらくお待ち下さい.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "ハイバネート中"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "ハイバネート中です.<br><hilight>しばらくお待ち下さい.</hilight>"
@@ -3076,11 +3072,11 @@ msgstr "テーマに設定する"
 msgid "Set Toolbar Contents"
 msgstr "ツールバーの内容"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "終了できません. 不死身のウィンドウです."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3090,77 +3086,77 @@ msgstr ""
 "ンドウを閉じるか寿命のロックを解除するまで Enlightenment は<br>終了できませ"
 "ã‚“.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f B"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "未来"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "直前"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li ヶ月前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 週間前"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 日前"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 時間前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分前"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "不明"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3180,51 +3176,51 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "お気に入りに追加する"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "許可情報"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "最終更新日"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "本人"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "保護"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "読込専用"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "読書両用"
 
@@ -3240,63 +3236,63 @@ msgstr "基本設定"
 msgid "Show alert when battery is low"
 msgstr "バッテリ容量の低下時に警告を表示する"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 #, fuzzy
 msgid "Check every:"
 msgstr "バッテリの監視間隔"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 #, fuzzy
 msgid "Polling"
 msgstr "普通"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 #, fuzzy
 msgid "Show alert on low battery"
 msgstr "バッテリ容量の低下時に警告を表示する"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 #, fuzzy
 msgid "Alert when at:"
 msgstr "警告を出すバッテリの残容量"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, fuzzy, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f 個"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f 秒"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 #, fuzzy
 msgid "Alert"
 msgstr "次第に加速する"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 #, fuzzy
 msgid "Auto Detect"
 msgstr "アイコンの自動調整"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3304,12 +3300,12 @@ msgstr "アイコンの自動調整"
 msgid "Internal"
 msgstr "内部"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3318,25 +3314,25 @@ msgstr ""
 msgid "Battery"
 msgstr "バッテリ"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "バッテリ容量低下!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "AC 電源を使ってください."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "不可"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "エラー"
 
 #
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "バッテリメーター"
 
@@ -3344,22 +3340,22 @@ msgstr "バッテリメーター"
 msgid "Clock"
 msgstr "時計"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "設定パネル"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "デスクの設定"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 #, fuzzy
 msgid "Offline"
 msgstr "オフ時間"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "モジュール"
@@ -3386,7 +3382,7 @@ msgid "Restart Applications"
 msgstr "再起動アプリケーション"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "全アプリケーション"
 
@@ -3408,13 +3404,13 @@ msgstr "IBar ä»–"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "メニュー"
 
 #
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "デフォルトのボーダースタイル"
 
@@ -3422,14 +3418,14 @@ msgstr "デフォルトのボーダースタイル"
 msgid "Window Border Selection"
 msgstr "ウィンドウボーダーの選択"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "このボーダーを記憶して, 次回このウィンドウが現れた時に適用する"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3455,7 +3451,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3727,9 +3723,9 @@ msgid "Desktop Name"
 msgstr "デスクトップ名"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "名前:"
 
@@ -3798,10 +3794,10 @@ msgstr "%1.0f 分"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "ユーザー"
@@ -3834,8 +3830,8 @@ msgstr "以下のスクリーンゾーンに表示する :"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3958,46 +3954,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "仮想デスクトップ"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "設定ダイアログの設定"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "一般設定"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "確認ダイアログを出さない"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "通常のウインドウ"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "デフォルト設定ダイアログモード"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "基本設定モード"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "詳細設定モード"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "デフォルトモード"
 
@@ -4065,31 +4066,31 @@ msgstr "元に戻す"
 msgid "Screen Resolution Settings"
 msgstr "画面の解像度の設定"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "解像度"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "ログイン時に解像度復帰"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "回転"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "反転"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "機能が不足しています"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4102,11 +4103,11 @@ msgstr ""
 "画面の解像度は変更できません.<br><hilight>ecore</hilight> の構築時に XRandR "
 "サポートが検出されなかった可能性もあります."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "リフレッシュレートが見つかりません"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4165,7 +4166,7 @@ msgid "Power Management"
 msgstr "電源管理"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4175,84 +4176,89 @@ msgstr "無し"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Binding Settings"
 msgstr "キーバインドの設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "キーバインド"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 #, fuzzy
 msgid "Add Edge"
 msgstr "ガジェットを追加する"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 #, fuzzy
 msgid "Delete Edge"
 msgstr "キー削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 #, fuzzy
 msgid "Modify Edge"
 msgstr "キー修正"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "すべて削除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "デフォルトのキーバインドに戻す"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "アクション"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "アクションパラメータ"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 #, fuzzy
 msgid "General Options"
 msgstr "一般設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "全画面モードのウィンドウの前に出せるようにする"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "キーバインドシーケンス"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f 秒"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "キーシーケンスのバインドエラー"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4261,27 +4267,27 @@ msgstr ""
 "そのキーシーケンスはすでに以下のアクションで使われています.<br><hilight>%s</"
 "hilight><br>他のキーシーケンスを選んで下さい."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4581,18 +4587,17 @@ msgstr "とても大きい"
 msgid "%d pixels"
 msgstr "%d px"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "カスタムフォントクラスを有効にする"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4600,38 +4605,52 @@ msgstr ""
 msgid "Font Classes"
 msgstr "フォントクラス"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "フォントクラスを有効にする"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "フォント名"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "スタイル"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "ヒンティング"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "バイトコード"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "代替フォント"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "代替フォント名"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "代替フォントを有効にする"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr ""
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "代替フォント"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4645,7 +4664,7 @@ msgstr "アイコンのテーマ"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "アイコンのテーマ"
 
@@ -4716,7 +4735,7 @@ msgstr ""
 "コピーでエラーが発生したため Enlightenment で設定情報が取り込めませんでした."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "言語"
 
@@ -4891,7 +4910,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "自動スクロール時のカーソルマージン"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "その他のオプション"
 
@@ -5071,24 +5090,24 @@ msgstr "カーソルの大きさ"
 msgid "Mouse Cursor"
 msgstr "マウスカーソル"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "マウスの設定"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "左右ボタン入れ換え"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "マウスアクセラレータ"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "マウスの加速"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "しきい値"
 
@@ -5105,7 +5124,7 @@ msgid "Images"
 msgstr "画像"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "テーマ"
 
@@ -5206,35 +5225,35 @@ msgstr "%1.0f 個"
 msgid "Performance"
 msgstr "性能"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "プロファイルの選択"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "利用できるプロファイル"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "プロファイルを選択する"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 #, fuzzy
 msgid "Reset"
 msgstr "サイズ変更"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, fuzzy, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "このシェルフを削除しようとしています.<br><br>本当に削除しますか."
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 #, fuzzy
 msgid "Delete OK?"
 msgstr "削除しますか"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "新しいプロファイルの追加"
 
@@ -5400,23 +5419,23 @@ msgstr "起動時"
 msgid "Theme Selector"
 msgstr "テーマの選択"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr "インポート..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr "ネットから..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "テーマのカテゴリ"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "設定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "全解除"
 
@@ -5472,38 +5491,38 @@ msgid "Wallpaper Settings"
 msgstr "壁紙の設定"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "テーマの壁紙を使う"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "他の画像..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "グラデーション..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "ネットから..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "壁紙の設定先"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "全デスクトップ"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "このデスクトップ"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "このスクリーン"
 
@@ -5524,14 +5543,14 @@ msgid "Fill Options"
 msgstr "形状"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "横に広げる"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "縦に広げる"
 
@@ -5597,34 +5616,34 @@ msgstr "元のファイルに合わせる"
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "画像の選択..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "画像のインポートエラー"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "画像の変換でエラーが発生したため画像が取り込めませんでした."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "画像のインポートエラー"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5632,7 +5651,7 @@ msgstr ""
 "Enlightenment で壁紙が取り込めませんでした.<br><br>これは本当に正しい壁紙です"
 "か?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 #, fuzzy
 msgid "Exchange wallpapers"
 msgstr "テーマの壁紙"
@@ -5745,14 +5764,6 @@ msgstr "ユーザー定義アイコンを使う"
 msgid "Prefer application provided icon"
 msgstr "アプリケーション付属のアイコンを使う"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "内部ウィンドウ"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "常に内部ウィンドウを記憶する"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "フォーカスの設定"
@@ -5888,17 +5899,12 @@ msgid "Window Maximize Policy"
 msgstr "最大化ポリシー"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "賢く広げる"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "ウィンドウを広げる"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "空きスペースまで広げる"
 
@@ -5907,19 +5913,19 @@ msgid "Maximize Policy"
 msgstr "最大化ポリシー"
 
 #
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "最大化方向"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "縦横両方向"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "ウィンドウの操作を許可する"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "シェルフの隠蔽動作に合わせてその上のウィンドウの位置, 大きさを調整する"
 
@@ -5958,49 +5964,59 @@ msgstr "移動, サイズ変更時にウィンドウを上に出す"
 msgid "Raise when clicking to focus"
 msgstr "クリックしてフォーカスを当てる時ウィンドウを上に出す"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "ウィンドウの記憶"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "常に内部ウィンドウを記憶する"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "このウィンドウを覚える"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "記憶を消去する"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "詳細"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "名前無し"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "クラス:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "クラス無し"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "タイトル:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "タイトル無し"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "ロール:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "ロール無し"
 
@@ -6380,7 +6396,7 @@ msgid "Show Toolbar"
 msgstr "ツールバーを表示する"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "動作"
 
@@ -6396,98 +6412,98 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "上のディレクトリへ移動"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "アプリケーションの追加..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "開く"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "開くツール..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "アプリケーション"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "コマンド実行"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "キー削除"
 
 #
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "desktop ファイル"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6514,17 +6530,17 @@ msgstr ""
 msgid "To: %s"
 msgstr "おもちゃ"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "隠蔽に要する時間"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "ファイルマネージャ"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6564,19 +6580,19 @@ msgstr "背景"
 msgid "Gadgets"
 msgstr "ガジェット"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "自由"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "常に表示"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "表示はキー押下"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "他のガジェットを追加する"
 
@@ -6613,7 +6629,7 @@ msgstr "Bar ソースの選択"
 msgid "Icon Labels"
 msgstr "アイコンラベル"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "アイコンのラベルを表示する"
 
@@ -6674,43 +6690,43 @@ msgid "Add Application"
 msgstr "アプリケーションを追加する"
 
 #
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBoxの設定"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "名前を表示する"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "タイトルを表示する"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "クラスを表示する"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "アイコン名を表示する"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "ボーダーキャプションを表示する"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "すべてのスクリーンにあるウィンドウも表示する"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "現在のスクリーンのウィンドウを表示する"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "すべてのデスクトップのウィンドウを表示する"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "現在のデスクトップのウィンドウを表示する"
 
@@ -6730,11 +6746,11 @@ msgstr "マウスホイールでデスクトップを切替える"
 msgid "Show desktop names"
 msgstr "デスクトップ名を表示する"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "ポップアップ設定"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "デスクトップ変更時にポップアップを表示する"
 
@@ -6742,69 +6758,69 @@ msgstr "デスクトップ変更時にポップアップを表示する"
 msgid "Show popup for urgent windows"
 msgstr "緊急ウィンドウにはポップアップを表示"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "選択 / スライド"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "クリックで設定"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "ドラッグ&ドロップ"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "デスクトップ全体をドラッグ"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "キーアクション・ポップアップの高さ"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "ドラッグ抵抗値"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "ポップアップするページャーの高さ"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "ポップアップの速度"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "緊急ウィンドウの設定"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "緊急ウィンドウでポップアップを表示する"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "緊急ウィンドウのポップアップを常時表示にする"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "ページャーボタンのグラブ"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6813,11 +6829,11 @@ msgstr ""
 "hilight> キーを押してください.<br>リセットするときは <hilight>Del</hilight> "
 "キーを押してください."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "注意"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6826,29 +6842,29 @@ msgstr ""
 "マウスの右ボタンは使用できません.<br>すでに内部コードでコンテキストメニュー用"
 "に確保されています.<br>このボタンはポップアップでしか使えません."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "ボタン %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "ページャーのポップアップを表示する"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "右のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "左のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "上のデスクトップへ移動する"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "下のデスクトップへ移動する"
 
@@ -6973,7 +6989,7 @@ msgstr ""
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "温度計"
 
@@ -6985,15 +7001,15 @@ msgstr "次へ"
 msgid "Welcome to Enlightenment"
 msgstr "Enlightenment にようこそ"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "一つ選んでください"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "プロファイル"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7044,16 +7060,16 @@ msgstr "クリックしてフォーカスを移す"
 msgid "Mouse over focuses windows"
 msgstr "フォーカスを得たウィンドウにポインタを移す"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "追加するアイコンを選択する"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 #, fuzzy
 msgid "Quick Launch"
 msgstr "IBarクイック起動"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "アプリケーションを選択する"
 
@@ -7178,19 +7194,59 @@ msgstr "その他デバイス"
 msgid "Networks"
 msgstr "ネットワーク"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 #, fuzzy
 msgid "Systray"
 msgstr "システム"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "<hilight>プロパティが一意になっていない</hilight>ウィンドウに, サイズや位"
+#~ "置, ボーダースタイルといった<br>プロパティを必ず適用するよう "
+#~ "Enlightenment に要求しています. つまり, 名前やクラス,<br>トランジェンス, "
+#~ "ロールなどの一致するウィンドウがこの画面には他にもあるため, このウィン<br>"
+#~ "ドウに関して記憶された内容は, そのプロパティが一致する他のすべてのウィンド"
+#~ "ウにも適用<br>されてしまうということです.<br><br>このウィンドウのインスタ"
+#~ "ンス 1 つだけを対象にしたい場合は, <hilight>このウィンドウだけに適用する</"
+#~ "hilight><br>オプションを有効にした方がいいかもしれません.<br>以上, 一言注"
+#~ "意しておきます.<br>そうなってもよければ<hilight>適用</hilight>ボタンか"
+#~ "<hilight>了解</hilight>ボタンを押して下さい. それで,ここで設定した内容が"
+#~ "<br>適用されます.<br>よく分からなければ<hilight>取消</hilight>ボタンを押し"
+#~ "て下さい. そうすれば何も変更されません."
+
+#~ msgid "Window name and class"
+#~ msgstr "ウィンドウの名前とクラス"
+
+#~ msgid "Internal Windows"
+#~ msgstr "内部ウィンドウ"
+
+#~ msgid "Expand the window"
+#~ msgstr "ウィンドウを広げる"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "ウィンドウの操作を許可する"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "タイル"
@@ -9010,9 +9066,6 @@ msgstr "システム"
 #~ msgid "Font Class Configuration"
 #~ msgstr "フォントクラスの設定"
 
-#~ msgid "Font"
-#~ msgstr "フォント名"
-
 #~ msgid "Font Size"
 #~ msgstr "フォントサイズ"
 
@@ -9055,9 +9108,6 @@ msgstr "システム"
 #~ msgid "Window"
 #~ msgstr "ウィンドウ"
 
-#~ msgid "Window Name"
-#~ msgstr "ウィンドウ名"
-
 #~ msgid "Window Title"
 #~ msgstr "ウィンドウタイトル"
 
@@ -9830,9 +9880,6 @@ msgstr "システム"
 #~ msgid "Lifespan"
 #~ msgstr "寿命"
 
-#~ msgid "Remember This Window"
-#~ msgstr "このウィンドウを覚える"
-
 #~ msgid "Remember This Instance Only"
 #~ msgstr "このインスタンスだけを覚える"
 
diff --git a/po/km.gmo b/po/km.gmo
new file mode 100644
index 0000000..08c4ae9
Binary files /dev/null and b/po/km.gmo differ
diff --git a/po/km.po b/po/km.po
new file mode 100644
index 0000000..c3c7fcb
--- /dev/null
+++ b/po/km.po
@@ -0,0 +1,6832 @@
+# Khmer translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-09-03 09:15+0000\n"
+"Last-Translator: Chanrithy Thim <Unknown>\n"
+"Language-Team: Khmer <km at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/bin/e_about.c:17
+msgid "About Enlightenment"
+msgstr "អំពី Enlightenment"
+
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:180
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
+#: src/modules/mixer/app_mixer.c:531
+msgid "Close"
+msgstr "បិទ"
+
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: src/bin/e_about.c:26
+msgid ""
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
+"hope you enjoy using this software as much as we enjoyed writing it."
+"<br><br>This software is provided as-is with no explicit or implied "
+"warranty. This software is governed by licensing conditions, so please see "
+"the COPYING and COPYING-PLAIN licence files installed on your system."
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+"is not stable. Many features are incomplete or even non-existant yet and may "
+"have many bugs. You have been <hilight>WARNED!</hilight>"
+msgstr ""
+"រក្សារ​សិទ្ធិ &copy; 1999-2008, ដោយ​ក្រុម​អភិវឌ្ឍន៍ Enlightenment ។<br><br>យើង​សង្ឃឹម​ថា​អ្នក​នឹង​"
+"រីករាយ​ក្នុង​ការ​ប្រើ​វា​ដូច​យើង​រីករាយ​ក្នុង​ការ​សរសេរ​វា ។<br><br>កម្មវិធី​នេះ​ផ្ដល់​ដោយ​គ្មាន​ការ​ធានា​"
+"ជួសជុល​ទេ ។ កម្មវិធី​នេះ​ត្រូវ​បាន​គ្រប់​គ្រង​ដោយ​លក្ខ័ខ័ណ្ឌ​អាជ្ញាប័ណ្ណ, ដូច្នេះ​សូម​មើល​ឯកសារ​អាជ្ញាប័ណ្ណ "
+"COPYING និង COPYING-PLAIN ដែល​បាន​ដំឡើង​រួច​នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក ។<br><br>Enlightenment គី​"
+"ស្ថិត​ក្រោមភាព <hilight>កំពុង​អភិវឌ្ឍន៍​យ៉ាង​ខ្លាំង</hilight> ហើយ​វា​មិន​មាន​លំនឹង​ទេ ។ លក្ខណ​សម្បត្តិ​ជា​"
+"ច្រើន​គី​មិន​ទាន់​រួចរាល់ ឬក៏​មិន​ទាន់​មាន ហើយ​មាន​កំហុស​ជា​ច្រើន​ទៀត ។ អ្នក​ត្រូវ​តែ​មាន <hilight>ភាព​ប្រុង​"
+"ប្រយ័ត្ន!</hilight>"
+
+#: src/bin/e_about.c:50
+msgid "<title>The Team</title>"
+msgstr "<title>ក្រុម</title>"
+
+#: src/bin/e_actions.c:345
+#, c-format
+msgid ""
+"You are about to kill %s.<br><br>Please keep in mind that all data of this "
+"window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
+"you want to kill this window?"
+msgstr ""
+"អ្នក​គី​កំពុង​នឹង​បញ្ឍប់ %s ។<br><br>សូម​ទុក​ក្នុង​ចិត្ត​ថា​ទិន្នន័យ​ទាំងអស់​របស់​បង្អួច​នេះ,<br>គឺ​មិន​ត្រូវ​បាន​រក្សារ​"
+"ទុក​ឡើយ ហើយ​នឹង​ត្រូវ​បាត់!<br><br>តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឍប់​បង្អួច​នេះ ឬ?"
+
+#: src/bin/e_actions.c:357
+msgid "Are you sure you want to kill this window?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​បញ្ឍប់​បង្អួច​នេះ​ឬ?"
+
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
+msgid "Yes"
+msgstr "បាទ/​ចាស"
+
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "ទេ"
+
+#: src/bin/e_actions.c:1762
+msgid "Are you sure you want to exit?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចេញ ឬ?"
+
+#: src/bin/e_actions.c:1764
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr "អ្នក​បាន​ស្នើ​ចេញ​ពី Enlightenment ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ចេញ ឬ?"
+
+#: src/bin/e_actions.c:1860
+msgid "Are you sure you want to log out?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចាក​ចេញ ឬ?"
+
+#: src/bin/e_actions.c:1862
+msgid "You are about to log out.<br><br>Are you sure you want to do this?"
+msgstr "អ្នក​កំពុង​នឹង​ចាកចេញ ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ធ្វើ​បែប​នេះ ឬ?"
+
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
+msgid "Are you sure you want to turn off?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​បិទ ឬ?"
+
+#: src/bin/e_actions.c:1926
+msgid ""
+"You requested to turn off your Computer.<br><br>Are you sure you want to "
+"shut down?"
+msgstr "អ្នក​បាន​ស្នើ​បិទ​កុំព្យូទ័រ​របស់​អ្នក ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​បិទ ឬ?"
+
+#: src/bin/e_actions.c:1988
+msgid "Are you sure you want to reboot?"
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​ចាប់​ផ្ដើម​ឡើង​វិញ ឬ?"
+
+#: src/bin/e_actions.c:1990
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr "អ្នក​បាន​ស្នើ​ចាប់​ផ្ដើម​កុំព្យូទ័រ​របស់​អ្នក​ឡើង​វិញ ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ចាប់​ផ្ដើម​វា​ឡើង​វិញ ឬ?"
+
+#: src/bin/e_actions.c:2054
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr "អ្នក​បាន​ស្នើ​ផ្អាក​កុំព្យូទ័រ​របស់​អ្នក ។<br><br>តើ​អ្នក​ពិត​ជា​ចង់​ផ្អាក ឬ?"
+
+#: src/bin/e_actions.c:2116
+msgid "Are you sure you want to hibernate?"
+msgstr ""
+
+#: src/bin/e_actions.c:2118
+msgid ""
+"You requested to hibernate your Computer.<br><br>Are you sure you want to "
+"suspend to disk?"
+msgstr ""
+
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
+msgid "Window : Actions"
+msgstr "បង្អួច : សកម្មភាព"
+
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "ផ្លាស់ទី"
+
+#: src/bin/e_actions.c:2518
+msgid "Resize"
+msgstr "ផ្លាស់ប្ដូរ​ទំហំ"
+
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr "ម៉ឺនុយ"
+
+#: src/bin/e_actions.c:2529
+msgid "Window Menu"
+msgstr "ម៉ឺនុយ បង្អួច"
+
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
+msgid "Raise"
+msgstr "លើក​ឡើង"
+
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
+msgid "Lower"
+msgstr "ទាប​ជាង"
+
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
+msgid "Kill"
+msgstr "បញ្ឈប់"
+
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
+msgid "Window : State"
+msgstr ""
+
+#: src/bin/e_actions.c:2557
+msgid "Sticky Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2564
+msgid "Iconic Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2571
+msgid "Fullscreen Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
+msgid "Maximize"
+msgstr "អតិបរមា"
+
+#: src/bin/e_actions.c:2580
+msgid "Maximize Vertically"
+msgstr ""
+
+#: src/bin/e_actions.c:2583
+msgid "Maximize Horizontally"
+msgstr ""
+
+#: src/bin/e_actions.c:2586
+msgid "Maximize Fullscreen"
+msgstr ""
+
+#: src/bin/e_actions.c:2588
+msgid "Maximize Mode \"Smart\""
+msgstr ""
+
+#: src/bin/e_actions.c:2590
+msgid "Maximize Mode \"Expand\""
+msgstr ""
+
+#: src/bin/e_actions.c:2592
+msgid "Maximize Mode \"Fill\""
+msgstr ""
+
+#: src/bin/e_actions.c:2599
+msgid "Shade Up Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2601
+msgid "Shade Down Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2603
+msgid "Shade Left Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2605
+msgid "Shade Right Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2607
+msgid "Shade Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2614
+msgid "Toggle Borderless State"
+msgstr ""
+
+#: src/bin/e_actions.c:2619
+msgid "Toggle Pinned State"
+msgstr ""
+
+#: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:103
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
+msgid "Desktop"
+msgstr "ផ្ទៃតុ"
+
+#: src/bin/e_actions.c:2624
+msgid "Flip Desktop Left"
+msgstr ""
+
+#: src/bin/e_actions.c:2626
+msgid "Flip Desktop Right"
+msgstr ""
+
+#: src/bin/e_actions.c:2628
+msgid "Flip Desktop Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2630
+msgid "Flip Desktop Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2632
+msgid "Flip Desktop By..."
+msgstr ""
+
+#: src/bin/e_actions.c:2638
+msgid "Show The Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2644
+msgid "Show The Shelf"
+msgstr ""
+
+#: src/bin/e_actions.c:2649
+msgid "Flip Desktop To..."
+msgstr ""
+
+#: src/bin/e_actions.c:2655
+msgid "Flip Desktop Linearly..."
+msgstr ""
+
+#: src/bin/e_actions.c:2661
+msgid "Switch To Desktop 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2663
+msgid "Switch To Desktop 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2665
+msgid "Switch To Desktop 2"
+msgstr ""
+
+#: src/bin/e_actions.c:2667
+msgid "Switch To Desktop 3"
+msgstr ""
+
+#: src/bin/e_actions.c:2669
+msgid "Switch To Desktop 4"
+msgstr ""
+
+#: src/bin/e_actions.c:2671
+msgid "Switch To Desktop 5"
+msgstr ""
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 6"
+msgstr ""
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 7"
+msgstr ""
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 8"
+msgstr ""
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 9"
+msgstr ""
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 10"
+msgstr ""
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 11"
+msgstr ""
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2691
+msgid "Flip Desktop Left (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2693
+msgid "Flip Desktop Right (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2695
+msgid "Flip Desktop Up (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2697
+msgid "Flip Desktop Down (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2699
+msgid "Flip Desktop By... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2705
+msgid "Flip Desktop To... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2711
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2717
+msgid "Flip Desktop In Direction..."
+msgstr ""
+
+#: src/bin/e_actions.c:2722
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2724
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2726
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2728
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2730
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2732
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2734
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2736
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2738
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2740
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2742
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2744
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2746
+msgid "Switch To Desktop... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
+#: 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
+#: src/modules/conf_dpms/e_mod_main.c:34
+#: src/modules/conf_screensaver/e_mod_main.c:34
+#: src/modules/ibox/e_mod_config.c:134
+msgid "Screen"
+msgstr "អេក្រង់"
+
+#: src/bin/e_actions.c:2753
+msgid "Send Mouse To Screen 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2755
+msgid "Send Mouse To Screen 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2757
+msgid "Send Mouse To Screen..."
+msgstr ""
+
+#: src/bin/e_actions.c:2762
+msgid "Send Mouse Forward 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2764
+msgid "Send Mouse Back 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2766
+msgid "Send Mouse Forward/Back Screens..."
+msgstr ""
+
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
+msgid "Window : Moving"
+msgstr ""
+
+#: src/bin/e_actions.c:2804
+msgid "To Next Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2806
+msgid "To Previous Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "By Desktop #..."
+msgstr ""
+
+#: src/bin/e_actions.c:2814
+msgid "To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2820
+msgid "Show Main Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2822
+msgid "Show Favorites Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2824
+msgid "Show All Applications Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2826
+msgid "Show Clients Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2828
+msgid "Show Menu..."
+msgstr ""
+
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+msgid "Launch"
+msgstr "ដំណើរការ"
+
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
+msgid "Command"
+msgstr "ពាក្យ​បញ្ជា"
+
+#: src/bin/e_actions.c:2840
+msgid "Application"
+msgstr "កម្មវិធី"
+
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr "ចាប់ផ្តើម​ឡើង​វិញ"
+
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr "ចេញ"
+
+#: src/bin/e_actions.c:2852
+msgid "Exit Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2857
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2862
+msgid "Offline Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
+#: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
+#: src/modules/conf_desklock/e_int_config_desklock.c:301
+#: src/modules/conf_imc/e_int_config_imc.c:827
+#: src/modules/conf_startup/e_int_config_startup.c:267
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
+#: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
+#: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
+#: src/modules/syscon/e_mod_main.c:122
+msgid "System"
+msgstr "ប្រព័ន្ធ"
+
+#: src/bin/e_actions.c:2866
+msgid "Log Out"
+msgstr "ចាក​ចេញ"
+
+#: src/bin/e_actions.c:2870
+msgid "Power Off Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2874
+msgid "Power Off"
+msgstr ""
+
+#: src/bin/e_actions.c:2878
+msgid "Reboot"
+msgstr "ចាប់​ផ្ដើម​ឡើងវិញ"
+
+#: src/bin/e_actions.c:2882
+msgid "Suspend"
+msgstr ""
+
+#: src/bin/e_actions.c:2886
+msgid "Hibernate"
+msgstr ""
+
+#: src/bin/e_actions.c:2894
+msgid "Lock"
+msgstr "ចាក់សោ"
+
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
+msgid "Cleanup Windows"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Generic : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Delayed Action"
+msgstr ""
+
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr ""
+
+#: src/bin/e_border.c:4922
+msgid "Desktop files scan done"
+msgstr ""
+
+#: src/bin/e_border.c:4935
+msgid "Desktop file scan"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:29
+msgid "Color Selector"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/modules/conf_dpms/e_int_config_dpms.c:85
+#: src/modules/conf_imc/e_int_config_imc_import.c:112
+#: src/modules/conf_mime/e_int_config_mime_edit.c:283
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
+#: src/modules/conf_theme/e_int_config_theme_import.c:113
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
+#: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
+#: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
+msgid "OK"
+msgstr "យល់​ព្រម"
+
+#: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/modules/conf_mime/e_int_config_mime_edit.c:284
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_theme/e_int_config_theme_import.c:117
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
+#: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
+msgid "Cancel"
+msgstr "បោះ​​​បង់"
+
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
+msgid ""
+"Settings data needed upgrading. Your old settings have<br>been wiped and a "
+"new set of defaults initialized. This<br>will happen regularly during "
+"development, so don't report a<br>bug. This simply means Enlightenment needs "
+"new settings<br>data by default for usable functionality that your "
+"old<br>settings simply lack. This new set of defaults will fix<br>that by "
+"adding it in. You can re-configure things now to your<br>liking. Sorry for "
+"the hiccup in your settings.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:777
+msgid ""
+"Your settings are NEWER than Enlightenment. This is very<br>strange. This "
+"should not happen unless you downgraded<br>Enlightenment or copied the "
+"settings from a place where<br>a newer version of Enlightenment was running. "
+"This is bad and<br>as a precaution your settings have been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1740
+msgid "Settings Upgraded"
+msgstr ""
+
+#: src/bin/e_config.c:1763
+#, c-format
+msgid ""
+"An error occured while saving Enlightenment's<br>settings 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 ""
+
+#: src/bin/e_config.c:1774
+#, c-format
+msgid ""
+"Enlightenment's settings files are too big<br>for the file system they are "
+"being saved to.<br>This error is very strange as the files should<br>be "
+"extremely small. Please check the settings<br>for your home directory."
+"<br><br>The file where the error occured was:<br>%s<br><br>This file has "
+"been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1787
+#, c-format
+msgid ""
+"An output error occured when writing the settings<br>files for "
+"Enlightenment. Your disk is having troubles<br>and possibly needs "
+"replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
+"file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1798
+#, c-format
+msgid ""
+"Enlightenment cannot write its settings file<br>because it ran out of space "
+"to write the file.<br>You have either run out of disk space or have<br>gone "
+"over your quota limit.<br><br>The file where the error occured was:<br>%"
+"s<br><br>This file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1810
+#, c-format
+msgid ""
+"Enlightenment unexpectedly had the settings 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 ""
+
+#: src/bin/e_config.c:1835
+msgid "Enlightenment Settings Write Problems"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
+#: src/modules/conf_engine/e_mod_main.c:34
+#: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_paths/e_mod_main.c:34
+#: src/modules/conf_performance/e_mod_main.c:34
+msgid "Advanced"
+msgstr "កម្រិត​ខ្ពស់"
+
+#: src/bin/e_config_dialog.c:237
+msgid "Basic"
+msgstr "មូល​ដ្ឋាន"
+
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
+msgid "Apply"
+msgstr "អនុវត្ត"
+
+#: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
+#: src/modules/conf_colors/e_int_config_color_classes.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_paths/e_int_config_paths.c:83
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
+msgid "Modules"
+msgstr "ម៉ូឌុល"
+
+#: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
+msgid "Extensions"
+msgstr "ផ្នែក​បន្ថែម"
+
+#: src/bin/e_container.c:113
+#, c-format
+msgid "Container %d"
+msgstr ""
+
+#: src/bin/e_desklock.c:175
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:176
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:240
+msgid "Lock Failed"
+msgstr ""
+
+#: src/bin/e_desklock.c:241
+msgid ""
+"Locking the desktop failed because some application<br>has grabbed either "
+"the keyboard or the mouse or both<br>and their grab is unable to be broken."
+msgstr ""
+
+#: src/bin/e_desklock.c:325
+msgid "Please enter your unlock password"
+msgstr ""
+
+#: src/bin/e_desklock.c:689
+msgid "Authentication System Error"
+msgstr ""
+
+#: src/bin/e_desklock.c:690
+#, c-format
+msgid ""
+"Authentication via PAM had errors setting up the<br>authentication session. "
+"The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
+"happening. Please report this bug."
+msgstr ""
+
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1020
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:158
+msgid "Incomplete Window Properties"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:159
+msgid ""
+"The window you are creating an icon for<br>does not contain window name and "
+"class<br>properties, so the needed properties for<br>the icon so that it "
+"will be used for this<br>window cannot be guessed. You will need to<br>use "
+"the window title instead. This will only<br>work if the window title is the "
+"same at<br>the time the window starts up, and does not<br>change."
+msgstr ""
+
+#: src/bin/e_eap_editor.c:215
+msgid "Desktop Entry Editor"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_mime/e_int_config_mime_edit.c:145
+msgid "Icon"
+msgstr "រូបតំណាង"
+
+#: src/bin/e_eap_editor.c:472
+#: src/modules/conf_mime/e_int_config_mime_edit.c:136
+msgid "Basic Info"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:473 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:911
+msgid "Name"
+msgstr "ឈ្មោះ"
+
+#: src/bin/e_eap_editor.c:479
+msgid "Executable"
+msgstr "ដែលអាចប្រតិបត្តិ"
+
+#: src/bin/e_eap_editor.c:487
+msgid "Comment"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:512
+msgid "General"
+msgstr "ទូទៅ"
+
+#: src/bin/e_eap_editor.c:515
+msgid "Generic Name"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:520
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:105
+msgid "Window Class"
+msgstr "ថ្នាក់​បង្អួច"
+
+#: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
+msgid "Categories"
+msgstr "ប្រភេទ"
+
+#: src/bin/e_eap_editor.c:528
+msgid "Mime Types"
+msgstr "ប្រភេទ Mime"
+
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
+msgid "Options"
+msgstr "ជម្រើស"
+
+#: src/bin/e_eap_editor.c:535
+msgid "Startup Notify"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:537
+msgid "Run in Terminal"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:539
+msgid "Show in Menus"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:543
+msgid "Desktop file"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:544
+msgid "Filename"
+msgstr "ឈ្មោះ​ឯកសារ"
+
+#: src/bin/e_eap_editor.c:573
+msgid "Select an Icon"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:642
+msgid "Select an Executable"
+msgstr ""
+
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
+#: src/modules/conf_shelves/e_int_config_shelf.c:81
+#: src/modules/ibar/e_mod_config.c:112
+msgid "Delete"
+msgstr "លុប"
+
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
+msgid "Cut"
+msgstr "កាត់"
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
+msgid "Copy"
+msgstr "ចម្លង"
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
+msgid "Paste"
+msgstr "បិទភ្ជាប់"
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr "ជ្រើស​ទាំងអស់"
+
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
+#: src/modules/conf_imc/e_int_config_imc.c:278
+#: src/modules/conf_imc/e_int_config_imc.c:518
+msgid "Run Error"
+msgstr ""
+
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
+#: src/modules/conf_imc/e_int_config_imc.c:279
+#: src/modules/conf_imc/e_int_config_imc.c:519
+#, c-format
+msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
+msgstr ""
+
+#: src/bin/e_exec.c:356
+msgid "Application run error"
+msgstr ""
+
+#: src/bin/e_exec.c:358
+#, 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:454
+msgid "Application Execution Error"
+msgstr ""
+
+#: src/bin/e_exec.c:466
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr ""
+
+#: src/bin/e_exec.c:472
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr ""
+
+#: src/bin/e_exec.c:480
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:483
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:487
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:490
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr ""
+
+#: src/bin/e_exec.c:494
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:498
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr ""
+
+#: src/bin/e_exec.c:502
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr ""
+
+#: src/bin/e_exec.c:505
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:509
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr ""
+
+#: src/bin/e_exec.c:512
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:568
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
+msgid "Error Logs"
+msgstr ""
+
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
+msgid "There was no error message."
+msgstr ""
+
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
+msgid "Save This Message"
+msgstr ""
+
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr ""
+
+#: src/bin/e_exec.c:670
+msgid "Error Information"
+msgstr ""
+
+#: src/bin/e_exec.c:678
+msgid "Error Signal Information"
+msgstr ""
+
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
+msgid "Output Data"
+msgstr ""
+
+#: src/bin/e_exec.c:696
+msgid "There was no output."
+msgstr ""
+
+#: src/bin/e_fm.c:945
+msgid "Nonexistent path"
+msgstr ""
+
+#: src/bin/e_fm.c:949
+#, c-format
+msgid "%s doesn't exist."
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Mount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Unmount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Eject Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3685
+#, c-format
+msgid "%i Files"
+msgstr ""
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
+msgid "Link"
+msgstr ""
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
+msgid "Abort"
+msgstr ""
+
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr ""
+
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
+msgid "Refresh View"
+msgstr ""
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Show Hidden Files"
+msgstr ""
+
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
+msgid "Remember Ordering"
+msgstr ""
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
+msgid "Sort Now"
+msgstr ""
+
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8051
+msgid "Rename"
+msgstr ""
+
+#: src/bin/e_fm.c:8070
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8075
+msgid "Mount"
+msgstr ""
+
+#: src/bin/e_fm.c:8080
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8090
+msgid "Properties"
+msgstr ""
+
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
+msgid "Use default"
+msgstr ""
+
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr ""
+
+#: src/bin/e_fm.c:8392
+#, c-format
+msgid "Icon Size (%d)"
+msgstr ""
+
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8766
+msgid "Create a new Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8767
+msgid "New Directory Name:"
+msgstr ""
+
+#: src/bin/e_fm.c:8821
+#, c-format
+msgid "Rename %s to:"
+msgstr ""
+
+#: src/bin/e_fm.c:8823
+msgid "Rename File"
+msgstr ""
+
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
+msgid "Retry"
+msgstr ""
+
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
+msgid "Error"
+msgstr ""
+
+#: src/bin/e_fm.c:8970
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9022
+msgid "No to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9024
+msgid "Yes to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9027
+msgid "Warning"
+msgstr ""
+
+#: src/bin/e_fm.c:9030
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr ""
+
+#: src/bin/e_fm.c:9103
+msgid "Ignore this"
+msgstr ""
+
+#: src/bin/e_fm.c:9104
+msgid "Ignore all"
+msgstr ""
+
+#: src/bin/e_fm.c:9109
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9255
+msgid "Confirm Delete"
+msgstr ""
+
+#: src/bin/e_fm.c:9260
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm.c:9266
+#, c-format
+msgid ""
+"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
+"hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:108
+msgid "File Properties"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:337
+msgid "File:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
+msgid "Size:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:351
+msgid "Last Modified:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:358
+msgid "File Type:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:365
+msgid "Permissions"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
+msgid "Owner:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:372
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:374
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:376
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:378
+msgid "Owner can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
+#: src/modules/conf_transitions/e_int_config_transitions.c:167
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
+msgid "Preview"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:431
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
+msgid "Default"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:434
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:437
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:447
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:455
+msgid "Link Information"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:183
+#, c-format
+msgid "%llu TiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:185
+#, c-format
+msgid "%llu GiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:187
+#, c-format
+msgid "%llu MiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu KiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu B"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:222
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:320
+msgid "Removable Device"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
+msgid "Plain"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
+msgid "Inset"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
+msgid "Appearance"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1385
+msgid "Automatically scroll contents"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1392
+msgid "Able to be resized"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
+msgid "Begin move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
+msgid "Remove this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1891
+msgid "Stop move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_hints.c:151
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"on this screen. Aborting startup.\n"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
+msgid "Window Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:285
+msgid "Generic Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:286
+msgid "Lock the Window so it does only what I tell it to"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:288
+msgid "Protect this window from me accidentally changing it"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:290
+msgid ""
+"Protect this window from being accidentally closed because it is important"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:292
+msgid "Do not allow the border to change on this window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:295
+msgid "Remember these Locks for this window next time it appears"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:308
+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:702
+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:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:637
+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:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
+msgid "Stacking"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
+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:720
+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:726
+msgid "Shaded state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
+msgid "Maximized state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
+#: src/bin/e_int_border_remember.c:729
+msgid "Fullscreen state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:327
+msgid "Lock me from changing:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
+msgid "Border style"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:348
+msgid "Stop me from:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:349
+msgid "Closing the window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:351
+msgid "Exiting my login with this window open"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:355
+msgid "Remember these Locks"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:73
+msgid "Edit Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:78
+msgid "Add Application..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:89
+msgid "Create Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:99
+msgid "Send to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:111
+msgid "Pin to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:122
+msgid "Unpin from Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:131
+msgid "More..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:171
+msgid "Iconify"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:368
+msgid "Maximize vertically"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:379
+msgid "Maximize horizontally"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:390
+msgid "Unmaximize"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:491
+msgid "Keyboard Shortcut"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:497
+msgid "To Favorites Menu"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:502
+msgid "To Launcher"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
+msgid "Border"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:533
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
+#: src/modules/conf_colors/e_int_config_color_classes.c:514
+msgid "State"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
+msgid "Remember"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:814
+msgid "Always On Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:825
+#: 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:260
+msgid "Normal"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:836
+msgid "Always Below"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:928
+msgid "Select Border Style"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:940
+msgid "Use E17 Default Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:949
+msgid "Use Application Provided Icon "
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:957
+msgid "Use User Defined Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
+msgid "Fullscreen"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1092
+msgid "Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:363
+msgid "NetWM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:370
+msgid "ICCCM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:418
+msgid "ICCCM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
+msgid "Title"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:421
+msgid "Class"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+msgid "Icon Name"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:423
+msgid "Machine"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:424
+msgid "Role"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:426
+msgid "Minimum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:427
+msgid "Maximum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:428
+msgid "Base Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:429
+msgid "Resize Steps"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:431
+msgid "Aspect Ratio"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:432
+msgid "Initial State"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:434
+msgid "Window ID"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:435
+msgid "Window Group"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:436
+msgid "Transient For"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:437
+msgid "Client Leader"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:438
+msgid "Gravity"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:441
+msgid "Take Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:442
+msgid "Accepts Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:443
+msgid "Urgent"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:444
+msgid "Request Delete"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:445
+msgid "Request Position"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:466
+msgid "NetWM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:471
+msgid "Modal"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
+msgid "Skip Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
+msgid "Skip Pager"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:85
+msgid "Window Remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:307
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:310
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window that <hilight>does not "
+"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
+"Transience, Role etc. properties<br>with more than 1 other window on the "
+"screen and remembering<br>properties for this window will apply to all other "
+"windows<br>that match these properties.<br><br>This is just a warning in "
+"case you did not intend this to happen.<br>If you did, simply press "
+"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your "
+"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
+"sure and nothing will be affected."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:515
+msgid "No match properties set"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:518
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window <hilight>without "
+"specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
+"way of remembering this window."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:614
+msgid "Nothing"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:616
+msgid "Size and Position"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
+msgid "Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:620
+msgid "Size, Position and Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:622
+msgid "Everything"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:635
+msgid "Remember using"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
+msgid "Window Role"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:686
+msgid "Window type"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
+msgid "Transience"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:701
+msgid "Properties to remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:717
+msgid "Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:723
+msgid "Virtual Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:732
+msgid "Current Screen"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:735
+msgid "Skip Window List"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
+#: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
+#: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
+#: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
+#: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1077
+msgid "Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+#: src/modules/wizard/page_050.c:26
+msgid "File Manager"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:44
+msgid "Shelf"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:120
+msgid "Module Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:180
+msgid "Available Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:187
+msgid "Load Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:194
+msgid "Loaded Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:201
+msgid "Unload Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
+#: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
+#: src/bin/e_int_gadcon_config.c:205
+msgid "Description: Unavailable"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:36
+msgid "Shelf Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:42
+msgid "Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:133
+msgid "Selected Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:140
+msgid "Remove Gadget"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+msgid "Toolbar Settings"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
+msgid "Layout"
+msgstr ""
+
+#: src/bin/e_intl.c:361
+msgid "Input Method Error"
+msgstr ""
+
+#: src/bin/e_intl.c:362
+msgid ""
+"Error starting the input method executable<br><br>please make sure that your "
+"input<br>method configuration is correct and<br>that your "
+"configuration's<br>executable is in your PATH<br>"
+msgstr ""
+
+#: src/bin/e_int_menus.c:89
+msgid "Main"
+msgstr ""
+
+#: src/bin/e_int_menus.c:106
+msgid "Favorite Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:117
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
+msgid "Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
+#: 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 ""
+
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
+msgid "Lost Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:170
+msgid "About"
+msgstr ""
+
+#: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
+#: src/modules/conf_theme/e_mod_main.c:40
+#: src/modules/conf_theme/e_mod_main.c:84
+msgid "Theme"
+msgstr ""
+
+#: src/bin/e_int_menus.c:262
+msgid "Virtual"
+msgstr ""
+
+#: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
+#: src/modules/conf_shelves/e_mod_main.c:41
+#: src/modules/conf_shelves/e_mod_main.c:85
+msgid "Shelves"
+msgstr ""
+
+#: src/bin/e_int_menus.c:278
+msgid "Show/Hide All Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:575
+msgid "(No Applications)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:709
+msgid "Set Virtual Desktops"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
+msgid "(No Windows)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
+msgid "No name!!"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1362
+msgid "(No Shelves)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1427
+msgid "Add A Shelf"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1434
+msgid "Delete A Shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:601
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:603
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
+msgid "Small"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:607
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:609
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
+msgid "Set Contents..."
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:641
+msgid "Above Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:643
+msgid "Below Windows"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:645
+msgid "Below Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:647
+msgid "Allow windows to overlap the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:694
+msgid "Shrink to Content Size"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
+msgid "%3.0f pixels"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:710
+msgid "Styles"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:750
+msgid "Auto Hide"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:751
+msgid "Auto-hide the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:755
+msgid "Show on mouse in"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:759
+msgid "Show on mouse click"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:763
+msgid "Hide timeout"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:772
+msgid "Hide duration"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:788
+msgid "Show on all Desktops"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:790
+msgid "Show on specified Desktops"
+msgstr ""
+
+#: src/bin/e_ipc.c:47
+#, c-format
+msgid ""
+"Possible IPC Hack Attempt. The IPC socket\n"
+"directory already exists BUT has permissions\n"
+"that are too leanient (must only be readable\n"
+"and writable by the owner, and nobody else)\n"
+"or is not owned by you. Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_ipc.c:57
+#, c-format
+msgid ""
+"The IPC socket directory cannot be created or\n"
+"examined.\n"
+"Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_main.c:323
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:385
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:411
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:424
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:430
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:442
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:450
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:473
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:481
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:490
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:509
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:515
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software X11\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software X11 rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:522
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software Buffer rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:538 src/bin/e_main.c:545
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:559
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+
+#: src/bin/e_main.c:569
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:578
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:592
+msgid "Enlightenment cannot set up its scale system."
+msgstr ""
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot set up the pointer system."
+msgstr ""
+
+#: src/bin/e_main.c:609
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:627
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:638
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:643
+msgid "Starting International Support"
+msgstr ""
+
+#: src/bin/e_main.c:648
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:664
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:676
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:687
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:698
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:707
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:716
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:727
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:737
+msgid "Setup Screens"
+msgstr ""
+
+#: src/bin/e_main.c:742
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+
+#: src/bin/e_main.c:748
+msgid "Setup Screensaver"
+msgstr ""
+
+#: src/bin/e_main.c:753
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:757
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:762
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:775
+msgid "Setting up Paths"
+msgstr ""
+
+#: src/bin/e_main.c:792
+msgid "Setup System Controls"
+msgstr ""
+
+#: src/bin/e_main.c:797
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:802
+msgid "Setup Actions"
+msgstr ""
+
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:811
+msgid "Setup Execution System"
+msgstr ""
+
+#: src/bin/e_main.c:816
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:824
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:829
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
+msgstr ""
+
+#: src/bin/e_main.c:849
+msgid "Enlightenment cannot set up its msg system."
+msgstr ""
+
+#: src/bin/e_main.c:854
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:864
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:869
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:874
+msgid "Setup Modules"
+msgstr ""
+
+#: src/bin/e_main.c:879
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
+
+#: src/bin/e_main.c:904
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:923
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Wallpaper"
+msgstr ""
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Mouse"
+msgstr ""
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr ""
+
+#: src/bin/e_main.c:952
+msgid "Setup Bindings"
+msgstr ""
+
+#: src/bin/e_main.c:957
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:962
+msgid "Setup Popups"
+msgstr ""
+
+#: src/bin/e_main.c:967
+msgid "Enlightenment cannot set up its popup system."
+msgstr ""
+
+#: src/bin/e_main.c:972
+msgid "Setup Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:977
+msgid "Enlightenment cannot set up its shelf system."
+msgstr ""
+
+#: src/bin/e_main.c:982
+msgid "Setup Thumbnailer"
+msgstr ""
+
+#: src/bin/e_main.c:987
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:992
+msgid "Set Up File Ordering"
+msgstr ""
+
+#: src/bin/e_main.c:996
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+
+#: src/bin/e_main.c:1031
+msgid "Load Modules"
+msgstr ""
+
+#: src/bin/e_main.c:1039
+msgid ""
+"Enlightenment crashed early on start and has<br>been restarted. All modules "
+"have been disabled<br>and will not be loaded to help remove any "
+"problem<br>modules from your configuration. The module<br>configuration "
+"dialog should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1046
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1047
+msgid ""
+"Enlightenment crashed early on start and has been restarted.<br>All modules "
+"have been disabled and will not be loaded to help<br>remove any problem "
+"modules from your configuration.<br><br>The module configuration dialog "
+"should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1055
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:1066
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:126
+#, 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:130 src/bin/e_module.c:143 src/bin/e_module.c:160
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
+#, 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:159
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:173
+#, c-format
+msgid ""
+"Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
+"module API version of: %i.<br>The module API advertized by Enlightenment is: "
+"%i.<br>"
+msgstr ""
+
+#: src/bin/e_module.c:178
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr ""
+
+#: src/bin/e_module.c:501
+msgid "Would you like to unload this module?<br>"
+msgstr ""
+
+#: src/bin/e_screensaver.c:99
+msgid ""
+"You disabled screensaver too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1297
+msgid ""
+"You requested to delete this shelf.<br><br>Are you sure you want to delete "
+"it?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
+msgid "Stop Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1705
+msgid "Set Shelf Contents"
+msgstr ""
+
+#: src/bin/e_shelf.c:1710
+msgid "Delete this Shelf"
+msgstr ""
+
+#: src/bin/e_startup.c:66
+msgid "Starting"
+msgstr ""
+
+#: src/bin/e_sys.c:170
+msgid "Checking System Permissions"
+msgstr ""
+
+#: src/bin/e_sys.c:208 src/bin/e_sys.c:219 src/bin/e_sys.c:228
+#: src/bin/e_sys.c:237
+msgid "System Check Done"
+msgstr ""
+
+#: src/bin/e_sys.c:312
+msgid "Logout problems"
+msgstr ""
+
+#: src/bin/e_sys.c:315
+msgid ""
+"Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
+"want to finish the logout<br>anyway without closing these<br>applications "
+"first?"
+msgstr ""
+
+#: src/bin/e_sys.c:321
+msgid "Logout now"
+msgstr ""
+
+#: src/bin/e_sys.c:322
+msgid "Wait longer"
+msgstr ""
+
+#: src/bin/e_sys.c:323
+msgid "Cancel Logout"
+msgstr ""
+
+#: src/bin/e_sys.c:362
+msgid "Logout in progress"
+msgstr ""
+
+#: src/bin/e_sys.c:365
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
+msgid "Enlightenment is busy with another request"
+msgstr ""
+
+#: src/bin/e_sys.c:397
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:405
+msgid ""
+"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
+"has been started."
+msgstr ""
+
+#: src/bin/e_sys.c:412
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:419
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+
+#: src/bin/e_sys.c:426
+msgid ""
+"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"complete."
+msgstr ""
+
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
+msgid "EEK! This should not happen"
+msgstr ""
+
+#: src/bin/e_sys.c:459
+msgid "Power off failed."
+msgstr ""
+
+#: src/bin/e_sys.c:464
+msgid "Reset failed."
+msgstr ""
+
+#: src/bin/e_sys.c:469
+msgid "Suspend failed."
+msgstr ""
+
+#: src/bin/e_sys.c:474
+msgid "Hibernate failed."
+msgstr ""
+
+#: src/bin/e_sys.c:531
+msgid "Power off"
+msgstr ""
+
+#: src/bin/e_sys.c:534
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:558
+msgid "Resetting"
+msgstr ""
+
+#: src/bin/e_sys.c:561
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:584
+msgid "Suspending"
+msgstr ""
+
+#: src/bin/e_sys.c:587
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:610
+msgid "Hibernating"
+msgstr ""
+
+#: src/bin/e_sys.c:613
+msgid "Hibernating.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_theme_about.c:17
+msgid "About Theme"
+msgstr ""
+
+#: src/bin/e_theme.c:42
+msgid "Set As Theme"
+msgstr ""
+
+#: src/bin/e_toolbar.c:340
+msgid "Set Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_utils.c:245
+msgid "Cannot exit - immortal windows."
+msgstr ""
+
+#: src/bin/e_utils.c:246
+msgid ""
+"Some windows are left still around with the Lifespan lock enabled. This "
+"means<br>that Enlightenment will not allow itself to exit until these "
+"windows have<br>been closed or have the lifespan lock removed.<br>"
+msgstr ""
+
+#: src/bin/e_utils.c:804
+#, c-format
+msgid "%'.0f Bytes"
+msgstr ""
+
+#: src/bin/e_utils.c:808
+#, c-format
+msgid "%'.0f KB"
+msgstr ""
+
+#: src/bin/e_utils.c:812
+#, c-format
+msgid "%'.0f MB"
+msgstr ""
+
+#: src/bin/e_utils.c:816
+#, c-format
+msgid "%'.1f GB"
+msgstr ""
+
+#: src/bin/e_utils.c:836
+#, c-format
+msgid "In the Future"
+msgstr ""
+
+#: src/bin/e_utils.c:841
+#, c-format
+msgid "In the last Minute"
+msgstr ""
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "%li Years ago"
+msgstr ""
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Months ago"
+msgstr ""
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Weeks ago"
+msgstr ""
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Days ago"
+msgstr ""
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Hours ago"
+msgstr ""
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Minutes ago"
+msgstr ""
+
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
+msgid "Unknown"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:63
+#: src/modules/conf_applications/e_int_config_apps.c:243
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
+#: src/modules/conf_shelves/e_int_config_shelf.c:79
+#: src/modules/ibar/e_mod_config.c:110
+msgid "Add"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:69
+msgid "Remove"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:83
+#: src/modules/conf_applications/e_int_config_apps.c:258
+msgid "Up"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:89
+#: src/modules/conf_applications/e_int_config_apps.c:263
+msgid "Down"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:292
+msgid "Add to Favorites"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:298
+#: src/modules/conf_desklock/e_int_config_desklock.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:834
+#: src/modules/conf_startup/e_int_config_startup.c:275
+#: src/modules/conf_theme/e_int_config_theme.c:405
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:359
+msgid "Permissions:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:375
+msgid "Modified:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:614
+#, c-format
+msgid "You"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:663
+#, c-format
+msgid "Protected"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
+#, c-format
+msgid "Read Only"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
+#, c-format
+msgid "Forbidden"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:690
+msgid "Read-Write"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Basic Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:94
+msgid "Show alert when battery is low"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:138
+msgid "Check every:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:140
+#: src/modules/conf_performance/e_int_config_performance.c:149
+#: src/modules/temperature/e_mod_config.c:379
+#, c-format
+msgid "%1.0f ticks"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Polling"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:147
+msgid "Show alert on low battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:150
+msgid "Alert when at:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
+msgid "%1.0f min"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:158
+msgid "Auto dismiss in..."
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
+msgid "%1.0f sec"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:164
+msgid "Alert"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:170
+msgid "Auto Detect"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:172
+#: 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
+msgid "Internal"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:174
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:177
+msgid "Hardware"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:847
+msgid "Your battery is low!"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:849
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:924
+msgid "N/A"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:1096
+msgid "Battery Meter"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:244
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:251
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:279
+msgid "Modes"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:50
+#: src/modules/conf_applications/e_mod_main.c:42
+msgid "Favorites Menu"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:104
+#: src/modules/conf_applications/e_int_config_apps.c:119
+#: src/modules/conf_applications/e_mod_main.c:36
+msgid "IBar Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:135
+#: src/modules/conf_applications/e_mod_main.c:38
+msgid "Startup Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:151
+#: src/modules/conf_applications/e_mod_main.c:37
+msgid "Restart Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:236
+#: src/modules/fileman/e_fwin.c:1869
+msgid "All Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:250
+msgid "Selected Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:34
+msgid "Apps"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:35
+msgid "New Application"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:40
+msgid "IBar Other"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_clientlist/e_mod_main.c:34
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
+msgid "Menus"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:202
+msgid "Default Border Style"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:50
+msgid "Window Border Selection"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:247
+msgid "Remember this Border for this window next time it appears"
+msgstr ""
+
+#: 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
+#: src/modules/conf_icon_theme/e_mod_main.c:21
+#: src/modules/conf_mouse_cursor/e_mod_main.c:34
+#: src/modules/conf_scale/e_mod_main.c:34
+#: src/modules/conf_startup/e_mod_main.c:34
+#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_transitions/e_mod_main.c:34
+#: src/modules/conf_wallpaper/e_mod_main.c:28
+#: src/modules/dropshadow/e_mod_main.c:89
+msgid "Look"
+msgstr ""
+
+#: src/modules/conf_borders/e_mod_main.c:35
+msgid "Borders"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:40
+msgid "Client List Settings"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:99
+msgid "Group By"
+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:664
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
+#: src/modules/conf_transitions/e_int_config_transitions.c:152
+#: src/modules/conf_transitions/e_int_config_transitions.c:204
+#: src/modules/conf_transitions/e_int_config_transitions.c:236
+msgid "None"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:107
+msgid "Include windows from other screens"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:111
+msgid "Separate Groups By"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:116
+msgid "Using separator bars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:118
+msgid "Using menus"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:122
+msgid "Client Sort Order"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:126
+msgid "Alphabetical"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:128
+msgid "Window stacking layer"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:130
+msgid "Most recently used"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:134
+msgid "Iconified Windows"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:136
+msgid "Group with owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:138
+msgid "Group with current desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:140
+msgid "Separate group"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:142
+msgid "Warp to owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:146
+msgid "Menu Item Captions"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:147
+msgid "Limit caption length"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:149
+#, c-format
+msgid "%1.0f Chars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_mod_main.c:35
+msgid "Client List Menu"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:47
+msgid "Window Manager"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:48
+msgid "About Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:49
+msgid "About Dialog Version"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:50
+msgid "Border Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:51
+msgid "Settings Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:52
+msgid "Error Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:53
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
+msgid "Menu Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:54
+msgid "Menu Title Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:55
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
+msgid "Menu Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:56
+msgid "Menu Item Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:57
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
+msgid "Move Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
+msgid "Resize Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:59
+msgid "Winlist Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:60
+msgid "Winlist Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
+msgid "Winlist Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
+msgid "Widgets"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:68
+msgid "Button Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:69
+msgid "Button Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:70
+msgid "Check Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:71
+msgid "Check Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:72
+msgid "Entry Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:73
+msgid "Label Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:74
+msgid "List Item Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:75
+msgid "List Item Odd Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
+msgid "List Header"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:77
+msgid "Radio Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:78
+msgid "Radio Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:79
+msgid "Slider Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:80
+msgid "Slider Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:87
+msgid "Module Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:130
+#: src/modules/conf_colors/e_mod_main.c:35
+msgid "Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:251
+msgid "Other"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:435
+msgid "Window Manager Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:437
+#: src/modules/conf_colors/e_int_config_color_classes.c:445
+#: src/modules/conf_colors/e_int_config_color_classes.c:453
+#: src/modules/conf_colors/e_int_config_color_classes.c:517
+msgid "Enabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:439
+#: src/modules/conf_colors/e_int_config_color_classes.c:447
+#: src/modules/conf_colors/e_int_config_color_classes.c:455
+#: src/modules/conf_colors/e_int_config_color_classes.c:522
+msgid "Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:443
+msgid "Widget Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:451
+msgid "Module Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:501
+msgid "Color Classes"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:529
+msgid "Object Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:538
+msgid "Outline Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:547
+msgid "Shadow Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:556
+msgid "Defaults"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:52
+msgid "Desk Settings"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:149
+msgid "Desktop Name"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:150
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
+msgid "Name:"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:156
+msgid "Desktop Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:162
+#: src/modules/conf_mime/e_int_config_mime.c:193
+msgid "Set"
+msgstr ""
+
+#: src/modules/conf_desk/e_mod_main.c:35
+msgid "Desk"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
+msgid "Screen Lock Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
+msgid "Automatic Locking"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
+msgid "Lock when Enlightenment starts"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
+msgid "Lock when X screensaver activates"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:213
+#: src/modules/conf_desklock/e_int_config_desklock.c:443
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:189
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:207
+#, c-format
+msgid "%1.0f seconds"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
+msgid "Lock when idle time exceeded"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
+msgid "Idle time to exceed"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:225
+#: src/modules/conf_dpms/e_int_config_dpms.c:208
+#: src/modules/conf_dpms/e_int_config_dpms.c:220
+#: src/modules/conf_dpms/e_int_config_dpms.c:232
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:143
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:181
+#, c-format
+msgid "%1.0f minutes"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:298
+#: src/modules/conf_imc/e_int_config_imc.c:822
+#: src/modules/conf_startup/e_int_config_startup.c:262
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
+#: src/modules/gadman/e_mod_config.c:186
+msgid "Personal"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
+msgid "Login Box Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
+msgid "Show on all screen zones"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
+msgid "Show on current screen zone"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
+msgid "Show on screen zone #:"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:406
+#: src/modules/conf_desks/e_int_config_desks.c:247
+#: src/modules/conf_desks/e_int_config_desks.c:251
+#: src/modules/conf_desks/e_int_config_desks.c:284
+#: src/modules/conf_desks/e_int_config_desks.c:288
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:117
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:121
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:125
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:170
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:174
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:178
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
+#: src/modules/fileman/e_mod_config.c:229
+#, c-format
+msgid "%1.0f"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
+msgid "Wallpaper Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
+#: src/modules/gadman/e_mod_config.c:149
+msgid "Theme Defined"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
+msgid "Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:433
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:435
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:197
+msgid "Suggest entering presentation mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:439
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:202
+msgid "If deactivated before"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
+msgid "Custom Screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
+msgid "Use custom screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_mod_main.c:35
+msgid "Screen Lock"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:822
+msgid "Virtual Desktops Settings"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:239
+msgid "Number of Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:258
+#: src/modules/conf_desks/e_int_config_desks.c:295
+msgid "Desktop Mouse Flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:259
+msgid "Animated flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:277
+msgid "Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:296
+msgid "Flip when dragging objects to the screen edge"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:298
+msgid "Wrap desktops around when flipping"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:302
+msgid "Flip Animation"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:304
+msgid "Off"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:307
+msgid "Pane"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:310
+msgid "Zoom"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:313
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:146
+#, c-format
+msgid "%1.1f sec"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_mod_main.c:35
+msgid "Virtual Desktops"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
+msgid "Dialog Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
+#: src/modules/conf_engine/e_int_config_engine.c:94
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:114
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
+#: src/modules/conf_performance/e_int_config_performance.c:94
+#: src/modules/conf_performance/e_int_config_performance.c:134
+#: src/modules/conf_winlist/e_int_config_winlist.c:144
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
+#: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
+#: src/modules/mixer/conf_module.c:96
+msgid "General Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+msgid "Normal Windows"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
+msgid "Default Settings Dialogs Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
+msgid "Basic Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
+msgid "Advanced Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
+msgid "Default Dialog Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_mod_main.c:35
+msgid "Dialogs"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:129
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:136
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:146
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:153
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:190
+msgid "Resolution change"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:194
+msgid "Save"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:195
+msgid "Restore"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:228
+msgid "Screen Resolution Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:404
+msgid "Resolution"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:411
+msgid "Restore on login"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:415
+msgid "Refresh"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:474
+msgid "Rotation"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:493
+msgid "Mirroring"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:640
+msgid "Missing Features"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid ""
+"Your X Display Server is missing support for<br>the <hilight>XRandR</"
+"hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
+"resolutions without<br>the support of this extension. It could also "
+"be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
+"XRandR support detected."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:653
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:654
+msgid ""
+"No refresh rates were reported by your X Display Server.<br>If you are "
+"running a nested X Display Server, then<br>this is to be expected. However, "
+"if you are not, then<br>the current refresh rate will be used when "
+"setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
+"screen."
+msgstr ""
+
+#: src/modules/conf_display/e_mod_main.c:35
+msgid "Screen Resolution"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:60
+#: src/modules/conf_dpms/e_int_config_dpms.c:81
+msgid "Display Power Management Signaling"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:61
+msgid "The current display server is not <br>DPMS capable."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:82
+msgid "The current display server does not <br>have the DPMS extension."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:112
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
+msgid "Enable Display Power Management"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
+msgid "Timers"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
+msgid "Standby time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
+msgid "Suspend time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
+msgid "Off time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_mod_main.c:35
+msgid "Power Management"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
+#: 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 ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+msgid ""
+"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+msgid "Add Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
+msgid "Delete Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
+msgid "Modify Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
+msgid "Delete All"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:243
+msgid "Restore Default Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:248
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
+msgid "Action"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
+msgid "Action Params"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
+msgid "General Options"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
+msgid "%.2f seconds"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
+msgid ""
+"The binding key sequence, that you choose, is already used by <br><hilight>%"
+"s</hilight> action.<br>Please choose another binding edge sequence."
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:811
+msgid "CTRL"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:816
+msgid "ALT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:822
+msgid "SHIFT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:828
+msgid "WIN"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
+#: src/modules/conf_keybindings/e_mod_main.c:34
+#: src/modules/conf_mousebindings/e_mod_main.c:34
+#: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
+#: src/modules/mixer/app_mixer.c:301
+msgid "Input"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:38
+msgid "Engine Settings"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:95
+msgid "Enable Composite"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:102
+msgid "Default Engine"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:131
+msgid "Enable Composite Support ?"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:133
+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 ""
+
+#: src/modules/conf_engine/e_mod_main.c:35
+msgid "Engine"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:49
+msgid "Run Command Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:115
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:168
+msgid "Maximum Number of Matched Apps to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:119
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:172
+msgid "Maximum Number of Matched Exes to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:123
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:176
+msgid "Maximum History to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:129
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:182
+#: src/modules/conf_winlist/e_int_config_winlist.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:269
+msgid "Scroll Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:130
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:184
+#: src/modules/conf_winlist/e_int_config_winlist.c:270
+msgid "Scroll Animate"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:185
+#: src/modules/conf_winlist/e_int_config_winlist.c:272
+msgid "Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:189
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:228
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:232
+#: src/modules/conf_winlist/e_int_config_winlist.c:261
+#: src/modules/conf_winlist/e_int_config_winlist.c:276
+#: src/modules/conf_winlist/e_int_config_winlist.c:287
+#: src/modules/conf_winlist/e_int_config_winlist.c:291
+#, c-format
+msgid "%1.2f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:197
+msgid "Terminal Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:198
+msgid "Terminal Command (CTRL+RETURN to utilize)"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:206
+#: src/modules/conf_winlist/e_int_config_winlist.c:295
+msgid "Size Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:207
+#: src/modules/conf_winlist/e_int_config_winlist.c:296
+msgid "Minimum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:209
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:213
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:217
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:221
+#: src/modules/conf_winlist/e_int_config_winlist.c:298
+#: src/modules/conf_winlist/e_int_config_winlist.c:302
+#: src/modules/conf_winlist/e_int_config_winlist.c:306
+#: src/modules/conf_winlist/e_int_config_winlist.c:310
+#, c-format
+msgid "%4.0f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:211
+#: src/modules/conf_winlist/e_int_config_winlist.c:300
+msgid "Minimum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:215
+#: src/modules/conf_winlist/e_int_config_winlist.c:304
+msgid "Maximum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:219
+#: src/modules/conf_winlist/e_int_config_winlist.c:308
+msgid "Maximum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:225
+#: src/modules/conf_winlist/e_int_config_winlist.c:284
+msgid "Position Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:226
+#: src/modules/conf_winlist/e_int_config_winlist.c:285
+msgid "X-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:230
+#: src/modules/conf_winlist/e_int_config_winlist.c:289
+msgid "Y-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
+#: src/modules/exebuf/e_mod_main.c:129
+msgid "Run Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
+msgid "Core"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
+msgid "Title Bar"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
+msgid "Textblock Plain"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
+msgid "Textblock Light"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
+msgid "Textblock Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
+msgid "Settings Heading"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
+msgid "About Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
+msgid "About Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
+msgid "About Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
+msgid "Desklock Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
+msgid "Desklock Password"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
+msgid "Dialog Error"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
+msgid "Exebuf Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
+msgid "Splash Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
+msgid "Splash Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
+msgid "Splash Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
+msgid "Entry"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
+msgid "Frame"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
+msgid "Label"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
+msgid "Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
+msgid "Slider"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
+msgid "Radio Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
+msgid "Check Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
+msgid "Text List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
+msgid "List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
+msgid "Filemanager"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
+msgid "Typebuf"
+msgstr ""
+
+#: 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:104
+msgid "Normal Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
+msgid "Large Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
+msgid "Font Settings"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
+msgid "Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
+msgid "Really Big"
+msgstr ""
+
+#: 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:427
+msgid "Enable Custom Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
+#: 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:451
+msgid "Basic preview text: 123: 我的天空!"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:604
+msgid "Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
+msgid "Hinting"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
+#: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
+msgid "Automatic"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
+msgid "Icon Theme Settings"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
+msgid "Icon Themes"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
+msgid "Icon theme overrides general theme"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_mod_main.c:22
+msgid "Icon Theme"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:109
+#: src/modules/conf_imc/e_mod_main.c:35
+msgid "Input Method Settings"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:297
+msgid "Input Method Selector"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:300
+#: src/modules/conf_imc/e_int_config_imc.c:894
+msgid "Use No Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:961
+msgid "Setup Selected Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:901
+msgid "New"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:903
+msgid "Import..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:908
+msgid "Input Method Parameters"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:918
+msgid "Execute Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:925
+msgid "Setup Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:934
+msgid "Exported Environment Variables"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:66
+msgid "Select an Input Method Settings..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:281
+#: src/modules/conf_imc/e_int_config_imc_import.c:296
+msgid "Input Method Config Import Error"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:282
+msgid ""
+"Enlightenment was unable to import the configuration.<br><br>Are you sure "
+"this is really a valid configuration?"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:297
+msgid ""
+"Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
+#: src/modules/wizard/page_010.c:142
+msgid "Language"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:37
+msgid "Interaction Settings"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:94
+msgid "Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:96
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:100
+msgid "Threshold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:103
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:107
+msgid "Threshold for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:110
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:114
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:117
+#, 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:583
+#: src/modules/conf_intl/e_mod_main.c:35
+msgid "Language Settings"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:900
+#: src/modules/conf_intl/e_int_config_intl.c:977
+msgid "Language Selector"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:950
+#: src/modules/conf_intl/e_int_config_intl.c:1028
+msgid "Locale Selected"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:951
+#: src/modules/conf_intl/e_int_config_intl.c:1029
+msgid "Locale"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
+msgid ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:92
+msgid "Key Binding Settings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:223
+#: src/modules/conf_keybindings/e_mod_main.c:35
+msgid "Key Bindings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:228
+msgid "Add Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:231
+msgid "Delete Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:235
+msgid "Modify Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:918
+msgid "Key Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
+msgid "Binding Key Error"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1130
+#, 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:44
+#: src/modules/conf_menus/e_int_config_menus.c:110
+#: src/modules/conf_menus/e_int_config_menus.c:169
+#: src/modules/conf_menus/e_mod_main.c:35
+msgid "Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:101
+#: src/modules/conf_menus/e_int_config_menus.c:160
+msgid "Main Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:102
+#: src/modules/conf_menus/e_int_config_menus.c:161
+msgid "Show Favorites In Main Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:105
+#: src/modules/conf_menus/e_int_config_menus.c:164
+msgid "Show Applications In Main Menu"
+msgstr ""
+
+#: 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:114
+#: src/modules/conf_menus/e_int_config_menus.c:173
+msgid "Show Generic In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:117
+#: src/modules/conf_menus/e_int_config_menus.c:176
+msgid "Show Comment In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:181
+msgid "Autoscroll Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:182
+msgid "Autoscroll Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:184
+#: src/modules/conf_menus/e_int_config_menus.c:189
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:136
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:144
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:152
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
+#, c-format
+msgid "%2.0f pixels"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:187
+msgid "Autoscroll Cursor Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:194
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:195
+msgid "Menu Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:197
+#, c-format
+msgid "%5.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:200
+msgid "Fast Mouse Move Threshhold"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:202
+#: src/modules/conf_window_display/e_int_config_window_display.c:229
+#, c-format
+msgid "%4.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:206
+msgid "Click Drag Timeout"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:208
+#, c-format
+msgid "%2.2f seconds"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:64
+#: src/modules/conf_mime/e_mod_main.c:35
+msgid "File Icons"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:186
+msgid "File Types"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:69
+msgid "File Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:137
+msgid "Mime:"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:147
+msgid "Use Generated Thumbnail"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:150
+msgid "Use Theme Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:153
+msgid "Use Edje File"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:156
+msgid "Use Image"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:159
+msgid "Use Default"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:270
+msgid "Select an Edj File"
+msgstr ""
+
+#: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
+msgid "Files"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
+msgid ""
+"Please hold any modifier you want<br>and press any button on your mouse,<br> "
+"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
+"highlight> to abort."
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
+msgid "Mouse Binding Settings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
+#: src/modules/conf_mousebindings/e_mod_main.c:35
+msgid "Mouse Bindings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
+msgid "Add Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
+msgid "Delete Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
+msgid "Modify Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
+msgid "Restore Mouse and Wheel Binding Defaults"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
+msgid "Action Context"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
+msgid "Any"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
+msgid "Win List"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
+msgid "Popup"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
+msgid "Zone"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
+msgid "Container"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
+msgid "Manager"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
+msgid "Mouse Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
+msgid "Cursor Settings"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
+msgid "Show Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
+msgid "Idle Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
+msgid "Use Enlightenment Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
+msgid "Use X Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
+msgid "Cursor Size"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_mod_main.c:35
+msgid "Mouse Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
+msgid "Mouse Hand"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
+msgid "Mouse Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+msgid "Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
+msgid "Threshold"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:62
+msgid "Search Path Settings"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:73
+msgid "Data"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:75
+msgid "Images"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:79
+#: src/modules/conf_theme/e_int_config_theme.c:1010
+msgid "Themes"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:81
+msgid "Icons"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:85
+msgid "Backgrounds"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:87
+msgid "Messages"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:168
+msgid "E Paths"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:199
+msgid "Default Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:206
+msgid "User Defined Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_mod_main.c:35
+msgid "Search Directories"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:40
+msgid "Performance Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:95
+#: src/modules/conf_performance/e_int_config_performance.c:135
+msgid "Framerate"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:97
+#: src/modules/conf_performance/e_int_config_performance.c:137
+#, c-format
+msgid "%1.0f fps"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:100
+#: src/modules/conf_performance/e_int_config_performance.c:140
+msgid "Application Priority"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:146
+msgid "Cache Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:147
+msgid "Cache Flush Interval"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:152
+msgid "Size Of Font Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:154
+#, c-format
+msgid "%1.1f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:157
+msgid "Size Of Image Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:159
+#, c-format
+msgid "%1.0f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:162
+msgid "Number Of Edje Files To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:164
+#, c-format
+msgid "%1.0f files"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:167
+msgid "Number Of Edje Collections To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:169
+#, c-format
+msgid "%1.0f collections"
+msgstr ""
+
+#: src/modules/conf_performance/e_mod_main.c:35
+msgid "Performance"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
+msgid "Reset"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
+msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
+msgid "Add New Profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_mod_main.c:22
+msgid "Profiles"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:61
+msgid "Scaling Settings"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:140
+msgid "Scale with DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:144
+msgid "Relative"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:145
+msgid "Base DPI to scale relative to"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:148
+#: src/modules/conf_scale/e_int_config_scale.c:259
+#, c-format
+msgid "%1.0f DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:151
+#, c-format
+msgid "Currently %i DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:245
+msgid "Policy"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:248
+msgid "Don't Scale"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:252
+msgid "Scale relative to screen DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:255
+#, c-format
+msgid "Base DPI (Currently %i DPI)"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:263
+msgid "Custom scaling factor"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:266
+#: src/modules/conf_scale/e_int_config_scale.c:276
+#: src/modules/conf_scale/e_int_config_scale.c:282
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:272
+msgid "Constraints"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:273
+msgid "Minimum"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:279
+msgid "Maximum"
+msgstr ""
+
+#: src/modules/conf_scale/e_mod_main.c:35
+msgid "Scaling"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
+msgid "Screen Saver Settings"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:135
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:173
+msgid "Enable X screensaver"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:138
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:176
+msgid "Screensaver Timer(s)"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:140
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:178
+msgid "Time until X screensaver starts"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
+msgid "Time until X screensaver alternates"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
+msgid "Blanking"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
+msgid "Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
+msgid "Not Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
+msgid "Exposure Events"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
+msgid "Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
+msgid "Don't Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_mod_main.c:35
+msgid "Screen Saver"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:71
+msgid "Configured Shelves"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_config.c:114
+msgid "Setup"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:277
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"shelf?"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:39
+msgid "Startup Settings"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:328
+msgid "Show Splash Screen on Login"
+msgstr ""
+
+#: src/modules/conf_startup/e_mod_main.c:35
+#: src/modules/conf_transitions/e_int_config_transitions.c:134
+msgid "Startup"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:90
+msgid "Theme Selector"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:434
+msgid " Import..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:438
+msgid " Online..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1001
+msgid "Theme Categories"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1019
+msgid "Assign"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear All"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:67
+msgid "Select a Theme..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:274
+#: src/modules/conf_theme/e_int_config_theme_import.c:283
+msgid "Theme Import Error"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:275
+msgid ""
+"Enlightenment was unable to import the theme.<br><br>Are you sure this is "
+"really a valid theme?"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:284
+msgid "Enlightenment was unable to import the theme<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_web.c:127
+msgid "Exchange themes"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:44
+msgid "Transition Settings"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:126
+msgid "Events"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:135
+msgid "Desk Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:136
+msgid "Background Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:144
+#: src/modules/conf_transitions/e_mod_main.c:35
+msgid "Transitions"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
+msgid "Wallpaper Settings"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
+msgid "Use Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
+msgid "Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
+msgid "Gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "All Desktops"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+msgid "This Desktop"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
+msgid "This Screen"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
+msgid "Create a gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
+msgid "Color 1:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
+msgid "Color 2:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
+msgid "Fill Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
+msgid "Horizontal"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
+msgid "Vertical"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
+msgid "Diagonal Up"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
+msgid "Diagonal Down"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
+msgid "Radial"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
+msgid "Gradient Creation Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
+msgid "For some reason, Enlightenment was unable to create a gradient."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
+msgid "Wallpaper settings..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
+msgid "Fill and Stretch Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
+msgid "Stretch"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
+msgid "Center"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
+msgid "Tile"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
+msgid "Within"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
+msgid "Fill"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
+msgid "File Quality"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
+msgid "Use original file"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
+#, c-format
+msgid "%3.0f%%"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
+msgid "Select a Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
+msgid "Picture Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
+msgid ""
+"Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
+msgid "Wallpaper Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
+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:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
+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:117
+msgid "Exchange wallpapers"
+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:32
+#: src/modules/conf_wallpaper/e_mod_main.c:96
+msgid "Wallpaper"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:58
+#: src/modules/conf_window_display/e_mod_main.c:35
+msgid "Window Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:167
+msgid "Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:168
+msgid "Show window geometry information when moving or resizing"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:170
+#: src/modules/conf_window_display/e_int_config_window_display.c:227
+msgid "Animate the shading and unshading of windows"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:174
+#: src/modules/conf_window_display/e_int_config_window_display.c:254
+msgid "Automatic New Window Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:176
+#: src/modules/conf_window_display/e_int_config_window_display.c:257
+msgid "Smart Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:178
+#: src/modules/conf_window_display/e_int_config_window_display.c:259
+msgid "Don't hide Gadgets"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:180
+#: src/modules/conf_window_display/e_int_config_window_display.c:261
+msgid "Place at mouse pointer"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:182
+#: src/modules/conf_window_display/e_int_config_window_display.c:263
+msgid "Place manually with the mouse"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:184
+#: src/modules/conf_window_display/e_int_config_window_display.c:265
+msgid "Automatically switch to desktop of new window"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:203
+msgid "Window Move Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:205
+#: src/modules/conf_window_display/e_int_config_window_display.c:216
+msgid "Display information"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:207
+msgid "Follow the window as it moves"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:214
+msgid "Window Resize Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:218
+msgid "Follow the window as it resizes"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:225
+msgid "Window Shading"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:234
+msgid "Linear"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:238
+msgid "Smooth accelerate and decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:242
+msgid "Accelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:246
+msgid "Decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:269
+msgid "Window Border"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:272
+msgid "Prefer user defined icon"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:274
+msgid "Prefer application provided icon"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:50
+msgid "Focus Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:165
+msgid "Click Window to Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:167
+msgid "Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:169
+msgid "Most recent Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:183
+msgid "Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:185
+msgid "Click to focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:187
+msgid "Pointer focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:189
+msgid "Sloppy focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:193
+msgid "New Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:195
+msgid "No new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:197
+msgid "All new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:199
+msgid "Only new dialogs get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:201
+msgid "Only new dialogs get focus if the parent has focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:205
+msgid "Other Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:206
+msgid "Always pass on caught click events to programs"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:208
+msgid "A click on a window always raises it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:210
+msgid "A click in a window always focuses it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:212
+msgid "Refocus last focused window on desktop switch"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:214
+msgid "Revert focus when hiding or closing a window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:216
+msgid "Slide pointer to a new focused window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_mod_main.c:35
+#: src/modules/wizard/page_060.c:26
+msgid "Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
+#: src/modules/conf_window_manipulation/e_mod_main.c:35
+msgid "Window Geometry"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
+msgid "Resistance"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
+msgid "Resist moving or resizing a window over an obstacle"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
+msgid "Resistance between windows:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
+msgid "Resistance at the edge of the screen:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
+msgid "Resistance to desktop gadgets:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
+msgid "Keyboard move and resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
+msgid "Automatically accept changes after:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
+msgid "Move by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
+msgid "Resize by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
+#: src/modules/conf_window_manipulation/e_mod_main.c:37
+msgid "Window Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
+msgid "Smart expansion"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
+msgid "Fill available space"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
+msgid "Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
+msgid "Both"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
+msgid "Automatically move/resize windows on shelf autohide"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
+#: src/modules/conf_window_manipulation/e_mod_main.c:36
+msgid "Window Stacking"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
+msgid "Automatically raise windows on mouse over"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
+msgid "Allow windows to be above fullscreen window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
+msgid "Autoraise"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
+msgid "Delay before raising:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
+msgid "Raise Window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
+msgid "Raise when starting to move or resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
+msgid "Raise when clicking to focus"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
+msgid "Class:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
+msgid "Title:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
+msgid "Role:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
+msgid "<No Role>"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:62
+msgid "Window List Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:145
+msgid "Show iconified windows"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:147
+msgid "Show iconified windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:151
+msgid "Show iconified windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:157
+msgid "Show windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:159
+msgid "Show windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:163
+#: src/modules/conf_winlist/e_int_config_winlist.c:241
+msgid "Selection Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:164
+#: src/modules/conf_winlist/e_int_config_winlist.c:242
+msgid "Focus window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:166
+#: src/modules/conf_winlist/e_int_config_winlist.c:244
+msgid "Raise window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:168
+#: src/modules/conf_winlist/e_int_config_winlist.c:246
+msgid "Warp mouse to window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:170
+#: src/modules/conf_winlist/e_int_config_winlist.c:248
+msgid "Uncover windows while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:172
+#: src/modules/conf_winlist/e_int_config_winlist.c:250
+msgid "Jump to desk while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:176
+#: src/modules/conf_winlist/e_int_config_winlist.c:254
+msgid "Warp Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:177
+#: src/modules/conf_winlist/e_int_config_winlist.c:255
+msgid "Warp At End"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:257
+msgid "Warp Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:135
+msgid "Cpufreq"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:182
+msgid "Fast (4 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:189
+msgid "Medium (8 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:196
+msgid "Normal (32 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:203
+msgid "Slow (64 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:210
+msgid "Very Slow (256 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:225
+msgid "Manual"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
+msgid "Lower Power Automatic"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
+msgid "Minimum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
+msgid "Maximum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:244
+msgid "Restore CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:252
+msgid "Powersaving policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:280
+msgid "Automatic powersaving"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:299
+#, c-format
+msgid "%i MHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:301
+#, c-format
+msgid "%i.%i GHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:318
+msgid "Time Between Updates"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:324
+msgid "Set CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:331
+msgid "Set CPU Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:337
+msgid "Powersaving behavior"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:386
+msgid ""
+"There was an error trying to set the<br>cpu frequency governor via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:412
+msgid ""
+"Your kernel does not support setting the<br>CPU frequency at all. You may be "
+"missing<br>Kernel modules or features, or your CPU<br>simply does not "
+"support this feature."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:432
+msgid ""
+"There was an error trying to set the<br>cpu frequency setting via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:40
+msgid "Dropshadow Settings"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:108
+msgid "Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:111
+msgid "High Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:113
+msgid "Medium Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:115
+msgid "Low Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:119
+msgid "Blur Type"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:122
+msgid "Very Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:124
+msgid "Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:128
+msgid "Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:130
+msgid "Very Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:134
+msgid "Shadow Distance"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:137
+msgid "Very Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:139
+msgid "Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:141
+msgid "Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:143
+msgid "Very Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:145
+msgid "Extremely Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:147
+msgid "Underneath"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:151
+msgid "Shadow Darkness"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:154
+msgid "Very Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:156
+msgid "Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:158
+msgid "Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:160
+msgid "Very Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:90
+msgid "Dropshadow"
+msgstr ""
+
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+msgid "Run Command Dialog"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
+msgid "Home"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:322
+msgid "Favorites"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:334
+msgid "Root"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:431
+msgid ""
+"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
+"been wiped and a new set of defaults initialized. This<br>will happen "
+"regularly during development, so don't report a<br>bug. This simply means "
+"Fileman module needs new configuration<br>data by default for usable "
+"functionality that your old<br>configuration simply lacks. This new set of "
+"defaults will fix<br>that by adding it in. You can re-configure things now "
+"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:444
+msgid ""
+"Your Fileman Module configuration is NEWER than Fileman Module version. This "
+"is very<br>strange. This should not happen unless you downgraded<br>the "
+"Fileman Module or copied the configuration from a place where<br>a newer "
+"version of the Fileman Module was running. This is bad and<br>as a "
+"precaution your configuration has been now restored to<br>defaults. Sorry "
+"for the inconvenience.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:513
+msgid "Fileman Settings Updated"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:95
+msgid "Fileman Settings"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:227
+msgid "Icon Size"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:233
+msgid "View"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:236
+msgid "Open Dirs In Place"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:240
+msgid "Sort Dirs First"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:243
+msgid "Case Sensitive"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:247
+msgid "Use Single Click"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:250
+msgid "Use Alternate Selection Modifiers"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:254
+msgid "Show Icon Extension"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:257
+msgid "Show Full Path"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:260
+msgid "Show Desktop Icons"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:263
+msgid "Show Toolbar"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:775
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1412
+msgid "Go to Parent Directory"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1474
+msgid "Other application..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
+msgid "Open"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1838
+msgid "Known Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1848
+msgid "Specific Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1890
+msgid "Custom Command"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2146
+#: src/modules/fileman_opinfo/e_mod_main.c:94
+#, c-format
+msgid "Copying is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2149
+#: src/modules/fileman_opinfo/e_mod_main.c:97
+#, c-format
+msgid "Moving is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2152
+#: src/modules/fileman_opinfo/e_mod_main.c:100
+#, c-format
+msgid "Deleting is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2155
+#: src/modules/fileman_opinfo/e_mod_main.c:103
+#, c-format
+msgid "Unknown operation from slave is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2165
+#: src/modules/fileman_opinfo/e_mod_main.c:113
+#, c-format
+msgid "Copy of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2167
+#: src/modules/fileman_opinfo/e_mod_main.c:115
+#, c-format
+msgid "Copying %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2171
+#: src/modules/fileman_opinfo/e_mod_main.c:119
+#, c-format
+msgid "Move of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2173
+#: src/modules/fileman_opinfo/e_mod_main.c:121
+#, c-format
+msgid "Moving %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2177
+#: src/modules/fileman_opinfo/e_mod_main.c:125
+#, c-format
+msgid "Delete done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2179
+#: src/modules/fileman_opinfo/e_mod_main.c:127
+#, c-format
+msgid "Deleting files..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2182
+#: src/modules/fileman_opinfo/e_mod_main.c:130
+#, c-format
+msgid "Unknow operation from slave %d"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:138
+#: src/modules/fileman_opinfo/e_mod_main.c:148
+msgid "(no information)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:142
+#, c-format
+msgid "File: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:144
+#, c-format
+msgid "From: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:151
+#, c-format
+msgid "To: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
+msgid "Processing %d operation(s)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:333
+msgid "Filemanager is idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:414
+msgid "EFM Operation Info"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:58
+msgid "Gadgets Manager"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:147
+msgid "Background Mode"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
+msgid "Custom Image"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
+msgid "Custom Color"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:160
+msgid "Transparent"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:167
+msgid "Animations"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:168
+msgid "Background"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
+msgid "Gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:723
+msgid "Free"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:755
+msgid "Always on desktop"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:765
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:796
+msgid "Add other gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+msgid "Show/hide gadgets"
+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
+msgid "Window : List"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
+msgid "Next Window"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
+msgid "Previous Window"
+msgstr ""
+
+#: src/modules/winlist/e_winlist.c:141
+msgid "Select a window"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:56
+msgid "IBar Settings"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:102
+msgid "Selected Bar Source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:123
+msgid "Icon Labels"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
+msgid "Show Icon Label"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:130
+msgid "Display App Name"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:134
+msgid "Display App Comment"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:138
+msgid "Display App Generic"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:168
+msgid "Create new IBar source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:169
+msgid "Enter a name for this new source:"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:183
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:187
+msgid "Are you sure you want to delete this bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:215
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:797
+msgid "Change Icon Properties"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:802
+msgid "Remove Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:812
+msgid "Add An Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:819
+msgid "Create New Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:835
+msgid "Add Application"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:51
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:104
+msgid "Display Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:109
+msgid "Display Title"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:114
+msgid "Display Class"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:119
+msgid "Display Icon Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:124
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:154
+msgid "Show windows from all screens"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:159
+msgid "Show windows from current screen"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:168
+msgid "Show windows from all desktops"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:173
+msgid "Show windows from active desktop"
+msgstr ""
+
+#: src/modules/ibox/e_mod_main.c:227
+msgid "IBox"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:72
+msgid "Pager Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
+msgid "Flip desktop on mouse wheel"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
+msgid "Show desktop names"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
+msgid "Popup Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
+msgid "Show popup on desktop change"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:132
+msgid "Show popup for urgent windows"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:169
+msgid "Select and Slide button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:176
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:183
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:192
+msgid "Keyaction popup height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
+msgid "%.0f px"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:198
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:209
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
+msgid "Popup speed"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
+#, c-format
+msgid "%1.1f seconds"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:231
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:232
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:235
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:290
+msgid ""
+"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
+"<br>Or <hilight>Del</hilight> to reset the button."
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:345
+msgid "Attetion"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:346
+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 ""
+
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
+msgid "Button %i"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2850
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:111
+msgid "Start"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:34
+msgid "System Control"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:55
+msgid "System Controls"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:63
+msgid "Temperature Settings"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:352
+msgid "Display Units"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:354
+msgid "Celsius"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:356
+msgid "Fahrenheit"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:378
+msgid "Check Interval"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:258
+msgid "Fast"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:262
+msgid "Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Very Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:271
+#: src/modules/temperature/e_mod_config.c:295
+#: src/modules/temperature/e_mod_config.c:396
+#: src/modules/temperature/e_mod_config.c:408
+msgid "High Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:274
+msgid "200 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:276
+msgid "150 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:287
+msgid "110 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:282
+#: src/modules/temperature/e_mod_config.c:306
+#: src/modules/temperature/e_mod_config.c:401
+#: src/modules/temperature/e_mod_config.c:413
+msgid "Low Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:285
+msgid "130 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:289
+msgid "90 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:298
+msgid "93 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:300
+msgid "65 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:302
+#: src/modules/temperature/e_mod_config.c:311
+msgid "43 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:309
+msgid "55 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:313
+msgid "32 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:367
+msgid "Sensors"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:402
+#, c-format
+msgid "%1.0f F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:409
+#: src/modules/temperature/e_mod_config.c:414
+#, c-format
+msgid "%1.0f C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:147
+msgid "Temperature"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:221
+msgid "Next"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:281
+msgid "Welcome to Enlightenment"
+msgstr ""
+
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:58
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:91
+msgid ""
+"No menu files were<br>found on your system.<br>Please see "
+"the<br>documentation on<br>www.enlightenment.org<br>for more details "
+"on<br>how to get your<br>application menus<br>working."
+msgstr ""
+
+#: src/modules/wizard/page_030.c:107
+msgid "Select application menu"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:124
+msgid "System Default"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:25
+msgid "Launcher Bar"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:27
+msgid "Select applications"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:28
+msgid "Desktop Files"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:32
+msgid "No icons on desktop"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:35
+msgid "Enable desktop icons"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:28
+msgid "Focus mode"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:32
+msgid "Click to focus windows"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:35
+msgid "Mouse over focuses windows"
+msgstr ""
+
+#: src/modules/wizard/page_070.c:204
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:60
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Select Applications"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:165
+msgid "Capture"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:167
+msgid "Playback"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:289
+msgid "Output"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:363
+msgid "Cards"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
+msgid "Channels"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Card:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:394
+msgid "Channel:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:398
+msgid "Type:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:402
+msgid "Left:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:407
+msgid "Right:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
+msgid "Mute"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
+msgid "Lock Sliders"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:419
+msgid "Edit"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:202
+msgid "Show both sliders when locked"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:322
+msgid "Sound Cards"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:377
+msgid "Mixer Settings"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:98
+msgid "Mixer to use for global actions:"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:152
+msgid "Launch mixer..."
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:187
+msgid "Mixer Module Settings"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:123
+msgid "Mixer Settings Updated"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:602
+msgid "Controls"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:1157
+msgid ""
+"Mixer Module Settings data changed.<br>Your old configuration has been "
+"replaced with new default.<br>Sorry for the inconvenience."
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:214
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:731
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:737
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:742
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:745
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:748
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:769
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:891
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:892
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1094
+msgid "Systray"
+msgstr ""
diff --git a/po/ko.gmo b/po/ko.gmo
index cfe6d93..928a2fc 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index f5b37bf..c83d56d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,41 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2007-04-29 23:06+0200\n"
-"Last-Translator: Michael Kim <lavnrose at gmail.com>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-08-25 14:48+0000\n"
+"Last-Translator: Michael Kim <Unknown>\n"
 "Language-Team: Korean <KO at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Enlightenment에 대하여"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "닫기"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr ""
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,14 +51,6 @@ 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-2007, by the Enlightenment Development Team.<br><br>ìš°"
-"리는 당신이 이 소프트웨어를 사용할 수 있도록 즐겁게 만들고 있습니다.<br><br>"
-"이 소프트웨어는 어떠한 보증도 하지 않습니다.이 소프트웨어는 저작권을 가지고 "
-"있으며, 당신의 시스템에 저작권 정보 파일인 COPYING 과 COPYING-PLAIN 이 설치 "
-"되어 있습니다.<br><br>Enlightenment은 <hilight>아주 거대한 개발물</hilight> "
-"이며 안정화되지 않았습니다. 많은 기능들이 진행 중이거나 아직 추가되지 않은 기"
-"능들이 추가 되고 있으며, 많은 오류가 있습니다. 당신에게 <hilight>경고 했습니"
-"다!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -75,636 +68,604 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "이 창을 강제종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "예"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "아니오"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "정말 종료 하시겠습니까?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
-msgstr "Enlightenment 종료를 실행 했습니다.<br><br>정말 종료 하시겠습니까?"
+msgstr "Enlightement를 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
-msgstr "정말 로그아웃 하시겠습니까?"
+msgstr "로그아웃 하시겠습니까?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
-msgstr "로그아웃 하려고 합니다.<br><br>정말 로그아웃 하시겠습니까?"
+msgstr "로그아웃 하시겠습니까?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
-msgstr "정말 시스템을 종료 하시겠습니까?"
+msgstr "시스템을 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
-msgstr "컴퓨터를 종료 합니다.<br><br>정말 컴퓨터를 종료 하시겠습니까?"
+msgstr "시스템을 종료하시겠습니까?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
-msgstr "정말 리붓 하시겠습니까?"
+msgstr "시스템을 재시작하시겠습니까?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
-msgstr "컴퓨터를 재시작 합니다.<br><br>정말 컴퓨터를 재시작 하시겠습니까?"
+msgstr "시스템을 재시작하시겠습니까?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr ""
+msgstr "시스템을 정지 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr "정말 대기 모드로 전환 하시겠습니까?"
+msgstr "시스템을 대기 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
-msgstr ""
+msgstr "시스템을 대기 상태로 전환하시겠습니까?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "창 : 움직임"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "이동"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "크기변경"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "메뉴"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "창 메뉴"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "말아올림"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "아래로"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "강제종료"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "창 : 상태"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "고정 상태"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "아이콘 상태"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "전체화면 상태"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "최대화"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
-msgstr "높이 최대화"
+msgstr "세로 최대화"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
-msgstr "넓이 최대화"
+msgstr "가로 최대화"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "최대화 상태 \"일반\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "최대화 상태 \"확장\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "최대화 상태 \"채우기\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "데스크탑"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "왼쪽으로 이동"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "오른쪽으로 이동"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "위로 이동"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "아래로 이동"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "데스크탑 표시"
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "데스크탑 표시"
+msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "데스크탑 0 으로 변경"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "데스크탑 1로 변경"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "데스크탑 2로 변경"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "데스크탑 3으로 변경"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "데스크탑 4로 변경"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "데스크탑 5로 변경"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "데스크탑 6으로 변경"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "데스크탑 7로 변경"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "데스크탑 8로 변경"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "데스크탑 9로 변경"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "데스크탑 10으로 변경"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "데스크탑 11로 변경"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "데스크탑 변경..."
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "왼쪽으로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2644
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr "오른쪽으로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "위로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "아래로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
-#, fuzzy
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr "아래로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "아래로 이동"
+msgstr ""
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "데스크탑 0 으로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "데스크탑 1로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "데스크탑 2로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "데스크탑 3으로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "데스크탑 4로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "데스크탑 5로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "데스크탑 6으로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "데스크탑 7로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "데스크탑 8로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "데스크탑 9로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "데스크탑 10으로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "데스크탑 11로 변경"
+msgstr ""
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "데스크탑 변경..."
+msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "화면"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "마우스를 화면 0 으로"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "마우스를 화면 1로"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "마우스를 화면으로 보내기"
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "마우스를 앞의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "마우스를 뒤의 화면으로 보내기"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "마우스 앞/뒤 화면으로 보내기..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "창 : 이동"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "다음 데스크탑으로"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "이전 데스크탑으로"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "데스크탑으로..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "메인 메뉴 표시"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "즐겨찾기 메뉴 표시"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "모든 응용프로그램 메뉴 표시"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "클라이언트 메뉴 표시"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "메뉴 표시..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "실행"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "명령"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "응용프로그램"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "재 시작"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "종료"
 
-#: src/bin/e_actions.c:2803
-#, fuzzy
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr "종료"
+msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s 모듈"
+msgstr ""
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "전체화면 상태"
+msgstr ""
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "고정 상태"
+msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "시스템"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "로그아웃"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "재기동"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "대기모드"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "하이버네이션"
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "ê³ ì •"
+msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "창 정리"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "창 : 움직임"
+msgstr ""
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "모듈 상태"
+msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
-#, fuzzy
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr "ë°°ê²½"
+msgstr "바탕 화면으로 설정"
 
-#: src/bin/e_border.c:5058
-#, fuzzy
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
-msgstr "데스크탑 이름"
+msgstr ""
 
-#: src/bin/e_border.c:5070
-#, fuzzy
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr "데스크탑 이름"
+msgstr "아이콘 파일을 검색합니다."
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "테마 선택기"
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "색 선택"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "확인"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "취소"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -714,8 +675,12 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
+"이전의 설정이 새로운 설정으로 갱신되었습니다. <br> 현재 Enlightment는 개발 중"
+"에 있기 때문에 <br>이런 일이 발생할 수도 있으니 버그로 여기지 마십시오.<br>새"
+"로운 기능을 위한 의도로 이해해주시기 바랍니다. <br>번거로우시겠지만, 원하시는"
+"데로 다시 설정해주시길 바랍니다."
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -723,21 +688,26 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
+"현재 Enlightment가 사용하는 설정 형식보다 <br>최신 형식을 사용하시고 있습니"
+"다. <br>더 높은 버전의 Enlightenment 에서 쓰던 설정을 가져오시거나,<br> 전에 "
+"사용하시던 버전보다 더 낮은 Enlightement를 설치하신 것 같습니다.<br><br>예상"
+"치 못한 에러를 막기 위해 설정을 초기화하였습니다."
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "데스크탑 설정"
+msgstr "설정이 갱신되었습니다."
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings 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 ""
+"Enlightenment 설정을 저장하다가 <br>알 수 없는 이유로 실패하였습니다.<br><br>"
+"데이터가 손상되는 것을 막기 위해 다음 파일을 삭제하였습니다.<br>%s"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -746,8 +716,11 @@ 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 ""
+"Enlightenment 설정 파일이 <br>저장되기에 너무 큽니다. 보통 파일 크기가<br>매"
+"우 작아 이런 에러를 내기 어렵습니다.<br><br>데이터가 손상되는걸 막기 위해 다"
+"음 파일을 삭제하였습니다.<br>%s"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -755,8 +728,11 @@ 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 ""
+"Enlightenment 설정을 저장하던 도중 입출력 에러가<br>발생하였습니다. 하드디스"
+"크 이상일 가능성이 높습니다.<br>데이터 손상을 막기 위해 다음 파일을 삭제하였"
+"습니다.<br>%s"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -764,21 +740,25 @@ msgid ""
 "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 ""
+"남은 용량이 부족하여 Enlightenment 설정을<br>저장할 수 없습니다.<br>안 쓰는 "
+"파일을 지우거나, Quota 제한을 확인하시기 바랍니다.<br><br>데이터 손상을 막기 "
+"위해 다음 파일을 삭제하였습니다.<br>%s"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings 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 ""
+"Enlightenment 설정 중 저장되다 만 파일이<br>있습니다. (흔히 일어나진 않습니"
+"다.)<br><br>데이터 손상을 막기 위해 다음 파일을 삭제하였습니다.<br>%s"
 
-#: src/bin/e_config.c:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
+msgstr "Enlightenment 설정 저장 중 오류가 발생하였습니다."
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -786,12 +766,12 @@ msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
 msgid "Advanced"
 msgstr "고급설정"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "기본"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "적용"
 
@@ -799,7 +779,7 @@ msgstr "적용"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "모듈"
 
@@ -808,39 +788,39 @@ msgstr "모듈"
 msgid "Extensions"
 msgstr "확장"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
-msgstr ""
+msgstr "비밀번호를 입력해주세요."
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -848,22 +828,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -884,7 +864,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -913,28 +893,25 @@ msgid "General"
 msgstr "일반"
 
 #: src/bin/e_eap_editor.c:515
-#, fuzzy
 msgid "Generic Name"
-msgstr "일반 정보"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:520
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:105
 msgid "Window Class"
-msgstr "창 클래스"
+msgstr "클래스"
 
 #: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
 msgid "Categories"
-msgstr "항목"
+msgstr "분류"
 
 #: src/bin/e_eap_editor.c:528
-#, fuzzy
 msgid "Mime Types"
-msgstr "파일 형태"
+msgstr ""
 
-#: src/bin/e_eap_editor.c:534
-#, fuzzy
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr "응용 프로그램"
+msgstr "옵션"
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
@@ -942,402 +919,377 @@ msgstr "시작 알림"
 
 #: src/bin/e_eap_editor.c:537
 msgid "Run in Terminal"
-msgstr ""
+msgstr "터미널에서 실행"
 
 #: src/bin/e_eap_editor.c:539
-#, fuzzy
 msgid "Show in Menus"
-msgstr "메인 메뉴 표시"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:543
-#, fuzzy
 msgid "Desktop file"
-msgstr "데스크탑 이름"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:544
-#, fuzzy
 msgid "Filename"
-msgstr "이름 변경"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:573
 msgid "Select an Icon"
 msgstr "아이콘 선택"
 
 #: src/bin/e_eap_editor.c:642
-#, fuzzy
 msgid "Select an Executable"
-msgstr "이미지 선택"
+msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "삭제"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
-#, fuzzy
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
-msgstr "사용자 지정"
+msgstr "잘라내기"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
-msgstr ""
+msgstr "복사"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
-#, fuzzy
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
-msgstr "빠름"
+msgstr "붙여넣기"
 
 #: src/bin/e_entry.c:529
-#, fuzzy
 msgid "Select All"
-msgstr "모두 삭제"
+msgstr "전체 선택"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "실행 오류"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "응용프로그램 실행 오류"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
-msgstr ""
-"Enlightenment이 응용프로그램을 실행 할 수 없습니다:<br><br>%s<br><br>The 응용"
-"프로그램 시작 실패."
+msgstr "Enlightment가 %s 프로그램을 실행하는데 <br>실패하였습니다."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
-msgstr ""
+msgstr "%s 프로그램이 예상치 않게 종료되었습니다."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
-msgstr ""
+msgstr "코드 %i 을(를) %s 프로그램이 남겼습니다."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "오류 기록"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "오류 메세지가 없음."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "이 메세지 저장"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "오류 메세지"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "시그널 정보 오류"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "출력 데이터"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "출력물이 없음."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "실행 오류"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "실행 오류"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "오류"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
-msgstr "%i 개의 파일"
+msgstr "%i개 파일"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr ""
+msgstr "링크"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "대하여"
+msgstr "중지"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "선택 설정"
+msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
-#, fuzzy
 msgid "View Mode"
-msgstr "일반 대화창"
+msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "새로 고침"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "숨김 파일 표시"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "정렬순서 저장"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "ì •ë ¬"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "새 디렉토리"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "실행 오류"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "속성"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr "기본값 사용"
+msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
-#, fuzzy
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "파일 아이콘"
+msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
-#, fuzzy
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "사용자 지정"
+msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
-#, fuzzy
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
-msgstr "창 목록"
+msgstr ""
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "아이콘 이름"
+msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "ë°°ê²½"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "도구모음 내용"
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
-msgstr "가깝게"
+msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "새 디렉토리 작성"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "디렉토리 명:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s 이름 변경:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "이름 변경"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
-#, fuzzy
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
-msgstr "재 시작"
+msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "오류"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "%s 시작중"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "삭제 확인"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1348,145 +1300,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "화일 속성"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "파일:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "크기:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "최근 수정:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "화일 형태:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "권한"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "소유자:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "다른사람이 읽을 수 있음"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "다른사람이 쓸수 있음"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "소유자는 읽을수 있음"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "소유자는 쓸수 있음"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "미리보기"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "기본값"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "미리보기"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "사용자 지정"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
-#, fuzzy
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr "오류 메세지"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "이미지 선택"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
-#, fuzzy, c-format
+#: src/bin/e_fm_hal.c:222
+#, c-format
 msgid "Unknown Volume"
-msgstr "알수없음"
+msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "이동식 장치"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "외관"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1498,7 +1453,7 @@ msgstr ""
 "이 창에서 이전 인스턴스가 여전히 실행 중입니다\n"
 "시작을 중지합니다.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "ì°½ ê³ ì •"
 
@@ -1532,21 +1487,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "고정상태"
 
@@ -1555,12 +1510,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr ""
 
@@ -1569,7 +1524,7 @@ msgid "Maximized state"
 msgstr "최대화 상태"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "전체화면 상태"
 
@@ -1577,7 +1532,7 @@ msgstr "전체화면 상태"
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "테두리 형태"
 
@@ -1602,9 +1557,8 @@ msgid "Edit Icon"
 msgstr "아이콘 편집"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "응용프로그램 추가"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1623,125 +1577,119 @@ msgid "Unpin from Desktop"
 msgstr ""
 
 #: src/bin/e_int_border_menu.c:131
-#, fuzzy
 msgid "More..."
-msgstr "가져오기..."
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "아이콘화"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "수직으로 최대화"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "수평으로 최대화"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "최대화에서 복원"
 
-#: src/bin/e_int_border_menu.c:485
-#, fuzzy
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
-msgstr "키보드와 마우스"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
-#, fuzzy
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
-msgstr "즐겨찾기 메뉴 표시"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
-#, fuzzy
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
-msgstr "실행할 프로그램 추가"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "테두리"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "상태"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "기억"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "창 속성"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "항상 위에"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "보통"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "항상 아래로"
 
-#: src/bin/e_int_border_menu.c:922
-#, fuzzy
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
-msgstr "기본 테두리"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
-#, fuzzy
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "응용프로그램의 아이콘"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
-#, fuzzy
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
-msgstr "사용자 정의 디렉토리"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "전체화면"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "창 목록"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "페이저"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1757,7 +1705,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "ICCM 속성"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "제목"
 
@@ -1849,11 +1797,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1861,15 +1809,15 @@ msgstr ""
 msgid "Hidden"
 msgstr "숨김"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "창 기억"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1883,11 +1831,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1895,146 +1843,141 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "없음"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "크기와 위치"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "ê³ ì •"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "크기, 위치, 고정상태"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "모두"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "기억하기 사용"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "창 이름과 클래스"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "창 이름"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "클래스"
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "속성 기억"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "가상 데스크탑"
 
-#: src/bin/e_int_border_remember.c:531
-#, fuzzy
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
-msgstr "사용자 지정 화면잠금"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "창 목록 무시"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "응용프로그램 실행 오류"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "하나의 창만 일치"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "로그인시 이 프로그램 시작"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "아이콘 속성 변경"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "로그인시 이 프로그램 시작"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "데스크탑 설정"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 #: src/modules/wizard/page_050.c:26
-#, fuzzy
 msgid "File Manager"
-msgstr "이름 변경"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:44
-#, fuzzy
 msgid "Shelf"
-msgstr "도구모음 크기"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:120
 msgid "Module Settings"
 msgstr "모듈 설정"
 
-#: src/bin/e_int_config_modules.c:181
-#, fuzzy
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
-msgstr "사용가능한 도구"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
-#, fuzzy
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
-msgstr "모듈"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
-#, fuzzy
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
-msgstr "모듈"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
-#, fuzzy
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
-msgstr "모듈 읽기 오류"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2045,9 +1988,8 @@ msgid "Shelf Contents"
 msgstr "도구모음 내용"
 
 #: src/bin/e_int_gadcon_config.c:42
-#, fuzzy
 msgid "Toolbar Contents"
-msgstr "내용 설정..."
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
 msgid "Available Gadgets"
@@ -2066,12 +2008,11 @@ msgid "Remove Gadget"
 msgstr "도구 제거"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "이동 설정"
+msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "레이아웃"
 
@@ -2095,12 +2036,12 @@ msgid "Favorite Applications"
 msgstr "자주 실행하는 응용프로그램"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "응용 프로그램"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2109,7 +2050,7 @@ msgstr "응용 프로그램"
 msgid "Windows"
 msgstr "ì°½"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "잃어버린 창"
 
@@ -2142,141 +2083,133 @@ msgid "(No Applications)"
 msgstr "(응용프로그램 없음)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "가상 데스크탑"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(창 없음)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "이름 없음!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Shelf 추가"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Shelf 삭제"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "도구모음 설정"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "가벼움"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "보통"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "거대함"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "도구모음 내용"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "창이 도구모음 위로 갈 수 있음"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "스타일"
 
-#: src/bin/e_int_shelf_config.c:684
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr "자동으로 앞으로"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "도구모음 자동 숨김"
 
-#: src/bin/e_int_shelf_config.c:689
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
-msgstr "다음 화면 영역에서 보기 #:"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
-#, fuzzy, c-format
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
 msgid "%.1f seconds"
-msgstr "%1.1f ì´ˆ"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
-msgstr "하이버네이션"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
-msgstr "데스크탑 표시"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2437,14 +2370,12 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "설정 시스템을 설정 할 수 없습니다."
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Shelf 시스템을 설정 할 수 없습니다."
+msgstr ""
 
 #: src/bin/e_main.c:600
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "초기화 시스템을 설정 할 수 없습니다."
+msgstr ""
 
 #: src/bin/e_main.c:609
 msgid ""
@@ -2468,7 +2399,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "초기화 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2476,11 +2407,11 @@ msgstr ""
 "스크린을 초기화 할 수 없습니다.\n"
 "메모리가 부족하지 않습니까?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2488,7 +2419,7 @@ msgstr ""
 "Evas가 버퍼 캔버스를 만들 수 없는 것을 발견 했습니다. Evas가\n"
 "소프트웨어 버퍼 엔진을 지원하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2496,7 +2427,7 @@ msgstr ""
 "Evas가 PNG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 PNG\n"
 "를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2504,7 +2435,7 @@ msgstr ""
 "Evas가 JPEG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 JPEG\n"
 "를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2512,228 +2443,208 @@ msgstr ""
 "Evas가 EET 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 EET\n"
 "를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:722
-#, fuzzy
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Evas가 PNG 파일을 읽을 수 없는 것을 발견 했습니다. Evas가 PNG\n"
-"를 지원 하는지 확인 하십시오.\n"
 
-#: src/bin/e_main.c:732
-#, fuzzy
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
-msgstr "사용자 지정 화면잠금"
+msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:743
-#, fuzzy
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
-msgstr "화면보호기"
+msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "화면 보호기를 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "데스크탑 고정 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "시스템 명령 시스템을 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:797
-#, fuzzy
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
-msgstr "시작 응용프로그램"
+msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "동작 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
-#, fuzzy
-msgid "Enlightenment cannot set up its exec system."
-msgstr "Exebuf 시스템을 설정 할 수 없습니다."
-
 #: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "기억"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "창 기억 시스템을 설정 할 수 없습니다."
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "파일 관리자를 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "메세지 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "DND 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
-#: src/bin/e_main.c:879
-#, fuzzy
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
-msgstr "모듈"
+msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "확장 시스템을 설정 할 수 없습니다."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "창 기억 시스템을 설정 할 수 없습니다."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "색상 클래스 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:899
-#, fuzzy
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
-msgstr "설정 명령"
+msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "가젯 관리 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "DPMS 설정을 할 수 없습니다."
 
-#: src/bin/e_main.c:918
-#, fuzzy
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
-msgstr "CPU 전력 규칙 설정"
+msgstr ""
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "팝업 시스템을 설정 할 수 없습니다."
+msgstr ""
 
-#: src/bin/e_main.c:927
-#, fuzzy
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
-msgstr "데스크탑 배경화면"
+msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "배경화면 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:937
-#, fuzzy
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
-msgstr "데스크탑 마우스 설정"
+msgstr ""
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "DPMS 설정을 할 수 없습니다."
+msgstr ""
 
-#: src/bin/e_main.c:947
-#, fuzzy
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
-msgstr "단축키 설정"
+msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "바인딩 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:957
-#, fuzzy
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
-msgstr "팝업 표시"
+msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "팝업 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Shelf 시스템을 설정 할 수 없습니다."
 
-#: src/bin/e_main.c:977
-#, fuzzy
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
-msgstr "미리보기"
+msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "썸네일 시스템을 초기화 할 수 없습니다.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
-#, fuzzy
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
-msgstr "확장 시스템을 설정 할 수 없습니다."
+msgstr ""
 
-#: src/bin/e_main.c:1026
-#, fuzzy
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
-msgstr "모듈"
+msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2744,43 +2655,38 @@ msgstr ""
 "제가 있는 모듈을 설정에서 제거 하십시오.<br>확장 기능 설정에서 기능을<br> 새"
 "로 설정해서문제를 해결 하십시오.<br>."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
-#, fuzzy
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
-"시작시 손상되어 다시 시작 했습니다.<br> 모든 확장기능을 비활성화 하고<br> 문"
-"제가 있는 모듈을 설정에서 제거 하십시오.<br>확장 기능 설정에서 기능을<br> 새"
-"로 설정해서문제를 해결 하십시오.<br>."
 
-#: src/bin/e_main.c:1050
-#, fuzzy
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
-msgstr "설정된 도구모음"
+msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "모듈 읽기 오류"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2789,11 +2695,11 @@ msgstr ""
 "오류가 있는 추가기능: %s<br>이 모듈의 전체 경로:<br>%s<br>오류 보고서:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "모듈이 필요로하는 기능을 포함하고 있지 않습니다."
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2801,12 +2707,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 모듈"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "이 모듈을 제거 하시겠습니까?<br>"
 
@@ -2817,37 +2723,35 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "이 도구 막대를 삭제 하시겠습니까?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "도구모음 내용"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
 #: src/bin/e_startup.c:66
-#, fuzzy
 msgid "Starting"
-msgstr "%s 시작중"
+msgstr ""
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
@@ -2858,232 +2762,217 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "로그아웃 문제"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "지금 로그아웃"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "기다림"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "로그아웃 취소"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "로그아웃이 진행중입니다"
 
-#: src/bin/e_sys.c:366
-#, fuzzy
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"현재 로그아웃이 진행 중입니다.<br><hilight>잠시 기다려 주십시오.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenemnt 은 다른 요청으로 바쁩니다."
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "데스크탑 이름"
+msgstr ""
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "유휴 시간"
+msgstr ""
 
-#: src/bin/e_sys.c:478
-#, fuzzy
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
-msgstr "하이버네이션이 실패 했습니다."
+msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
-#, fuzzy
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "재기동 중입니다.<br><hilight>잠시 기다려 주십시오.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "데스크탑 설정"
+msgstr ""
 
-#: src/bin/e_sys.c:565
-#, fuzzy
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "재기동 중입니다.<br><hilight>잠시 기다려 주십시오.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "대기모드"
 
-#: src/bin/e_sys.c:591
-#, fuzzy
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "대기모드로 진입 중입니다.<br><hilight>잠시 기다려 주십시오.</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "하이버네이션"
 
-#: src/bin/e_sys.c:617
-#, fuzzy
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"하이버네이션 기능이 작동 되었습니다.<br><hilight>잠시 기다려 주십시오.</"
-"hilight>"
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "이 테마에 대하여"
+msgstr ""
 
 #: src/bin/e_theme.c:42
-#, fuzzy
 msgid "Set As Theme"
-msgstr "테마 선택..."
+msgstr ""
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "내용 설정..."
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "종료할 수 없음 - 이모탈 창."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "향후에"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "마지막 분에"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li ë…„ì „"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 달전"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 주전"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 일전"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 시간전"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 분전"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "알수없음"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3100,62 +2989,60 @@ msgstr ""
 
 #: src/bin/e_widget_config_list.c:89
 #: src/modules/conf_applications/e_int_config_apps.c:263
-#, fuzzy
 msgid "Down"
-msgstr "시스템 종료"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "즐겨찾기에 추가"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "상위 디렉토리로"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "권한:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "수정:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "당신"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "보호됨"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "읽기전용"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "숨겨짐"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "읽기-쓰기"
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "밧데리 감시 설정"
+msgstr ""
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3165,76 +3052,70 @@ msgstr "기본 설정"
 msgid "Show alert when battery is low"
 msgstr "밧데리 전원이 낮을 경우 알림 표시"
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "항상 밧데리 확인:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f 개"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
-msgstr "밧데리 전원이 낮을 경우 알림 표시"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr "밧데리가 다음 이하일 경우 경고:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "%1.0f 분"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%1.0f 개"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f ì´ˆ"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "가속"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "자동으로 앞으로"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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 "일반"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3242,59 +3123,52 @@ msgstr ""
 msgid "Battery"
 msgstr "밧데리"
 
-#: src/modules/battery/e_mod_main.c:844
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
-msgstr "밧데리 전원이 낮을 경우 알림 표시"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
-msgstr "밧데리"
+msgstr ""
 
 #: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "시계"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "데스크탑 설정"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "데스크탑 설정"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "꺼짐 시간"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "모듈"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
-#, fuzzy
 msgid "Favorites Menu"
-msgstr "즐겨찾기 메뉴 표시"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:104
 #: src/modules/conf_applications/e_int_config_apps.c:119
@@ -3313,24 +3187,21 @@ msgid "Restart Applications"
 msgstr "응용프로그램 재시작"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "모든 응용프로그램"
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
-#, fuzzy
 msgid "Selected Applications"
-msgstr "정의된 응용프로그램"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "적용"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:35
-#, fuzzy
 msgid "New Application"
-msgstr "응용프로그램"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
@@ -3338,12 +3209,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "메뉴"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "기본 테두리"
 
@@ -3351,14 +3222,14 @@ msgstr "기본 테두리"
 msgid "Window Border Selection"
 msgstr "창 테두리 선택"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3366,9 +3237,8 @@ msgstr ""
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "ê³ ì •"
+msgstr ""
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3385,7 +3255,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3394,9 +3264,8 @@ msgid "None"
 msgstr "없음"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:107
-#, fuzzy
 msgid "Include windows from other screens"
-msgstr "다른 화면의 창 표시"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:111
 msgid "Separate Groups By"
@@ -3447,18 +3316,17 @@ msgid "Warp to owning desktop"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
-#, fuzzy
 msgid "Menu Item Captions"
-msgstr "메뉴 설정"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f Chars"
-msgstr "%1.0f 개"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
 msgid "Client List Menu"
@@ -3481,9 +3349,8 @@ msgid "Border Title"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "기본 대화창 상태"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3656,9 +3523,9 @@ msgid "Desktop Name"
 msgstr "데스크탑 이름"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "이름:"
 
@@ -3668,14 +3535,12 @@ msgstr "데스크탑 배경화면"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "모두 삭제"
+msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
-msgstr "데스크탑"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
@@ -3686,18 +3551,16 @@ msgid "Automatic Locking"
 msgstr "자동으로 잠금"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Enlightenment 커서 사용"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "X 화면보호기가 동작중일때 잠금"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "X 화면보호기가 동작될때"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3728,10 +3591,10 @@ msgstr "%1.0f 분"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "개인용"
@@ -3763,8 +3626,8 @@ msgstr "다음 화면 영역에서 보기 #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3784,9 +3647,8 @@ msgid "Theme Wallpaper"
 msgstr "테마의 바탕화면"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "테마 배경 사용"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3834,9 +3696,8 @@ msgid "Animated flip"
 msgstr "움직이는 모양 사용"
 
 #: src/modules/conf_desks/e_int_config_desks.c:277
-#, fuzzy
 msgid "Desktops"
-msgstr "데스크탑"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
@@ -3870,9 +3731,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f ì´ˆ"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "배경 변경"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -3888,50 +3748,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "가상 데스크탑"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr "대화창 설정"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "일반 설정"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr "설정 창"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(창 없음)"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "기본 대화창 상태"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "일반 대화창"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "고급 대화창"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "기본 대화창 상태"
 
@@ -3976,44 +3837,42 @@ msgid "Resolution change"
 msgstr "해상도 변경"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "상태"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "재 시작"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
 msgstr "화면 해상도 설정"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "해상도"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "로그인 할때 적용"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "주파수"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "화면 돌리기"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "거울 처럼"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "기능 없음"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4022,11 +3881,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "주파수를 찾지 못했습니다"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4053,19 +3912,16 @@ msgid "The current display server does not <br>have the DPMS extension."
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
-#, fuzzy
 msgid "Display Power Management Settings"
-msgstr "디스플레이 전원관리 신호 (DPMS)"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:198
-#, fuzzy
 msgid "Enable Display Power Management"
-msgstr "디스플레이 전원관리 신호 (DPMS)"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "DPMS 시간"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
@@ -4080,12 +3936,11 @@ msgid "Off time"
 msgstr "꺼짐 시간"
 
 #: src/modules/conf_dpms/e_mod_main.c:35
-#, fuzzy
 msgid "Power Management"
-msgstr "디스플레이 전원관리 신호 (DPMS)"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4095,111 +3950,107 @@ msgstr "<없음>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "단축 글쇠 설정"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "단축키 설정"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "도구 추가"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "글쇠 삭제"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "글쇠 삭제"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "모두 삭제"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "기본 설정 복원"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "동작"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "실행 인자"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "일반 설정"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
-msgstr "다른 화면의 창 표시"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "단축 글쇠 순서"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f ì´ˆ"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr "단축 글쇠 오류"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4209,23 +4060,20 @@ msgstr ""
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "초기화"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
-#, fuzzy
 msgid "Engine Settings"
-msgstr "크기 설정"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:95
 msgid "Enable Composite"
 msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
-#, fuzzy
 msgid "Default Engine"
-msgstr "기본값"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
@@ -4357,9 +4205,8 @@ msgid "Run Command"
 msgstr "명령 실행"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
 msgid "Core"
-msgstr "닫기"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
@@ -4378,9 +4225,8 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "데스크탑 설정"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4459,18 +4305,16 @@ msgid "List Item"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
-#, fuzzy
 msgid "Filemanager"
-msgstr "이름 변경"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
@@ -4497,22 +4341,21 @@ msgid "Really Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "%d pixels"
-msgstr "%2.0f 픽셀"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4520,37 +4363,51 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "글꼴"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "스타일"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4565,7 +4422,7 @@ msgstr ""
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "아이콘 테마"
 
@@ -4613,9 +4470,8 @@ msgid "Exported Environment Variables"
 msgstr "가져온 환경 값"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "입력기 설정 선택..."
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
@@ -4634,19 +4490,17 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "언어"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "선택 설정"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "미리보기"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
@@ -4667,23 +4521,22 @@ msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f 픽셀/초"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f ì´ˆ"
+msgstr ""
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "일반"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -4755,21 +4608,18 @@ msgstr "메뉴 설정"
 
 #: 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 "메뉴 설정"
+msgstr ""
 
 #: 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 "즐겨찾기 메뉴 표시"
+msgstr ""
 
 #: 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 "모든 응용프로그램 메뉴 표시"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:111
 #: src/modules/conf_menus/e_int_config_menus.c:170
@@ -4810,7 +4660,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "자동 스크롤 커서 여백"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "기타 설정"
 
@@ -4960,15 +4810,13 @@ msgstr "커서 설정"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
-#, fuzzy
 msgid "Show Cursor"
-msgstr "마우스 커서"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
-#, fuzzy
 msgid "Idle Cursor"
-msgstr "X 커서 사용"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
@@ -4988,35 +4836,30 @@ msgstr "커서 크기"
 msgid "Mouse Cursor"
 msgstr "마우스 커서"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "모듈 설정"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
-msgstr "마우스 설정"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
-msgstr "모듈 상태"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
-msgstr "가속"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "시작 설정"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
@@ -5027,7 +4870,7 @@ msgid "Images"
 msgstr "이미지"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "테마"
 
@@ -5076,9 +4919,8 @@ msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "응용프로그램 실행 오류"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5128,59 +4970,51 @@ msgstr "%1.0f 개"
 msgid "Performance"
 msgstr "성능"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
-msgstr "테마 선택기"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
-msgstr "사용가능한 도구"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Edj 파일 선택"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "크기변경"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr "Enlightenment 종료를 실행 했습니다.<br><br>정말 종료 하시겠습니까?"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "글쇠 삭제"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "속성"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "대화창 설정"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "말아올림"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
@@ -5188,9 +5022,9 @@ msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.0f 개"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
@@ -5202,9 +5036,8 @@ msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "허용 안함"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
@@ -5222,29 +5055,25 @@ msgstr ""
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%1.0f 개"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "시스템"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "최소 크기"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "최대 크기"
+msgstr ""
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "고정상태"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
@@ -5303,9 +5132,8 @@ msgstr "설정된 도구모음"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "시작"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5331,28 +5159,25 @@ msgstr "시작"
 msgid "Theme Selector"
 msgstr "테마 선택기"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "가져오기..."
+msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
-msgstr "항목"
+msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
-msgstr "모두 삭제"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
@@ -5403,38 +5228,38 @@ msgid "Wallpaper Settings"
 msgstr "배경 설정"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "테마 배경 사용"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "사진..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "그라데이션..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "배경을 적용할 곳"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "모든 데스크탑"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "이 데스크탑"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "이 화면"
 
@@ -5455,14 +5280,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "수평"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "수직"
 
@@ -5487,9 +5312,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "배경 설정"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5528,43 +5352,42 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "그림 선택..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "테마의 바탕화면"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5663,26 +5486,16 @@ msgid "Decelerate"
 msgstr "감속"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
-#, fuzzy
 msgid "Window Border"
-msgstr "창 테두리 선택"
+msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
 msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:274
-#, fuzzy
 msgid "Prefer application provided icon"
-msgstr "응용프로그램의 아이콘"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "내부 창"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "내부 창 기억"
+msgstr ""
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
@@ -5771,9 +5584,8 @@ msgstr "창 포커스"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "창 이동 정보"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -5796,42 +5608,33 @@ msgid "Resistance to desktop gadgets:"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "키보드와 마우스"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
 msgid "Automatically accept changes after:"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "이동"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "크기변경"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "최대 규칙"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "창 확장"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "사용 가능한 영역에 채움"
 
@@ -5839,29 +5642,26 @@ msgstr "사용 가능한 영역에 채움"
 msgid "Maximize Policy"
 msgstr "최대 규칙"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "넓이 최대화"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
-msgstr "마우스가 다가오면 자동으로 펴짐"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "창 말아올리기"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -5870,9 +5670,8 @@ msgstr "마우스가 다가오면 자동으로 펴짐"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
-#, fuzzy
 msgid "Allow windows to be above fullscreen window"
-msgstr "다른 화면의 창 표시"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
 msgid "Autoraise"
@@ -5894,60 +5693,61 @@ msgstr "이동하거나 크기가 변경될때 끌어 올림"
 msgid "Raise when clicking to focus"
 msgstr "클릭 했을때 끌어 올림"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "창 기억"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
 #, fuzzy
+msgid "Remember internal dialogs"
+msgstr "내부 창 기억"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "내부 창 기억"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "기억"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "아이콘 이름"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "클래스"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "아이콘 클래스"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "제목"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "제목"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "파일:"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "<없음>"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -6022,29 +5822,24 @@ msgid "Cpufreq"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "빠름 (0.5초)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "평균 (1초)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "보통 (2초)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "느림 (5초)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "매우 느림 (30초)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6071,9 +5866,8 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "자동으로 잠금"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -6121,9 +5915,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "대화창 설정"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6222,14 +6015,12 @@ msgid "Home"
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:322
-#, fuzzy
 msgid "Favorites"
-msgstr "즐겨찾기에 추가"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "재기동"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:431
 msgid ""
@@ -6253,24 +6044,20 @@ msgid ""
 msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "크기 설정"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:95
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "크기 설정"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:227
-#, fuzzy
 msgid "Icon Size"
-msgstr "아이콘 이름"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "일반 대화창"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6281,9 +6068,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "기본 크기"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6294,32 +6080,29 @@ msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:254
-#, fuzzy
 msgid "Show Icon Extension"
-msgstr "아이콘명 표시"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:260
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:270
-#, fuzzy
 msgid "Show HAL icons on desktop"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
@@ -6329,98 +6112,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "상위 디렉토리로 이동"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "응용프로그램 추가"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "열기"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "다른 프로그램으로 열기.."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "응용 프로그램"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "정의된 응용프로그램"
 
-#: src/modules/fileman/e_fwin.c:1945
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr "명령 실행"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "글쇠 삭제"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "데스크탑 이름"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6428,14 +6208,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "오류 메세지"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "파일:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6447,84 +6226,72 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "하이버네이션"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "이름 변경"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "이름 변경"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "ë°°ê²½"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "명령 실행"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "명령 실행"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:160
 msgid "Transparent"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "바꾸기 효과"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "ë°°ê²½"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "도구 추가"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "초당 프레임"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "항상 위에"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "도구 추가"
+msgstr ""
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-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
@@ -6544,9 +6311,8 @@ msgid "Select a window"
 msgstr "창 선택"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "이동 설정"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
@@ -6556,7 +6322,7 @@ msgstr "선택된 막대 원본"
 msgid "Icon Labels"
 msgstr "아이콘명"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "아이콘명 표시"
 
@@ -6604,60 +6370,54 @@ msgid "Remove Icon"
 msgstr "아이콘 제거"
 
 #: src/modules/ibar/e_mod_main.c:812
-#, fuzzy
 msgid "Add An Icon"
-msgstr "응용프로그램 추가"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:819
-#, fuzzy
 msgid "Create New Icon"
-msgstr "아이콘 생성"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:835
 msgid "Add Application"
 msgstr "응용프로그램 추가"
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "로그인 상자 설정"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "이름 표시"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "제목 표시"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "클래스 표시"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "아이콘 이름 표시"
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "정보 표시"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
-msgstr "다른 화면의 창 표시"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
-msgstr "현재 영역에서 창 표시"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "모든 데스크탑에서 창 표시"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "활성화된 데스크탑에서 창 표시"
 
@@ -6666,171 +6426,149 @@ msgid "IBox"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:72
-#, fuzzy
 msgid "Pager Settings"
-msgstr "이동 설정"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
 msgstr "마우스 휠로 화면 변경"
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "데스크탑 표시"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
-msgstr "팝업 설정"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
-msgstr "아이콘화 된 창 표시"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:132
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "아이콘화 된 창 표시"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr "아이콘 선택"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "클릭 후 설정"
 
-#: src/modules/pager/e_mod_config.c:174
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
-msgstr "끌기과 선택 단추"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr "가상 데스크탑"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
-msgstr "창을 끌때 저항:"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "팝업 속도"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr "팝업 속도"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f ì´ˆ"
 
-#: src/modules/pager/e_mod_config.c:229
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr "창 목록 설정"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "아이콘화 된 창 표시"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
-msgstr "다른 화면에서의 아이콘화된 창 표시"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr "동작"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "단추 %i"
 
-#: src/modules/pager/e_mod_main.c:2844
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
-msgstr "팝업 설정"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "오른쪽으로 이동"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "왼쪽으로 이동"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "위로 이동"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
-msgstr "아래로 이동"
+msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
 msgstr "시작"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "시스템"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:55
 msgid "System Controls"
 msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "일반 설정"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
@@ -6936,7 +6674,7 @@ msgstr ""
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "온도"
 
@@ -6945,21 +6683,18 @@ msgid "Next"
 msgstr ""
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Enlightenment에 대하여"
+msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "아이콘 선택"
+msgstr ""
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "속성"
+msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6967,68 +6702,56 @@ msgid ""
 msgstr ""
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "정의된 응용프로그램"
+msgstr ""
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "기본값 사용"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "실행할 프로그램 추가"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "정의된 응용프로그램"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "데스크탑 이름"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "데스크탑 표시"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "촛점"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "클릭시 촛점"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "아이콘 선택"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:62
-#, fuzzy
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
-msgstr "실행"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "정의된 응용프로그램"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
@@ -7039,57 +6762,48 @@ msgid "Playback"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "출력 데이터"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "클래스"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "취소"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "가깝게"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "취소"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "화일 형태:"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "밝게"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "화면 잠금"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "종료"
+msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -7100,33 +6814,28 @@ msgid "Sound Cards"
 msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "크기 설정"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:152
-#, fuzzy
 msgid "Launch mixer..."
-msgstr "실행할 프로그램 추가"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "모듈 설정"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "설정이 갱신됨"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "시스템"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -7135,19 +6844,16 @@ msgid ""
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:214
-#, fuzzy
 msgid "Connection Manager"
-msgstr "이름 변경"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "선택 설정"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:737
-#, fuzzy
 msgid "Network Device"
-msgstr "이동식 장치"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
 msgid "Wifi"
@@ -7158,30 +6864,33 @@ msgid "LAN"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "정의된 응용프로그램"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "시스템"
+msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "파일:"
+#~ msgid "Window name and class"
+#~ msgstr "창 이름과 클래스"
+
+#~ msgid "Internal Windows"
+#~ msgstr "내부 창"
+
+#~ msgid "Expand the window"
+#~ msgstr "창 확장"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "가상 데스크탑 설정"
@@ -7192,10 +6901,6 @@ msgstr "시스템"
 #~ msgid "Shelf Size"
 #~ msgstr "도구모음 크기"
 
-#, fuzzy
-#~ msgid "Configure Toolbar Contents"
-#~ msgstr "내용 설정..."
-
 #~ msgid "Configure"
 #~ msgstr "설정"
 
@@ -7214,10 +6919,6 @@ msgstr "시스템"
 #~ msgid "Exit Immediately"
 #~ msgstr "임의로 종료"
 
-#, fuzzy
-#~ msgid "Shut Down Immediately"
-#~ msgstr "임의로 종료"
-
 #~ msgid "Shut Down"
 #~ msgstr "시스템 종료"
 
@@ -7245,18 +6946,6 @@ msgstr "시스템"
 #~ msgid "Advanced Settings"
 #~ msgstr "고급 설정"
 
-#, fuzzy
-#~ msgid "%1.0f percent"
-#~ msgstr "%1.0f ì´ˆ"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete this profile?"
-#~ msgstr "이 도구 막대를 삭제 하시겠습니까?"
-
-#, fuzzy
-#~ msgid "Plain Profile"
-#~ msgstr "속성"
-
 #~ msgid "Lock Screen"
 #~ msgstr "화면 잠금"
 
@@ -7272,20 +6961,12 @@ msgstr "시스템"
 #~ msgid "Configuration"
 #~ msgstr "설정"
 
-#, fuzzy
-#~ msgid "Toolbar Configuration"
-#~ msgstr "IBar 설정"
-
 #~ msgid "Enlightenment Configuration"
 #~ msgstr "Enlightenment 설정"
 
 #~ msgid "Configuration Panel"
 #~ msgstr "설정 판넬"
 
-#, fuzzy
-#~ msgid "Default Configuration Dialogs Mode"
-#~ msgstr "설정 창"
-
 #~ msgid "Input Method Configuration"
 #~ msgstr "입력기 설정"
 
@@ -7298,10 +6979,6 @@ msgstr "시스템"
 #~ msgid "Search Path Configuration"
 #~ msgstr "검색 경로 설정"
 
-#, fuzzy
-#~ msgid "Fileman Configuration Updated"
-#~ msgstr "설정이 갱신됨"
-
 #~ msgid "IBar Configuration"
 #~ msgstr "IBar 설정"
 
@@ -7317,22 +6994,6 @@ msgstr "시스템"
 #~ msgid "Temperature Configuration"
 #~ msgstr "온도 설정"
 
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "페이저 설정"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "페이저 설정"
-
-#, fuzzy
-#~ msgid "Back"
-#~ msgstr "기본"
-
-#, fuzzy
-#~ msgid "Choose Language"
-#~ msgstr "언어"
-
 #~ msgid "X reports there are no root windows and %i screens!\n"
 #~ msgstr "X 보고서 부모 창과 %i 화면이 없습니다!\n"
 
@@ -7346,23 +7007,11 @@ msgstr "시스템"
 #~ msgstr "초기화"
 
 #~ msgid "When moving or resizing windows, resist at the boundaries"
-#~ msgstr "창이 이동하거나 올려졌을때, "
+#~ msgstr "창이 이동하거나 올려졌을때,"
 
 #~ msgid "Both directions"
 #~ msgstr "모든 방향"
 
-#, fuzzy
-#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
-#~ msgstr "DPMS 설정을 할 수 없습니다."
-
-#, fuzzy
-#~ msgid "Mouse Acceleration Settings"
-#~ msgstr "선택 설정"
-
-#, fuzzy
-#~ msgid "Add To Favorites Menu"
-#~ msgstr "즐겨찾기에 추가"
-
 #~ msgid "BAD DRIVER"
 #~ msgstr "잘못된 드라이버"
 
@@ -7387,10 +7036,6 @@ msgstr "시스템"
 #~ msgid "NO BAT"
 #~ msgstr "밧데리 없음"
 
-#, fuzzy
-#~ msgid "Application Categories"
-#~ msgstr "응용프로그램 편집기"
-
 #~ msgid "Chinese (Simplified)"
 #~ msgstr "中國語 (Simplified)"
 
@@ -7406,14 +7051,6 @@ msgstr "시스템"
 #~ msgid "Korea"
 #~ msgstr "대한민국"
 
-#, fuzzy
-#~ msgid "Urgent window"
-#~ msgstr "다음 창"
-
-#, fuzzy
-#~ msgid "Unknown Data"
-#~ msgstr "알수없음"
-
 #~ msgid "Enlightenment Starting. Please wait."
 #~ msgstr "Enlightenment이 시작 중입니다. 잠시만 기다려 주십시오."
 
@@ -7423,310 +7060,18 @@ msgstr "시스템"
 #~ msgid "Enlightenment Clock Module"
 #~ msgstr "Enlightenment 시계 모듈"
 
-#, fuzzy
-#~ msgid "Enlightenment Conf Module"
-#~ msgstr "Enlightenment 시계 모듈"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Applications"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for applications."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Borders"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for borders."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Client List Menu"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for client list menu."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Colors"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for colors."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Desk"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for desk."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Lock"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen lock."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Virtual Desktops"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for virtual desktops."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Dialogs"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for dialogs."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Resolution"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen resolution."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Power Management"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for power management."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Engine"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for engine."
-#~ msgstr "설정 항목"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Run Command"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for run command."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Fonts"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for fonts."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Icon Theme"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for icon theme."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Input Methods"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for input methods."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Language"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for language and locale."
-#~ msgstr "설정 항목"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Key Bindings"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for key bindings."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Menu Settings"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for menus settings."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - File Icons"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for file icons."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Bindings"
-#~ msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse bindings."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Cursor"
-#~ msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse cursor."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Mouse Acceleration"
-#~ msgstr "Enlightenment 설정 저장중 문제가 발생 했습니다"
-
-#, fuzzy
-#~ msgid "Configuration dialog for mouse acceleration."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Search Directories"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for search directories."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Performance"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for performance."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Profiles"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for config profiles."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Screen Saver"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for screen saver."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Shelves"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for shelves."
-#~ msgstr "설정 항목"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Startup"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for startup."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Theme"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for theme."
-#~ msgstr "설정 항목"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Transitions"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Wallpaper"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Display"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window display."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Focus"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window focus."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window Manipulation"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window manipulation."
-#~ msgstr "설정 창"
-
-#, fuzzy
-#~ msgid "Enlightenment Configuration Module - Window List"
-#~ msgstr "Enlightenment 설정"
-
-#, fuzzy
-#~ msgid "Configuration dialog for window list."
-#~ msgstr "설정 창"
-
 #~ msgid "CPU Frequency Controller Module"
 #~ msgstr "CPU 주파수 처리 모듈"
 
 #~ msgid "Enlightenment Dropshadow Module"
 #~ msgstr "Enlightenment 드롭쉐도우 모듈"
 
-#, fuzzy
-#~ msgid "Enlightenment Exebuf Module"
-#~ msgstr "Enlightenment IBox 모듈"
-
-#, fuzzy
-#~ msgid "Enlightenment File Manager"
-#~ msgstr "Enlightenment %s 모듈"
-
-#, fuzzy
-#~ msgid "Enlightenment Winlist Module"
-#~ msgstr "Enlightenment %s 모듈"
-
 #~ msgid "Enlightenment IBar Module"
 #~ msgstr "Enlightenment IBar 모듈"
 
 #~ msgid "Enlightenment IBox Module"
 #~ msgstr "Enlightenment IBox 모듈"
 
-#, fuzzy
-#~ msgid "Enlightenment Layout Module"
-#~ msgstr "Enlightenment 시작 모듈"
-
 #~ msgid "Enlightenment Pager Module"
 #~ msgstr "Enlightenment 페이저 모듈"
 
@@ -7739,10 +7084,6 @@ msgstr "시스템"
 #~ msgid "Enlightenment Temperature Module"
 #~ msgstr "Enlightenment 온도 모듈"
 
-#, fuzzy
-#~ msgid "Enlightenment First Run Wizard Module"
-#~ msgstr "Enlightenment 시작 모듈"
-
 #~ msgid "Enlightenment cannot set up its window list system."
 #~ msgstr "창 목록 시스템을 설정 할 수 없습니다."
 
@@ -7788,9 +7129,6 @@ msgstr "시스템"
 #~ msgid "Window"
 #~ msgstr "ì°½"
 
-#~ msgid "Window Name"
-#~ msgstr "창 이름"
-
 #~ msgid "Window Title"
 #~ msgstr "창 제모"
 
diff --git a/po/ku.gmo b/po/ku.gmo
index d4bd972..7ae1b59 100644
Binary files a/po/ku.gmo and b/po/ku.gmo differ
diff --git a/po/ku.po b/po/ku.po
index 6919ec4..baad9ee 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-02-28 10:50+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi at gmail.com>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -18,28 +18,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr ""
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr ""
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr ""
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -65,563 +65,563 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Erê"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Na"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr ""
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Guhestin"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "KuÅŸtin"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr ""
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Sermase"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr ""
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr ""
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr ""
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr ""
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr ""
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr ""
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr ""
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr ""
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr ""
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr ""
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr ""
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr ""
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr ""
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr ""
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr ""
 
@@ -629,41 +629,40 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr ""
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -674,7 +673,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -683,11 +682,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -695,7 +694,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -705,7 +704,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -714,7 +713,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -723,7 +722,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -731,11 +730,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -743,12 +742,12 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr ""
 
@@ -756,7 +755,7 @@ msgstr ""
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr ""
 
@@ -765,39 +764,39 @@ msgstr ""
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr ""
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -805,22 +804,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -841,7 +840,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -886,7 +885,7 @@ msgstr ""
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr ""
 
@@ -918,23 +917,23 @@ msgstr ""
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr ""
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr ""
 
@@ -942,331 +941,331 @@ msgstr ""
 msgid "Select All"
 msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr ""
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr ""
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr ""
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr ""
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr ""
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr ""
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr ""
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr ""
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr ""
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1277,144 +1276,148 @@ msgstr ""
 msgid "File Properties"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1424,7 +1427,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr ""
 
@@ -1458,21 +1461,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr ""
 
@@ -1481,12 +1484,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr ""
 
@@ -1495,7 +1498,7 @@ msgid "Maximized state"
 msgstr ""
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr ""
 
@@ -1503,7 +1506,7 @@ msgstr ""
 msgid "Lock me from changing:"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr ""
 
@@ -1551,115 +1554,116 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1675,7 +1679,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr ""
 
@@ -1767,11 +1771,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1779,15 +1783,15 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1801,11 +1805,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1813,102 +1817,101 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:541
-msgid "Match only one window"
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr ""
@@ -1927,24 +1930,24 @@ msgstr ""
 msgid "Module Settings"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -1978,8 +1981,8 @@ msgstr ""
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2003,12 +2006,12 @@ msgid "Favorite Applications"
 msgstr ""
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2017,7 +2020,7 @@ msgstr ""
 msgid "Windows"
 msgstr ""
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr ""
 
@@ -2053,129 +2056,128 @@ msgstr ""
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2352,242 +2354,242 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr ""
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
+#: src/bin/e_main.c:824
+msgid "Setup FM"
 msgstr ""
 
 #: src/bin/e_main.c:829
-msgid "Setup FM"
+msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr ""
 
-#: src/bin/e_main.c:834
-msgid "Enlightenment cannot initialize the File manager.\n"
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
 msgstr ""
 
 #: src/bin/e_main.c:849
-msgid "Setup Message System"
+msgid "Enlightenment cannot set up its msg system."
 msgstr ""
 
 #: src/bin/e_main.c:854
-msgid "Enlightenment cannot set up its msg system."
+msgid "Setup DND"
 msgstr ""
 
 #: src/bin/e_main.c:859
-msgid "Setup DND"
+msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 
 #: src/bin/e_main.c:864
-msgid "Enlightenment cannot set up its dnd system."
+msgid "Setup Grab Input Handling"
 msgstr ""
 
 #: src/bin/e_main.c:869
-msgid "Setup Grab Input Handling"
+msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 
 #: src/bin/e_main.c:874
-msgid "Enlightenment cannot set up its input grab handling system."
+msgid "Setup Modules"
 msgstr ""
 
 #: src/bin/e_main.c:879
-msgid "Setup Modules"
+msgid "Enlightenment cannot set up its module system."
 msgstr ""
 
 #: src/bin/e_main.c:884
-msgid "Enlightenment cannot set up its module system."
+msgid "Setup Remembers"
 msgstr ""
 
 #: src/bin/e_main.c:889
-msgid "Setup Color Classes"
+msgid "Enlightenment cannot setup remember settings."
 msgstr ""
 
 #: src/bin/e_main.c:894
-msgid "Enlightenment cannot set up its color class system."
+msgid "Setup Color Classes"
 msgstr ""
 
 #: src/bin/e_main.c:899
-msgid "Setup Gadcon"
+msgid "Enlightenment cannot set up its color class system."
 msgstr ""
 
 #: src/bin/e_main.c:904
-msgid "Enlightenment cannot set up its gadget control system."
+msgid "Setup Gadcon"
 msgstr ""
 
 #: src/bin/e_main.c:909
-msgid "Setup DPMS"
+msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
 #: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr ""
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr ""
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2595,11 +2597,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2607,37 +2609,37 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr ""
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, 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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2645,12 +2647,12 @@ msgid ""
 "%i.<br>"
 msgstr ""
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr ""
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr ""
 
@@ -2661,29 +2663,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2700,120 +2702,120 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr ""
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr ""
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2829,88 +2831,88 @@ msgstr ""
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr ""
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr ""
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -2930,51 +2932,51 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -2990,57 +2992,57 @@ msgstr ""
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3048,12 +3050,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3061,24 +3063,24 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3086,20 +3088,20 @@ msgstr ""
 msgid "Clock"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "Guhestin"
@@ -3126,7 +3128,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3148,12 +3150,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3161,14 +3163,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr ""
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3194,7 +3196,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3462,9 +3464,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
@@ -3530,10 +3532,10 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr ""
@@ -3565,8 +3567,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3687,46 +3689,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -3782,31 +3789,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3815,11 +3822,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3874,7 +3881,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3884,102 +3891,107 @@ msgstr ""
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4274,18 +4286,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4293,37 +4304,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4338,7 +4361,7 @@ msgstr ""
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr ""
 
@@ -4406,7 +4429,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr ""
 
@@ -4576,7 +4599,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr ""
 
@@ -4752,24 +4775,24 @@ msgstr ""
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4786,7 +4809,7 @@ msgid "Images"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr ""
 
@@ -4886,33 +4909,33 @@ msgstr ""
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5075,23 +5098,23 @@ msgstr ""
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5144,38 +5167,38 @@ msgid "Wallpaper Settings"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5196,14 +5219,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr ""
 
@@ -5268,40 +5291,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5413,14 +5436,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr ""
@@ -5553,17 +5568,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr ""
 
@@ -5571,19 +5581,19 @@ msgstr ""
 msgid "Maximize Policy"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5622,49 +5632,57 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6015,7 +6033,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6031,95 +6049,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6145,16 +6163,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6192,19 +6210,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6241,7 +6259,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -6300,43 +6318,43 @@ msgstr ""
 msgid "Add Application"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -6356,11 +6374,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6368,108 +6386,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6593,7 +6611,7 @@ msgstr ""
 msgid "%1.0f C"
 msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr ""
 
@@ -6605,15 +6623,15 @@ msgstr ""
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6660,15 +6678,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6790,14 +6808,14 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
new file mode 100644
index 0000000..8b32f7e
Binary files /dev/null and b/po/ms.gmo differ
diff --git a/po/ms.po b/po/ms.po
new file mode 100644
index 0000000..397d3e0
--- /dev/null
+++ b/po/ms.po
@@ -0,0 +1,6825 @@
+# Malay translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-09-11 09:46+0000\n"
+"Last-Translator: Ibrahim Elias <imen802003 at netscape.net>\n"
+"Language-Team: Malay <ms at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/bin/e_about.c:17
+msgid "About Enlightenment"
+msgstr "Mengenai Enlightment"
+
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:180
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
+#: src/modules/mixer/app_mixer.c:531
+msgid "Close"
+msgstr "Tutup"
+
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: src/bin/e_about.c:26
+msgid ""
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
+"hope you enjoy using this software as much as we enjoyed writing it."
+"<br><br>This software is provided as-is with no explicit or implied "
+"warranty. This software is governed by licensing conditions, so please see "
+"the COPYING and COPYING-PLAIN licence files installed on your system."
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+"is not stable. Many features are incomplete or even non-existant yet and may "
+"have many bugs. You have been <hilight>WARNED!</hilight>"
+msgstr ""
+
+#: src/bin/e_about.c:50
+msgid "<title>The Team</title>"
+msgstr ""
+
+#: src/bin/e_actions.c:345
+#, c-format
+msgid ""
+"You are about to kill %s.<br><br>Please keep in mind that all data of this "
+"window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
+"you want to kill this window?"
+msgstr ""
+
+#: src/bin/e_actions.c:357
+msgid "Are you sure you want to kill this window?"
+msgstr ""
+
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
+msgid "Yes"
+msgstr "Ya"
+
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr "Tidak"
+
+#: src/bin/e_actions.c:1762
+msgid "Are you sure you want to exit?"
+msgstr "Adakah anda pasti mahu keluar?"
+
+#: src/bin/e_actions.c:1764
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr ""
+"Anda memohon untuk keluar Enlightenment.<br><br>Adakah anda pasti mahu "
+"keluar?"
+
+#: src/bin/e_actions.c:1860
+msgid "Are you sure you want to log out?"
+msgstr "Adakah anda pasti untuk log keluar?"
+
+#: src/bin/e_actions.c:1862
+msgid "You are about to log out.<br><br>Are you sure you want to do this?"
+msgstr ""
+
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
+msgid "Are you sure you want to turn off?"
+msgstr "Adakah anda pasti mahu tutup?"
+
+#: src/bin/e_actions.c:1926
+msgid ""
+"You requested to turn off your Computer.<br><br>Are you sure you want to "
+"shut down?"
+msgstr ""
+
+#: src/bin/e_actions.c:1988
+msgid "Are you sure you want to reboot?"
+msgstr ""
+
+#: src/bin/e_actions.c:1990
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr ""
+
+#: src/bin/e_actions.c:2054
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr ""
+
+#: src/bin/e_actions.c:2116
+msgid "Are you sure you want to hibernate?"
+msgstr ""
+
+#: src/bin/e_actions.c:2118
+msgid ""
+"You requested to hibernate your Computer.<br><br>Are you sure you want to "
+"suspend to disk?"
+msgstr ""
+
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
+msgid "Window : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr "Alihkan"
+
+#: src/bin/e_actions.c:2518
+msgid "Resize"
+msgstr ""
+
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr "Menu"
+
+#: src/bin/e_actions.c:2529
+msgid "Window Menu"
+msgstr "Menu Tetingkap"
+
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
+msgid "Raise"
+msgstr "Naik"
+
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
+msgid "Lower"
+msgstr ""
+
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
+msgid "Kill"
+msgstr ""
+
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
+msgid "Window : State"
+msgstr ""
+
+#: src/bin/e_actions.c:2557
+msgid "Sticky Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2564
+msgid "Iconic Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2571
+msgid "Fullscreen Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
+msgid "Maximize"
+msgstr "Maksimumkan"
+
+#: src/bin/e_actions.c:2580
+msgid "Maximize Vertically"
+msgstr "Maksimakan Menegak"
+
+#: src/bin/e_actions.c:2583
+msgid "Maximize Horizontally"
+msgstr "Maksimakan Mendatar"
+
+#: src/bin/e_actions.c:2586
+msgid "Maximize Fullscreen"
+msgstr ""
+
+#: src/bin/e_actions.c:2588
+msgid "Maximize Mode \"Smart\""
+msgstr ""
+
+#: src/bin/e_actions.c:2590
+msgid "Maximize Mode \"Expand\""
+msgstr ""
+
+#: src/bin/e_actions.c:2592
+msgid "Maximize Mode \"Fill\""
+msgstr ""
+
+#: src/bin/e_actions.c:2599
+msgid "Shade Up Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2601
+msgid "Shade Down Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2603
+msgid "Shade Left Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2605
+msgid "Shade Right Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2607
+msgid "Shade Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2614
+msgid "Toggle Borderless State"
+msgstr ""
+
+#: src/bin/e_actions.c:2619
+msgid "Toggle Pinned State"
+msgstr ""
+
+#: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:103
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
+msgid "Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2624
+msgid "Flip Desktop Left"
+msgstr ""
+
+#: src/bin/e_actions.c:2626
+msgid "Flip Desktop Right"
+msgstr ""
+
+#: src/bin/e_actions.c:2628
+msgid "Flip Desktop Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2630
+msgid "Flip Desktop Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2632
+msgid "Flip Desktop By..."
+msgstr ""
+
+#: src/bin/e_actions.c:2638
+msgid "Show The Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2644
+msgid "Show The Shelf"
+msgstr ""
+
+#: src/bin/e_actions.c:2649
+msgid "Flip Desktop To..."
+msgstr ""
+
+#: src/bin/e_actions.c:2655
+msgid "Flip Desktop Linearly..."
+msgstr ""
+
+#: src/bin/e_actions.c:2661
+msgid "Switch To Desktop 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2663
+msgid "Switch To Desktop 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2665
+msgid "Switch To Desktop 2"
+msgstr ""
+
+#: src/bin/e_actions.c:2667
+msgid "Switch To Desktop 3"
+msgstr ""
+
+#: src/bin/e_actions.c:2669
+msgid "Switch To Desktop 4"
+msgstr ""
+
+#: src/bin/e_actions.c:2671
+msgid "Switch To Desktop 5"
+msgstr ""
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 6"
+msgstr ""
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 7"
+msgstr ""
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 8"
+msgstr ""
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 9"
+msgstr ""
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 10"
+msgstr ""
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 11"
+msgstr ""
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2691
+msgid "Flip Desktop Left (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2693
+msgid "Flip Desktop Right (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2695
+msgid "Flip Desktop Up (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2697
+msgid "Flip Desktop Down (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2699
+msgid "Flip Desktop By... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2705
+msgid "Flip Desktop To... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2711
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2717
+msgid "Flip Desktop In Direction..."
+msgstr ""
+
+#: src/bin/e_actions.c:2722
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2724
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2726
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2728
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2730
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2732
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2734
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2736
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2738
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2740
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2742
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2744
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2746
+msgid "Switch To Desktop... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
+#: 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
+#: src/modules/conf_dpms/e_mod_main.c:34
+#: src/modules/conf_screensaver/e_mod_main.c:34
+#: src/modules/ibox/e_mod_config.c:134
+msgid "Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2753
+msgid "Send Mouse To Screen 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2755
+msgid "Send Mouse To Screen 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2757
+msgid "Send Mouse To Screen..."
+msgstr ""
+
+#: src/bin/e_actions.c:2762
+msgid "Send Mouse Forward 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2764
+msgid "Send Mouse Back 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2766
+msgid "Send Mouse Forward/Back Screens..."
+msgstr ""
+
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
+msgid "Window : Moving"
+msgstr ""
+
+#: src/bin/e_actions.c:2804
+msgid "To Next Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2806
+msgid "To Previous Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "By Desktop #..."
+msgstr ""
+
+#: src/bin/e_actions.c:2814
+msgid "To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2820
+msgid "Show Main Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2822
+msgid "Show Favorites Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2824
+msgid "Show All Applications Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2826
+msgid "Show Clients Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2828
+msgid "Show Menu..."
+msgstr ""
+
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+msgid "Launch"
+msgstr ""
+
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
+msgid "Command"
+msgstr ""
+
+#: src/bin/e_actions.c:2840
+msgid "Application"
+msgstr ""
+
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr ""
+
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr ""
+
+#: src/bin/e_actions.c:2852
+msgid "Exit Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2857
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2862
+msgid "Offline Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
+#: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
+#: src/modules/conf_desklock/e_int_config_desklock.c:301
+#: src/modules/conf_imc/e_int_config_imc.c:827
+#: src/modules/conf_startup/e_int_config_startup.c:267
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
+#: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
+#: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
+#: src/modules/syscon/e_mod_main.c:122
+msgid "System"
+msgstr ""
+
+#: src/bin/e_actions.c:2866
+msgid "Log Out"
+msgstr ""
+
+#: src/bin/e_actions.c:2870
+msgid "Power Off Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2874
+msgid "Power Off"
+msgstr ""
+
+#: src/bin/e_actions.c:2878
+msgid "Reboot"
+msgstr ""
+
+#: src/bin/e_actions.c:2882
+msgid "Suspend"
+msgstr ""
+
+#: src/bin/e_actions.c:2886
+msgid "Hibernate"
+msgstr ""
+
+#: src/bin/e_actions.c:2894
+msgid "Lock"
+msgstr ""
+
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
+msgid "Cleanup Windows"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Generic : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Delayed Action"
+msgstr ""
+
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr ""
+
+#: src/bin/e_border.c:4922
+msgid "Desktop files scan done"
+msgstr ""
+
+#: src/bin/e_border.c:4935
+msgid "Desktop file scan"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:29
+msgid "Color Selector"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/modules/conf_dpms/e_int_config_dpms.c:85
+#: src/modules/conf_imc/e_int_config_imc_import.c:112
+#: src/modules/conf_mime/e_int_config_mime_edit.c:283
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
+#: src/modules/conf_theme/e_int_config_theme_import.c:113
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
+#: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
+#: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
+msgid "OK"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/modules/conf_mime/e_int_config_mime_edit.c:284
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_theme/e_int_config_theme_import.c:117
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
+#: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
+msgid "Cancel"
+msgstr ""
+
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
+msgid ""
+"Settings data needed upgrading. Your old settings have<br>been wiped and a "
+"new set of defaults initialized. This<br>will happen regularly during "
+"development, so don't report a<br>bug. This simply means Enlightenment needs "
+"new settings<br>data by default for usable functionality that your "
+"old<br>settings simply lack. This new set of defaults will fix<br>that by "
+"adding it in. You can re-configure things now to your<br>liking. Sorry for "
+"the hiccup in your settings.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:777
+msgid ""
+"Your settings are NEWER than Enlightenment. This is very<br>strange. This "
+"should not happen unless you downgraded<br>Enlightenment or copied the "
+"settings from a place where<br>a newer version of Enlightenment was running. "
+"This is bad and<br>as a precaution your settings have been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1740
+msgid "Settings Upgraded"
+msgstr ""
+
+#: src/bin/e_config.c:1763
+#, c-format
+msgid ""
+"An error occured while saving Enlightenment's<br>settings 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 ""
+
+#: src/bin/e_config.c:1774
+#, c-format
+msgid ""
+"Enlightenment's settings files are too big<br>for the file system they are "
+"being saved to.<br>This error is very strange as the files should<br>be "
+"extremely small. Please check the settings<br>for your home directory."
+"<br><br>The file where the error occured was:<br>%s<br><br>This file has "
+"been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1787
+#, c-format
+msgid ""
+"An output error occured when writing the settings<br>files for "
+"Enlightenment. Your disk is having troubles<br>and possibly needs "
+"replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
+"file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1798
+#, c-format
+msgid ""
+"Enlightenment cannot write its settings file<br>because it ran out of space "
+"to write the file.<br>You have either run out of disk space or have<br>gone "
+"over your quota limit.<br><br>The file where the error occured was:<br>%"
+"s<br><br>This file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1810
+#, c-format
+msgid ""
+"Enlightenment unexpectedly had the settings 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 ""
+
+#: src/bin/e_config.c:1835
+msgid "Enlightenment Settings Write Problems"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
+#: src/modules/conf_engine/e_mod_main.c:34
+#: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_paths/e_mod_main.c:34
+#: src/modules/conf_performance/e_mod_main.c:34
+msgid "Advanced"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:237
+msgid "Basic"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
+msgid "Apply"
+msgstr ""
+
+#: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
+#: src/modules/conf_colors/e_int_config_color_classes.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_paths/e_int_config_paths.c:83
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
+msgid "Modules"
+msgstr ""
+
+#: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
+msgid "Extensions"
+msgstr ""
+
+#: src/bin/e_container.c:113
+#, c-format
+msgid "Container %d"
+msgstr ""
+
+#: src/bin/e_desklock.c:175
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:176
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:240
+msgid "Lock Failed"
+msgstr ""
+
+#: src/bin/e_desklock.c:241
+msgid ""
+"Locking the desktop failed because some application<br>has grabbed either "
+"the keyboard or the mouse or both<br>and their grab is unable to be broken."
+msgstr ""
+
+#: src/bin/e_desklock.c:325
+msgid "Please enter your unlock password"
+msgstr ""
+
+#: src/bin/e_desklock.c:689
+msgid "Authentication System Error"
+msgstr ""
+
+#: src/bin/e_desklock.c:690
+#, c-format
+msgid ""
+"Authentication via PAM had errors setting up the<br>authentication session. "
+"The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
+"happening. Please report this bug."
+msgstr ""
+
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1020
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:158
+msgid "Incomplete Window Properties"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:159
+msgid ""
+"The window you are creating an icon for<br>does not contain window name and "
+"class<br>properties, so the needed properties for<br>the icon so that it "
+"will be used for this<br>window cannot be guessed. You will need to<br>use "
+"the window title instead. This will only<br>work if the window title is the "
+"same at<br>the time the window starts up, and does not<br>change."
+msgstr ""
+
+#: src/bin/e_eap_editor.c:215
+msgid "Desktop Entry Editor"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_mime/e_int_config_mime_edit.c:145
+msgid "Icon"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:472
+#: src/modules/conf_mime/e_int_config_mime_edit.c:136
+msgid "Basic Info"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:473 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:911
+msgid "Name"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:479
+msgid "Executable"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:487
+msgid "Comment"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:512
+msgid "General"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:515
+msgid "Generic Name"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:520
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:105
+msgid "Window Class"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
+msgid "Categories"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:528
+msgid "Mime Types"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
+msgid "Options"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:535
+msgid "Startup Notify"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:537
+msgid "Run in Terminal"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:539
+msgid "Show in Menus"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:543
+msgid "Desktop file"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:544
+msgid "Filename"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:573
+msgid "Select an Icon"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:642
+msgid "Select an Executable"
+msgstr ""
+
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
+#: src/modules/conf_shelves/e_int_config_shelf.c:81
+#: src/modules/ibar/e_mod_config.c:112
+msgid "Delete"
+msgstr ""
+
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
+msgid "Cut"
+msgstr ""
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
+msgid "Copy"
+msgstr ""
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
+msgid "Paste"
+msgstr ""
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr ""
+
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
+#: src/modules/conf_imc/e_int_config_imc.c:278
+#: src/modules/conf_imc/e_int_config_imc.c:518
+msgid "Run Error"
+msgstr ""
+
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
+#: src/modules/conf_imc/e_int_config_imc.c:279
+#: src/modules/conf_imc/e_int_config_imc.c:519
+#, c-format
+msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
+msgstr ""
+
+#: src/bin/e_exec.c:356
+msgid "Application run error"
+msgstr ""
+
+#: src/bin/e_exec.c:358
+#, 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:454
+msgid "Application Execution Error"
+msgstr ""
+
+#: src/bin/e_exec.c:466
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr ""
+
+#: src/bin/e_exec.c:472
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr ""
+
+#: src/bin/e_exec.c:480
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:483
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:487
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:490
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr ""
+
+#: src/bin/e_exec.c:494
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:498
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr ""
+
+#: src/bin/e_exec.c:502
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr ""
+
+#: src/bin/e_exec.c:505
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:509
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr ""
+
+#: src/bin/e_exec.c:512
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:568
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
+msgid "Error Logs"
+msgstr ""
+
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
+msgid "There was no error message."
+msgstr ""
+
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
+msgid "Save This Message"
+msgstr ""
+
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr ""
+
+#: src/bin/e_exec.c:670
+msgid "Error Information"
+msgstr ""
+
+#: src/bin/e_exec.c:678
+msgid "Error Signal Information"
+msgstr ""
+
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
+msgid "Output Data"
+msgstr ""
+
+#: src/bin/e_exec.c:696
+msgid "There was no output."
+msgstr ""
+
+#: src/bin/e_fm.c:945
+msgid "Nonexistent path"
+msgstr ""
+
+#: src/bin/e_fm.c:949
+#, c-format
+msgid "%s doesn't exist."
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Mount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Unmount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Eject Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3685
+#, c-format
+msgid "%i Files"
+msgstr ""
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
+msgid "Link"
+msgstr ""
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
+msgid "Abort"
+msgstr ""
+
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr ""
+
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
+msgid "Refresh View"
+msgstr ""
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Show Hidden Files"
+msgstr ""
+
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
+msgid "Remember Ordering"
+msgstr ""
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
+msgid "Sort Now"
+msgstr ""
+
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8051
+msgid "Rename"
+msgstr ""
+
+#: src/bin/e_fm.c:8070
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8075
+msgid "Mount"
+msgstr ""
+
+#: src/bin/e_fm.c:8080
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8090
+msgid "Properties"
+msgstr ""
+
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
+msgid "Use default"
+msgstr ""
+
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr ""
+
+#: src/bin/e_fm.c:8392
+#, c-format
+msgid "Icon Size (%d)"
+msgstr ""
+
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8766
+msgid "Create a new Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8767
+msgid "New Directory Name:"
+msgstr ""
+
+#: src/bin/e_fm.c:8821
+#, c-format
+msgid "Rename %s to:"
+msgstr ""
+
+#: src/bin/e_fm.c:8823
+msgid "Rename File"
+msgstr ""
+
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
+msgid "Retry"
+msgstr ""
+
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
+msgid "Error"
+msgstr ""
+
+#: src/bin/e_fm.c:8970
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9022
+msgid "No to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9024
+msgid "Yes to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9027
+msgid "Warning"
+msgstr ""
+
+#: src/bin/e_fm.c:9030
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr ""
+
+#: src/bin/e_fm.c:9103
+msgid "Ignore this"
+msgstr ""
+
+#: src/bin/e_fm.c:9104
+msgid "Ignore all"
+msgstr ""
+
+#: src/bin/e_fm.c:9109
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9255
+msgid "Confirm Delete"
+msgstr ""
+
+#: src/bin/e_fm.c:9260
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm.c:9266
+#, c-format
+msgid ""
+"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
+"hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:108
+msgid "File Properties"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:337
+msgid "File:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
+msgid "Size:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:351
+msgid "Last Modified:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:358
+msgid "File Type:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:365
+msgid "Permissions"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
+msgid "Owner:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:372
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:374
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:376
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:378
+msgid "Owner can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
+#: src/modules/conf_transitions/e_int_config_transitions.c:167
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
+msgid "Preview"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:431
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
+msgid "Default"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:434
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:437
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:447
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:455
+msgid "Link Information"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:183
+#, c-format
+msgid "%llu TiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:185
+#, c-format
+msgid "%llu GiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:187
+#, c-format
+msgid "%llu MiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu KiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu B"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:222
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:320
+msgid "Removable Device"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
+msgid "Plain"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
+msgid "Inset"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
+msgid "Appearance"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1385
+msgid "Automatically scroll contents"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1392
+msgid "Able to be resized"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
+msgid "Begin move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
+msgid "Remove this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1891
+msgid "Stop move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_hints.c:151
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"on this screen. Aborting startup.\n"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
+msgid "Window Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:285
+msgid "Generic Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:286
+msgid "Lock the Window so it does only what I tell it to"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:288
+msgid "Protect this window from me accidentally changing it"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:290
+msgid ""
+"Protect this window from being accidentally closed because it is important"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:292
+msgid "Do not allow the border to change on this window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:295
+msgid "Remember these Locks for this window next time it appears"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:308
+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:702
+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:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:637
+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:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
+msgid "Stacking"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
+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:720
+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:726
+msgid "Shaded state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
+msgid "Maximized state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
+#: src/bin/e_int_border_remember.c:729
+msgid "Fullscreen state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:327
+msgid "Lock me from changing:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
+msgid "Border style"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:348
+msgid "Stop me from:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:349
+msgid "Closing the window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:351
+msgid "Exiting my login with this window open"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:355
+msgid "Remember these Locks"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:73
+msgid "Edit Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:78
+msgid "Add Application..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:89
+msgid "Create Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:99
+msgid "Send to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:111
+msgid "Pin to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:122
+msgid "Unpin from Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:131
+msgid "More..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:171
+msgid "Iconify"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:368
+msgid "Maximize vertically"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:379
+msgid "Maximize horizontally"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:390
+msgid "Unmaximize"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:491
+msgid "Keyboard Shortcut"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:497
+msgid "To Favorites Menu"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:502
+msgid "To Launcher"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
+msgid "Border"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:533
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
+#: src/modules/conf_colors/e_int_config_color_classes.c:514
+msgid "State"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
+msgid "Remember"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:814
+msgid "Always On Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:825
+#: 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:260
+msgid "Normal"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:836
+msgid "Always Below"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:928
+msgid "Select Border Style"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:940
+msgid "Use E17 Default Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:949
+msgid "Use Application Provided Icon "
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:957
+msgid "Use User Defined Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
+msgid "Fullscreen"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1092
+msgid "Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:363
+msgid "NetWM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:370
+msgid "ICCCM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:418
+msgid "ICCCM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
+msgid "Title"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:421
+msgid "Class"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+msgid "Icon Name"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:423
+msgid "Machine"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:424
+msgid "Role"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:426
+msgid "Minimum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:427
+msgid "Maximum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:428
+msgid "Base Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:429
+msgid "Resize Steps"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:431
+msgid "Aspect Ratio"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:432
+msgid "Initial State"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:434
+msgid "Window ID"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:435
+msgid "Window Group"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:436
+msgid "Transient For"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:437
+msgid "Client Leader"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:438
+msgid "Gravity"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:441
+msgid "Take Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:442
+msgid "Accepts Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:443
+msgid "Urgent"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:444
+msgid "Request Delete"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:445
+msgid "Request Position"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:466
+msgid "NetWM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:471
+msgid "Modal"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
+msgid "Skip Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
+msgid "Skip Pager"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:85
+msgid "Window Remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:307
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:310
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window that <hilight>does not "
+"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
+"Transience, Role etc. properties<br>with more than 1 other window on the "
+"screen and remembering<br>properties for this window will apply to all other "
+"windows<br>that match these properties.<br><br>This is just a warning in "
+"case you did not intend this to happen.<br>If you did, simply press "
+"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your "
+"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
+"sure and nothing will be affected."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:515
+msgid "No match properties set"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:518
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window <hilight>without "
+"specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
+"way of remembering this window."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:614
+msgid "Nothing"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:616
+msgid "Size and Position"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
+msgid "Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:620
+msgid "Size, Position and Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:622
+msgid "Everything"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:635
+msgid "Remember using"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
+msgid "Window Role"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:686
+msgid "Window type"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
+msgid "Transience"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:701
+msgid "Properties to remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:717
+msgid "Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:723
+msgid "Virtual Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:732
+msgid "Current Screen"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:735
+msgid "Skip Window List"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
+#: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
+#: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
+#: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
+#: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1077
+msgid "Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+#: src/modules/wizard/page_050.c:26
+msgid "File Manager"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:44
+msgid "Shelf"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:120
+msgid "Module Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:180
+msgid "Available Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:187
+msgid "Load Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:194
+msgid "Loaded Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:201
+msgid "Unload Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
+#: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
+#: src/bin/e_int_gadcon_config.c:205
+msgid "Description: Unavailable"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:36
+msgid "Shelf Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:42
+msgid "Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:133
+msgid "Selected Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:140
+msgid "Remove Gadget"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+msgid "Toolbar Settings"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
+msgid "Layout"
+msgstr ""
+
+#: src/bin/e_intl.c:361
+msgid "Input Method Error"
+msgstr ""
+
+#: src/bin/e_intl.c:362
+msgid ""
+"Error starting the input method executable<br><br>please make sure that your "
+"input<br>method configuration is correct and<br>that your "
+"configuration's<br>executable is in your PATH<br>"
+msgstr ""
+
+#: src/bin/e_int_menus.c:89
+msgid "Main"
+msgstr ""
+
+#: src/bin/e_int_menus.c:106
+msgid "Favorite Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:117
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
+msgid "Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
+#: 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 ""
+
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
+msgid "Lost Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:170
+msgid "About"
+msgstr ""
+
+#: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
+#: src/modules/conf_theme/e_mod_main.c:40
+#: src/modules/conf_theme/e_mod_main.c:84
+msgid "Theme"
+msgstr ""
+
+#: src/bin/e_int_menus.c:262
+msgid "Virtual"
+msgstr ""
+
+#: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
+#: src/modules/conf_shelves/e_mod_main.c:41
+#: src/modules/conf_shelves/e_mod_main.c:85
+msgid "Shelves"
+msgstr ""
+
+#: src/bin/e_int_menus.c:278
+msgid "Show/Hide All Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:575
+msgid "(No Applications)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:709
+msgid "Set Virtual Desktops"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
+msgid "(No Windows)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
+msgid "No name!!"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1362
+msgid "(No Shelves)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1427
+msgid "Add A Shelf"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1434
+msgid "Delete A Shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:601
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:603
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
+msgid "Small"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:607
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:609
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
+msgid "Set Contents..."
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:641
+msgid "Above Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:643
+msgid "Below Windows"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:645
+msgid "Below Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:647
+msgid "Allow windows to overlap the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:694
+msgid "Shrink to Content Size"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
+msgid "%3.0f pixels"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:710
+msgid "Styles"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:750
+msgid "Auto Hide"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:751
+msgid "Auto-hide the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:755
+msgid "Show on mouse in"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:759
+msgid "Show on mouse click"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:763
+msgid "Hide timeout"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:772
+msgid "Hide duration"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:788
+msgid "Show on all Desktops"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:790
+msgid "Show on specified Desktops"
+msgstr ""
+
+#: src/bin/e_ipc.c:47
+#, c-format
+msgid ""
+"Possible IPC Hack Attempt. The IPC socket\n"
+"directory already exists BUT has permissions\n"
+"that are too leanient (must only be readable\n"
+"and writable by the owner, and nobody else)\n"
+"or is not owned by you. Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_ipc.c:57
+#, c-format
+msgid ""
+"The IPC socket directory cannot be created or\n"
+"examined.\n"
+"Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_main.c:323
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:385
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:411
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:424
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:430
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:442
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:450
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:473
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:481
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:490
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:509
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:515
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software X11\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software X11 rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:522
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software Buffer rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:538 src/bin/e_main.c:545
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:559
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+
+#: src/bin/e_main.c:569
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:578
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:592
+msgid "Enlightenment cannot set up its scale system."
+msgstr ""
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot set up the pointer system."
+msgstr ""
+
+#: src/bin/e_main.c:609
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:627
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:638
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:643
+msgid "Starting International Support"
+msgstr ""
+
+#: src/bin/e_main.c:648
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:664
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:676
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:687
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:698
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:707
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:716
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:727
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:737
+msgid "Setup Screens"
+msgstr ""
+
+#: src/bin/e_main.c:742
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+
+#: src/bin/e_main.c:748
+msgid "Setup Screensaver"
+msgstr ""
+
+#: src/bin/e_main.c:753
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:757
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:762
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:775
+msgid "Setting up Paths"
+msgstr ""
+
+#: src/bin/e_main.c:792
+msgid "Setup System Controls"
+msgstr ""
+
+#: src/bin/e_main.c:797
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:802
+msgid "Setup Actions"
+msgstr ""
+
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:811
+msgid "Setup Execution System"
+msgstr ""
+
+#: src/bin/e_main.c:816
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:824
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:829
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
+msgstr ""
+
+#: src/bin/e_main.c:849
+msgid "Enlightenment cannot set up its msg system."
+msgstr ""
+
+#: src/bin/e_main.c:854
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:864
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:869
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:874
+msgid "Setup Modules"
+msgstr ""
+
+#: src/bin/e_main.c:879
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
+
+#: src/bin/e_main.c:904
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:923
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Wallpaper"
+msgstr ""
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Mouse"
+msgstr ""
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr ""
+
+#: src/bin/e_main.c:952
+msgid "Setup Bindings"
+msgstr ""
+
+#: src/bin/e_main.c:957
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:962
+msgid "Setup Popups"
+msgstr ""
+
+#: src/bin/e_main.c:967
+msgid "Enlightenment cannot set up its popup system."
+msgstr ""
+
+#: src/bin/e_main.c:972
+msgid "Setup Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:977
+msgid "Enlightenment cannot set up its shelf system."
+msgstr ""
+
+#: src/bin/e_main.c:982
+msgid "Setup Thumbnailer"
+msgstr ""
+
+#: src/bin/e_main.c:987
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:992
+msgid "Set Up File Ordering"
+msgstr ""
+
+#: src/bin/e_main.c:996
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+
+#: src/bin/e_main.c:1031
+msgid "Load Modules"
+msgstr ""
+
+#: src/bin/e_main.c:1039
+msgid ""
+"Enlightenment crashed early on start and has<br>been restarted. All modules "
+"have been disabled<br>and will not be loaded to help remove any "
+"problem<br>modules from your configuration. The module<br>configuration "
+"dialog should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1046
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1047
+msgid ""
+"Enlightenment crashed early on start and has been restarted.<br>All modules "
+"have been disabled and will not be loaded to help<br>remove any problem "
+"modules from your configuration.<br><br>The module configuration dialog "
+"should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1055
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:1066
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:126
+#, 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:130 src/bin/e_module.c:143 src/bin/e_module.c:160
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
+#, 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:159
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:173
+#, c-format
+msgid ""
+"Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
+"module API version of: %i.<br>The module API advertized by Enlightenment is: "
+"%i.<br>"
+msgstr ""
+
+#: src/bin/e_module.c:178
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr ""
+
+#: src/bin/e_module.c:501
+msgid "Would you like to unload this module?<br>"
+msgstr ""
+
+#: src/bin/e_screensaver.c:99
+msgid ""
+"You disabled screensaver too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1297
+msgid ""
+"You requested to delete this shelf.<br><br>Are you sure you want to delete "
+"it?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
+msgid "Stop Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1705
+msgid "Set Shelf Contents"
+msgstr ""
+
+#: src/bin/e_shelf.c:1710
+msgid "Delete this Shelf"
+msgstr ""
+
+#: src/bin/e_startup.c:66
+msgid "Starting"
+msgstr ""
+
+#: src/bin/e_sys.c:170
+msgid "Checking System Permissions"
+msgstr ""
+
+#: src/bin/e_sys.c:208 src/bin/e_sys.c:219 src/bin/e_sys.c:228
+#: src/bin/e_sys.c:237
+msgid "System Check Done"
+msgstr ""
+
+#: src/bin/e_sys.c:312
+msgid "Logout problems"
+msgstr ""
+
+#: src/bin/e_sys.c:315
+msgid ""
+"Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
+"want to finish the logout<br>anyway without closing these<br>applications "
+"first?"
+msgstr ""
+
+#: src/bin/e_sys.c:321
+msgid "Logout now"
+msgstr ""
+
+#: src/bin/e_sys.c:322
+msgid "Wait longer"
+msgstr ""
+
+#: src/bin/e_sys.c:323
+msgid "Cancel Logout"
+msgstr ""
+
+#: src/bin/e_sys.c:362
+msgid "Logout in progress"
+msgstr ""
+
+#: src/bin/e_sys.c:365
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
+msgid "Enlightenment is busy with another request"
+msgstr ""
+
+#: src/bin/e_sys.c:397
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:405
+msgid ""
+"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
+"has been started."
+msgstr ""
+
+#: src/bin/e_sys.c:412
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:419
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+
+#: src/bin/e_sys.c:426
+msgid ""
+"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"complete."
+msgstr ""
+
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
+msgid "EEK! This should not happen"
+msgstr ""
+
+#: src/bin/e_sys.c:459
+msgid "Power off failed."
+msgstr ""
+
+#: src/bin/e_sys.c:464
+msgid "Reset failed."
+msgstr ""
+
+#: src/bin/e_sys.c:469
+msgid "Suspend failed."
+msgstr ""
+
+#: src/bin/e_sys.c:474
+msgid "Hibernate failed."
+msgstr ""
+
+#: src/bin/e_sys.c:531
+msgid "Power off"
+msgstr ""
+
+#: src/bin/e_sys.c:534
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:558
+msgid "Resetting"
+msgstr ""
+
+#: src/bin/e_sys.c:561
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:584
+msgid "Suspending"
+msgstr ""
+
+#: src/bin/e_sys.c:587
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:610
+msgid "Hibernating"
+msgstr ""
+
+#: src/bin/e_sys.c:613
+msgid "Hibernating.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_theme_about.c:17
+msgid "About Theme"
+msgstr ""
+
+#: src/bin/e_theme.c:42
+msgid "Set As Theme"
+msgstr ""
+
+#: src/bin/e_toolbar.c:340
+msgid "Set Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_utils.c:245
+msgid "Cannot exit - immortal windows."
+msgstr ""
+
+#: src/bin/e_utils.c:246
+msgid ""
+"Some windows are left still around with the Lifespan lock enabled. This "
+"means<br>that Enlightenment will not allow itself to exit until these "
+"windows have<br>been closed or have the lifespan lock removed.<br>"
+msgstr ""
+
+#: src/bin/e_utils.c:804
+#, c-format
+msgid "%'.0f Bytes"
+msgstr ""
+
+#: src/bin/e_utils.c:808
+#, c-format
+msgid "%'.0f KB"
+msgstr ""
+
+#: src/bin/e_utils.c:812
+#, c-format
+msgid "%'.0f MB"
+msgstr ""
+
+#: src/bin/e_utils.c:816
+#, c-format
+msgid "%'.1f GB"
+msgstr ""
+
+#: src/bin/e_utils.c:836
+#, c-format
+msgid "In the Future"
+msgstr ""
+
+#: src/bin/e_utils.c:841
+#, c-format
+msgid "In the last Minute"
+msgstr ""
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "%li Years ago"
+msgstr ""
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Months ago"
+msgstr ""
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Weeks ago"
+msgstr ""
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Days ago"
+msgstr ""
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Hours ago"
+msgstr ""
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Minutes ago"
+msgstr ""
+
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
+msgid "Unknown"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:63
+#: src/modules/conf_applications/e_int_config_apps.c:243
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
+#: src/modules/conf_shelves/e_int_config_shelf.c:79
+#: src/modules/ibar/e_mod_config.c:110
+msgid "Add"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:69
+msgid "Remove"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:83
+#: src/modules/conf_applications/e_int_config_apps.c:258
+msgid "Up"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:89
+#: src/modules/conf_applications/e_int_config_apps.c:263
+msgid "Down"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:292
+msgid "Add to Favorites"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:298
+#: src/modules/conf_desklock/e_int_config_desklock.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:834
+#: src/modules/conf_startup/e_int_config_startup.c:275
+#: src/modules/conf_theme/e_int_config_theme.c:405
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:359
+msgid "Permissions:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:375
+msgid "Modified:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:614
+#, c-format
+msgid "You"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:663
+#, c-format
+msgid "Protected"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
+#, c-format
+msgid "Read Only"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
+#, c-format
+msgid "Forbidden"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:690
+msgid "Read-Write"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Basic Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:94
+msgid "Show alert when battery is low"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:138
+msgid "Check every:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:140
+#: src/modules/conf_performance/e_int_config_performance.c:149
+#: src/modules/temperature/e_mod_config.c:379
+#, c-format
+msgid "%1.0f ticks"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Polling"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:147
+msgid "Show alert on low battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:150
+msgid "Alert when at:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
+msgid "%1.0f min"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:158
+msgid "Auto dismiss in..."
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
+msgid "%1.0f sec"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:164
+msgid "Alert"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:170
+msgid "Auto Detect"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:172
+#: 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
+msgid "Internal"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:174
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:177
+msgid "Hardware"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:847
+msgid "Your battery is low!"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:849
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:924
+msgid "N/A"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:1096
+msgid "Battery Meter"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:244
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:251
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:279
+msgid "Modes"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:50
+#: src/modules/conf_applications/e_mod_main.c:42
+msgid "Favorites Menu"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:104
+#: src/modules/conf_applications/e_int_config_apps.c:119
+#: src/modules/conf_applications/e_mod_main.c:36
+msgid "IBar Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:135
+#: src/modules/conf_applications/e_mod_main.c:38
+msgid "Startup Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:151
+#: src/modules/conf_applications/e_mod_main.c:37
+msgid "Restart Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:236
+#: src/modules/fileman/e_fwin.c:1869
+msgid "All Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:250
+msgid "Selected Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:34
+msgid "Apps"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:35
+msgid "New Application"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:40
+msgid "IBar Other"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_clientlist/e_mod_main.c:34
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
+msgid "Menus"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:202
+msgid "Default Border Style"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:50
+msgid "Window Border Selection"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:247
+msgid "Remember this Border for this window next time it appears"
+msgstr ""
+
+#: 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
+#: src/modules/conf_icon_theme/e_mod_main.c:21
+#: src/modules/conf_mouse_cursor/e_mod_main.c:34
+#: src/modules/conf_scale/e_mod_main.c:34
+#: src/modules/conf_startup/e_mod_main.c:34
+#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_transitions/e_mod_main.c:34
+#: src/modules/conf_wallpaper/e_mod_main.c:28
+#: src/modules/dropshadow/e_mod_main.c:89
+msgid "Look"
+msgstr ""
+
+#: src/modules/conf_borders/e_mod_main.c:35
+msgid "Borders"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:40
+msgid "Client List Settings"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:99
+msgid "Group By"
+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:664
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
+#: src/modules/conf_transitions/e_int_config_transitions.c:152
+#: src/modules/conf_transitions/e_int_config_transitions.c:204
+#: src/modules/conf_transitions/e_int_config_transitions.c:236
+msgid "None"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:107
+msgid "Include windows from other screens"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:111
+msgid "Separate Groups By"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:116
+msgid "Using separator bars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:118
+msgid "Using menus"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:122
+msgid "Client Sort Order"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:126
+msgid "Alphabetical"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:128
+msgid "Window stacking layer"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:130
+msgid "Most recently used"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:134
+msgid "Iconified Windows"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:136
+msgid "Group with owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:138
+msgid "Group with current desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:140
+msgid "Separate group"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:142
+msgid "Warp to owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:146
+msgid "Menu Item Captions"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:147
+msgid "Limit caption length"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:149
+#, c-format
+msgid "%1.0f Chars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_mod_main.c:35
+msgid "Client List Menu"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:47
+msgid "Window Manager"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:48
+msgid "About Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:49
+msgid "About Dialog Version"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:50
+msgid "Border Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:51
+msgid "Settings Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:52
+msgid "Error Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:53
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
+msgid "Menu Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:54
+msgid "Menu Title Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:55
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
+msgid "Menu Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:56
+msgid "Menu Item Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:57
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
+msgid "Move Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
+msgid "Resize Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:59
+msgid "Winlist Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:60
+msgid "Winlist Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
+msgid "Winlist Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
+msgid "Widgets"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:68
+msgid "Button Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:69
+msgid "Button Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:70
+msgid "Check Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:71
+msgid "Check Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:72
+msgid "Entry Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:73
+msgid "Label Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:74
+msgid "List Item Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:75
+msgid "List Item Odd Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
+msgid "List Header"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:77
+msgid "Radio Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:78
+msgid "Radio Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:79
+msgid "Slider Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:80
+msgid "Slider Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:87
+msgid "Module Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:130
+#: src/modules/conf_colors/e_mod_main.c:35
+msgid "Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:251
+msgid "Other"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:435
+msgid "Window Manager Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:437
+#: src/modules/conf_colors/e_int_config_color_classes.c:445
+#: src/modules/conf_colors/e_int_config_color_classes.c:453
+#: src/modules/conf_colors/e_int_config_color_classes.c:517
+msgid "Enabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:439
+#: src/modules/conf_colors/e_int_config_color_classes.c:447
+#: src/modules/conf_colors/e_int_config_color_classes.c:455
+#: src/modules/conf_colors/e_int_config_color_classes.c:522
+msgid "Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:443
+msgid "Widget Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:451
+msgid "Module Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:501
+msgid "Color Classes"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:529
+msgid "Object Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:538
+msgid "Outline Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:547
+msgid "Shadow Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:556
+msgid "Defaults"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:52
+msgid "Desk Settings"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:149
+msgid "Desktop Name"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:150
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
+msgid "Name:"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:156
+msgid "Desktop Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:162
+#: src/modules/conf_mime/e_int_config_mime.c:193
+msgid "Set"
+msgstr ""
+
+#: src/modules/conf_desk/e_mod_main.c:35
+msgid "Desk"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
+msgid "Screen Lock Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
+msgid "Automatic Locking"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
+msgid "Lock when Enlightenment starts"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
+msgid "Lock when X screensaver activates"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:213
+#: src/modules/conf_desklock/e_int_config_desklock.c:443
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:189
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:207
+#, c-format
+msgid "%1.0f seconds"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
+msgid "Lock when idle time exceeded"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
+msgid "Idle time to exceed"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:225
+#: src/modules/conf_dpms/e_int_config_dpms.c:208
+#: src/modules/conf_dpms/e_int_config_dpms.c:220
+#: src/modules/conf_dpms/e_int_config_dpms.c:232
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:143
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:181
+#, c-format
+msgid "%1.0f minutes"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:298
+#: src/modules/conf_imc/e_int_config_imc.c:822
+#: src/modules/conf_startup/e_int_config_startup.c:262
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
+#: src/modules/gadman/e_mod_config.c:186
+msgid "Personal"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
+msgid "Login Box Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
+msgid "Show on all screen zones"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
+msgid "Show on current screen zone"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
+msgid "Show on screen zone #:"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:406
+#: src/modules/conf_desks/e_int_config_desks.c:247
+#: src/modules/conf_desks/e_int_config_desks.c:251
+#: src/modules/conf_desks/e_int_config_desks.c:284
+#: src/modules/conf_desks/e_int_config_desks.c:288
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:117
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:121
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:125
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:170
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:174
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:178
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
+#: src/modules/fileman/e_mod_config.c:229
+#, c-format
+msgid "%1.0f"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
+msgid "Wallpaper Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
+#: src/modules/gadman/e_mod_config.c:149
+msgid "Theme Defined"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
+msgid "Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:433
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:435
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:197
+msgid "Suggest entering presentation mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:439
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:202
+msgid "If deactivated before"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
+msgid "Custom Screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
+msgid "Use custom screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_mod_main.c:35
+msgid "Screen Lock"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:822
+msgid "Virtual Desktops Settings"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:239
+msgid "Number of Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:258
+#: src/modules/conf_desks/e_int_config_desks.c:295
+msgid "Desktop Mouse Flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:259
+msgid "Animated flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:277
+msgid "Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:296
+msgid "Flip when dragging objects to the screen edge"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:298
+msgid "Wrap desktops around when flipping"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:302
+msgid "Flip Animation"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:304
+msgid "Off"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:307
+msgid "Pane"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:310
+msgid "Zoom"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:313
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:146
+#, c-format
+msgid "%1.1f sec"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_mod_main.c:35
+msgid "Virtual Desktops"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
+msgid "Dialog Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
+#: src/modules/conf_engine/e_int_config_engine.c:94
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:114
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
+#: src/modules/conf_performance/e_int_config_performance.c:94
+#: src/modules/conf_performance/e_int_config_performance.c:134
+#: src/modules/conf_winlist/e_int_config_winlist.c:144
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
+#: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
+#: src/modules/mixer/conf_module.c:96
+msgid "General Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+msgid "Normal Windows"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
+msgid "Default Settings Dialogs Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
+msgid "Basic Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
+msgid "Advanced Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
+msgid "Default Dialog Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_mod_main.c:35
+msgid "Dialogs"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:129
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:136
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:146
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:153
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:190
+msgid "Resolution change"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:194
+msgid "Save"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:195
+msgid "Restore"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:228
+msgid "Screen Resolution Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:404
+msgid "Resolution"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:411
+msgid "Restore on login"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:415
+msgid "Refresh"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:474
+msgid "Rotation"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:493
+msgid "Mirroring"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:640
+msgid "Missing Features"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid ""
+"Your X Display Server is missing support for<br>the <hilight>XRandR</"
+"hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
+"resolutions without<br>the support of this extension. It could also "
+"be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
+"XRandR support detected."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:653
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:654
+msgid ""
+"No refresh rates were reported by your X Display Server.<br>If you are "
+"running a nested X Display Server, then<br>this is to be expected. However, "
+"if you are not, then<br>the current refresh rate will be used when "
+"setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
+"screen."
+msgstr ""
+
+#: src/modules/conf_display/e_mod_main.c:35
+msgid "Screen Resolution"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:60
+#: src/modules/conf_dpms/e_int_config_dpms.c:81
+msgid "Display Power Management Signaling"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:61
+msgid "The current display server is not <br>DPMS capable."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:82
+msgid "The current display server does not <br>have the DPMS extension."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:112
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
+msgid "Enable Display Power Management"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
+msgid "Timers"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
+msgid "Standby time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
+msgid "Suspend time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
+msgid "Off time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_mod_main.c:35
+msgid "Power Management"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
+#: 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 ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+msgid ""
+"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+msgid "Add Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
+msgid "Delete Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
+msgid "Modify Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
+msgid "Delete All"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:243
+msgid "Restore Default Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:248
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
+msgid "Action"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
+msgid "Action Params"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
+msgid "General Options"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
+msgid "%.2f seconds"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
+msgid ""
+"The binding key sequence, that you choose, is already used by <br><hilight>%"
+"s</hilight> action.<br>Please choose another binding edge sequence."
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:811
+msgid "CTRL"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:816
+msgid "ALT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:822
+msgid "SHIFT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:828
+msgid "WIN"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
+#: src/modules/conf_keybindings/e_mod_main.c:34
+#: src/modules/conf_mousebindings/e_mod_main.c:34
+#: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
+#: src/modules/mixer/app_mixer.c:301
+msgid "Input"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:38
+msgid "Engine Settings"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:95
+msgid "Enable Composite"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:102
+msgid "Default Engine"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:131
+msgid "Enable Composite Support ?"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:133
+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 ""
+
+#: src/modules/conf_engine/e_mod_main.c:35
+msgid "Engine"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:49
+msgid "Run Command Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:115
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:168
+msgid "Maximum Number of Matched Apps to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:119
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:172
+msgid "Maximum Number of Matched Exes to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:123
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:176
+msgid "Maximum History to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:129
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:182
+#: src/modules/conf_winlist/e_int_config_winlist.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:269
+msgid "Scroll Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:130
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:184
+#: src/modules/conf_winlist/e_int_config_winlist.c:270
+msgid "Scroll Animate"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:185
+#: src/modules/conf_winlist/e_int_config_winlist.c:272
+msgid "Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:189
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:228
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:232
+#: src/modules/conf_winlist/e_int_config_winlist.c:261
+#: src/modules/conf_winlist/e_int_config_winlist.c:276
+#: src/modules/conf_winlist/e_int_config_winlist.c:287
+#: src/modules/conf_winlist/e_int_config_winlist.c:291
+#, c-format
+msgid "%1.2f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:197
+msgid "Terminal Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:198
+msgid "Terminal Command (CTRL+RETURN to utilize)"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:206
+#: src/modules/conf_winlist/e_int_config_winlist.c:295
+msgid "Size Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:207
+#: src/modules/conf_winlist/e_int_config_winlist.c:296
+msgid "Minimum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:209
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:213
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:217
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:221
+#: src/modules/conf_winlist/e_int_config_winlist.c:298
+#: src/modules/conf_winlist/e_int_config_winlist.c:302
+#: src/modules/conf_winlist/e_int_config_winlist.c:306
+#: src/modules/conf_winlist/e_int_config_winlist.c:310
+#, c-format
+msgid "%4.0f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:211
+#: src/modules/conf_winlist/e_int_config_winlist.c:300
+msgid "Minimum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:215
+#: src/modules/conf_winlist/e_int_config_winlist.c:304
+msgid "Maximum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:219
+#: src/modules/conf_winlist/e_int_config_winlist.c:308
+msgid "Maximum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:225
+#: src/modules/conf_winlist/e_int_config_winlist.c:284
+msgid "Position Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:226
+#: src/modules/conf_winlist/e_int_config_winlist.c:285
+msgid "X-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:230
+#: src/modules/conf_winlist/e_int_config_winlist.c:289
+msgid "Y-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
+#: src/modules/exebuf/e_mod_main.c:129
+msgid "Run Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
+msgid "Core"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
+msgid "Title Bar"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
+msgid "Textblock Plain"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
+msgid "Textblock Light"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
+msgid "Textblock Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
+msgid "Settings Heading"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
+msgid "About Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
+msgid "About Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
+msgid "About Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
+msgid "Desklock Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
+msgid "Desklock Password"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
+msgid "Dialog Error"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
+msgid "Exebuf Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
+msgid "Splash Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
+msgid "Splash Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
+msgid "Splash Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
+msgid "Entry"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
+msgid "Frame"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
+msgid "Label"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
+msgid "Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
+msgid "Slider"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
+msgid "Radio Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
+msgid "Check Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
+msgid "Text List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
+msgid "List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
+msgid "Filemanager"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
+msgid "Typebuf"
+msgstr ""
+
+#: 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:104
+msgid "Normal Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
+msgid "Large Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
+msgid "Font Settings"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
+msgid "Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
+msgid "Really Big"
+msgstr ""
+
+#: 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:427
+msgid "Enable Custom Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
+#: 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:451
+msgid "Basic preview text: 123: 我的天空!"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:604
+msgid "Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
+msgid "Hinting"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
+#: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
+msgid "Automatic"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
+msgid "Icon Theme Settings"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
+msgid "Icon Themes"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
+msgid "Icon theme overrides general theme"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_mod_main.c:22
+msgid "Icon Theme"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:109
+#: src/modules/conf_imc/e_mod_main.c:35
+msgid "Input Method Settings"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:297
+msgid "Input Method Selector"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:300
+#: src/modules/conf_imc/e_int_config_imc.c:894
+msgid "Use No Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:961
+msgid "Setup Selected Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:901
+msgid "New"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:903
+msgid "Import..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:908
+msgid "Input Method Parameters"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:918
+msgid "Execute Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:925
+msgid "Setup Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:934
+msgid "Exported Environment Variables"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:66
+msgid "Select an Input Method Settings..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:281
+#: src/modules/conf_imc/e_int_config_imc_import.c:296
+msgid "Input Method Config Import Error"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:282
+msgid ""
+"Enlightenment was unable to import the configuration.<br><br>Are you sure "
+"this is really a valid configuration?"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:297
+msgid ""
+"Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
+#: src/modules/wizard/page_010.c:142
+msgid "Language"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:37
+msgid "Interaction Settings"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:94
+msgid "Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:96
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:100
+msgid "Threshold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:103
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:107
+msgid "Threshold for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:110
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:114
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:117
+#, 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:583
+#: src/modules/conf_intl/e_mod_main.c:35
+msgid "Language Settings"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:900
+#: src/modules/conf_intl/e_int_config_intl.c:977
+msgid "Language Selector"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:950
+#: src/modules/conf_intl/e_int_config_intl.c:1028
+msgid "Locale Selected"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:951
+#: src/modules/conf_intl/e_int_config_intl.c:1029
+msgid "Locale"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
+msgid ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:92
+msgid "Key Binding Settings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:223
+#: src/modules/conf_keybindings/e_mod_main.c:35
+msgid "Key Bindings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:228
+msgid "Add Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:231
+msgid "Delete Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:235
+msgid "Modify Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:918
+msgid "Key Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
+msgid "Binding Key Error"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1130
+#, 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:44
+#: src/modules/conf_menus/e_int_config_menus.c:110
+#: src/modules/conf_menus/e_int_config_menus.c:169
+#: src/modules/conf_menus/e_mod_main.c:35
+msgid "Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:101
+#: src/modules/conf_menus/e_int_config_menus.c:160
+msgid "Main Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:102
+#: src/modules/conf_menus/e_int_config_menus.c:161
+msgid "Show Favorites In Main Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:105
+#: src/modules/conf_menus/e_int_config_menus.c:164
+msgid "Show Applications In Main Menu"
+msgstr ""
+
+#: 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:114
+#: src/modules/conf_menus/e_int_config_menus.c:173
+msgid "Show Generic In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:117
+#: src/modules/conf_menus/e_int_config_menus.c:176
+msgid "Show Comment In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:181
+msgid "Autoscroll Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:182
+msgid "Autoscroll Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:184
+#: src/modules/conf_menus/e_int_config_menus.c:189
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:136
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:144
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:152
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
+#, c-format
+msgid "%2.0f pixels"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:187
+msgid "Autoscroll Cursor Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:194
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:195
+msgid "Menu Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:197
+#, c-format
+msgid "%5.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:200
+msgid "Fast Mouse Move Threshhold"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:202
+#: src/modules/conf_window_display/e_int_config_window_display.c:229
+#, c-format
+msgid "%4.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:206
+msgid "Click Drag Timeout"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:208
+#, c-format
+msgid "%2.2f seconds"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:64
+#: src/modules/conf_mime/e_mod_main.c:35
+msgid "File Icons"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:186
+msgid "File Types"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:69
+msgid "File Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:137
+msgid "Mime:"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:147
+msgid "Use Generated Thumbnail"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:150
+msgid "Use Theme Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:153
+msgid "Use Edje File"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:156
+msgid "Use Image"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:159
+msgid "Use Default"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:270
+msgid "Select an Edj File"
+msgstr ""
+
+#: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
+msgid "Files"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
+msgid ""
+"Please hold any modifier you want<br>and press any button on your mouse,<br> "
+"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
+"highlight> to abort."
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
+msgid "Mouse Binding Settings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
+#: src/modules/conf_mousebindings/e_mod_main.c:35
+msgid "Mouse Bindings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
+msgid "Add Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
+msgid "Delete Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
+msgid "Modify Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
+msgid "Restore Mouse and Wheel Binding Defaults"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
+msgid "Action Context"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
+msgid "Any"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
+msgid "Win List"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
+msgid "Popup"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
+msgid "Zone"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
+msgid "Container"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
+msgid "Manager"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
+msgid "Mouse Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
+msgid "Cursor Settings"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
+msgid "Show Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
+msgid "Idle Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
+msgid "Use Enlightenment Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
+msgid "Use X Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
+msgid "Cursor Size"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_mod_main.c:35
+msgid "Mouse Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
+msgid "Mouse Hand"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
+msgid "Mouse Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+msgid "Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
+msgid "Threshold"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:62
+msgid "Search Path Settings"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:73
+msgid "Data"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:75
+msgid "Images"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:79
+#: src/modules/conf_theme/e_int_config_theme.c:1010
+msgid "Themes"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:81
+msgid "Icons"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:85
+msgid "Backgrounds"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:87
+msgid "Messages"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:168
+msgid "E Paths"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:199
+msgid "Default Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:206
+msgid "User Defined Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_mod_main.c:35
+msgid "Search Directories"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:40
+msgid "Performance Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:95
+#: src/modules/conf_performance/e_int_config_performance.c:135
+msgid "Framerate"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:97
+#: src/modules/conf_performance/e_int_config_performance.c:137
+#, c-format
+msgid "%1.0f fps"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:100
+#: src/modules/conf_performance/e_int_config_performance.c:140
+msgid "Application Priority"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:146
+msgid "Cache Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:147
+msgid "Cache Flush Interval"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:152
+msgid "Size Of Font Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:154
+#, c-format
+msgid "%1.1f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:157
+msgid "Size Of Image Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:159
+#, c-format
+msgid "%1.0f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:162
+msgid "Number Of Edje Files To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:164
+#, c-format
+msgid "%1.0f files"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:167
+msgid "Number Of Edje Collections To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:169
+#, c-format
+msgid "%1.0f collections"
+msgstr ""
+
+#: src/modules/conf_performance/e_mod_main.c:35
+msgid "Performance"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
+msgid "Reset"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
+msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
+msgid "Add New Profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_mod_main.c:22
+msgid "Profiles"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:61
+msgid "Scaling Settings"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:140
+msgid "Scale with DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:144
+msgid "Relative"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:145
+msgid "Base DPI to scale relative to"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:148
+#: src/modules/conf_scale/e_int_config_scale.c:259
+#, c-format
+msgid "%1.0f DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:151
+#, c-format
+msgid "Currently %i DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:245
+msgid "Policy"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:248
+msgid "Don't Scale"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:252
+msgid "Scale relative to screen DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:255
+#, c-format
+msgid "Base DPI (Currently %i DPI)"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:263
+msgid "Custom scaling factor"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:266
+#: src/modules/conf_scale/e_int_config_scale.c:276
+#: src/modules/conf_scale/e_int_config_scale.c:282
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:272
+msgid "Constraints"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:273
+msgid "Minimum"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:279
+msgid "Maximum"
+msgstr ""
+
+#: src/modules/conf_scale/e_mod_main.c:35
+msgid "Scaling"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
+msgid "Screen Saver Settings"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:135
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:173
+msgid "Enable X screensaver"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:138
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:176
+msgid "Screensaver Timer(s)"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:140
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:178
+msgid "Time until X screensaver starts"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
+msgid "Time until X screensaver alternates"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
+msgid "Blanking"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
+msgid "Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
+msgid "Not Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
+msgid "Exposure Events"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
+msgid "Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
+msgid "Don't Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_mod_main.c:35
+msgid "Screen Saver"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:71
+msgid "Configured Shelves"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_config.c:114
+msgid "Setup"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:277
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"shelf?"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:39
+msgid "Startup Settings"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:328
+msgid "Show Splash Screen on Login"
+msgstr ""
+
+#: src/modules/conf_startup/e_mod_main.c:35
+#: src/modules/conf_transitions/e_int_config_transitions.c:134
+msgid "Startup"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:90
+msgid "Theme Selector"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:434
+msgid " Import..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:438
+msgid " Online..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1001
+msgid "Theme Categories"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1019
+msgid "Assign"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear All"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:67
+msgid "Select a Theme..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:274
+#: src/modules/conf_theme/e_int_config_theme_import.c:283
+msgid "Theme Import Error"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:275
+msgid ""
+"Enlightenment was unable to import the theme.<br><br>Are you sure this is "
+"really a valid theme?"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:284
+msgid "Enlightenment was unable to import the theme<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_web.c:127
+msgid "Exchange themes"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:44
+msgid "Transition Settings"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:126
+msgid "Events"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:135
+msgid "Desk Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:136
+msgid "Background Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:144
+#: src/modules/conf_transitions/e_mod_main.c:35
+msgid "Transitions"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
+msgid "Wallpaper Settings"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
+msgid "Use Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
+msgid "Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
+msgid "Gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "All Desktops"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+msgid "This Desktop"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
+msgid "This Screen"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
+msgid "Create a gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
+msgid "Color 1:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
+msgid "Color 2:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
+msgid "Fill Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
+msgid "Horizontal"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
+msgid "Vertical"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
+msgid "Diagonal Up"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
+msgid "Diagonal Down"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
+msgid "Radial"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
+msgid "Gradient Creation Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
+msgid "For some reason, Enlightenment was unable to create a gradient."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
+msgid "Wallpaper settings..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
+msgid "Fill and Stretch Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
+msgid "Stretch"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
+msgid "Center"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
+msgid "Tile"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
+msgid "Within"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
+msgid "Fill"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
+msgid "File Quality"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
+msgid "Use original file"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
+#, c-format
+msgid "%3.0f%%"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
+msgid "Select a Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
+msgid "Picture Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
+msgid ""
+"Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
+msgid "Wallpaper Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
+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:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
+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:117
+msgid "Exchange wallpapers"
+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:32
+#: src/modules/conf_wallpaper/e_mod_main.c:96
+msgid "Wallpaper"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:58
+#: src/modules/conf_window_display/e_mod_main.c:35
+msgid "Window Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:167
+msgid "Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:168
+msgid "Show window geometry information when moving or resizing"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:170
+#: src/modules/conf_window_display/e_int_config_window_display.c:227
+msgid "Animate the shading and unshading of windows"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:174
+#: src/modules/conf_window_display/e_int_config_window_display.c:254
+msgid "Automatic New Window Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:176
+#: src/modules/conf_window_display/e_int_config_window_display.c:257
+msgid "Smart Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:178
+#: src/modules/conf_window_display/e_int_config_window_display.c:259
+msgid "Don't hide Gadgets"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:180
+#: src/modules/conf_window_display/e_int_config_window_display.c:261
+msgid "Place at mouse pointer"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:182
+#: src/modules/conf_window_display/e_int_config_window_display.c:263
+msgid "Place manually with the mouse"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:184
+#: src/modules/conf_window_display/e_int_config_window_display.c:265
+msgid "Automatically switch to desktop of new window"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:203
+msgid "Window Move Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:205
+#: src/modules/conf_window_display/e_int_config_window_display.c:216
+msgid "Display information"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:207
+msgid "Follow the window as it moves"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:214
+msgid "Window Resize Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:218
+msgid "Follow the window as it resizes"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:225
+msgid "Window Shading"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:234
+msgid "Linear"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:238
+msgid "Smooth accelerate and decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:242
+msgid "Accelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:246
+msgid "Decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:269
+msgid "Window Border"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:272
+msgid "Prefer user defined icon"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:274
+msgid "Prefer application provided icon"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:50
+msgid "Focus Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:165
+msgid "Click Window to Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:167
+msgid "Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:169
+msgid "Most recent Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:183
+msgid "Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:185
+msgid "Click to focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:187
+msgid "Pointer focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:189
+msgid "Sloppy focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:193
+msgid "New Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:195
+msgid "No new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:197
+msgid "All new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:199
+msgid "Only new dialogs get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:201
+msgid "Only new dialogs get focus if the parent has focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:205
+msgid "Other Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:206
+msgid "Always pass on caught click events to programs"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:208
+msgid "A click on a window always raises it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:210
+msgid "A click in a window always focuses it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:212
+msgid "Refocus last focused window on desktop switch"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:214
+msgid "Revert focus when hiding or closing a window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:216
+msgid "Slide pointer to a new focused window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_mod_main.c:35
+#: src/modules/wizard/page_060.c:26
+msgid "Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
+#: src/modules/conf_window_manipulation/e_mod_main.c:35
+msgid "Window Geometry"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
+msgid "Resistance"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
+msgid "Resist moving or resizing a window over an obstacle"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
+msgid "Resistance between windows:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
+msgid "Resistance at the edge of the screen:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
+msgid "Resistance to desktop gadgets:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
+msgid "Keyboard move and resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
+msgid "Automatically accept changes after:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
+msgid "Move by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
+msgid "Resize by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
+#: src/modules/conf_window_manipulation/e_mod_main.c:37
+msgid "Window Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
+msgid "Smart expansion"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
+msgid "Fill available space"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
+msgid "Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
+msgid "Both"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
+msgid "Automatically move/resize windows on shelf autohide"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
+#: src/modules/conf_window_manipulation/e_mod_main.c:36
+msgid "Window Stacking"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
+msgid "Automatically raise windows on mouse over"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
+msgid "Allow windows to be above fullscreen window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
+msgid "Autoraise"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
+msgid "Delay before raising:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
+msgid "Raise Window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
+msgid "Raise when starting to move or resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
+msgid "Raise when clicking to focus"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
+msgid "Class:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
+msgid "Title:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
+msgid "Role:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
+msgid "<No Role>"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:62
+msgid "Window List Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:145
+msgid "Show iconified windows"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:147
+msgid "Show iconified windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:151
+msgid "Show iconified windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:157
+msgid "Show windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:159
+msgid "Show windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:163
+#: src/modules/conf_winlist/e_int_config_winlist.c:241
+msgid "Selection Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:164
+#: src/modules/conf_winlist/e_int_config_winlist.c:242
+msgid "Focus window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:166
+#: src/modules/conf_winlist/e_int_config_winlist.c:244
+msgid "Raise window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:168
+#: src/modules/conf_winlist/e_int_config_winlist.c:246
+msgid "Warp mouse to window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:170
+#: src/modules/conf_winlist/e_int_config_winlist.c:248
+msgid "Uncover windows while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:172
+#: src/modules/conf_winlist/e_int_config_winlist.c:250
+msgid "Jump to desk while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:176
+#: src/modules/conf_winlist/e_int_config_winlist.c:254
+msgid "Warp Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:177
+#: src/modules/conf_winlist/e_int_config_winlist.c:255
+msgid "Warp At End"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:257
+msgid "Warp Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:135
+msgid "Cpufreq"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:182
+msgid "Fast (4 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:189
+msgid "Medium (8 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:196
+msgid "Normal (32 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:203
+msgid "Slow (64 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:210
+msgid "Very Slow (256 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:225
+msgid "Manual"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
+msgid "Lower Power Automatic"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
+msgid "Minimum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
+msgid "Maximum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:244
+msgid "Restore CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:252
+msgid "Powersaving policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:280
+msgid "Automatic powersaving"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:299
+#, c-format
+msgid "%i MHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:301
+#, c-format
+msgid "%i.%i GHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:318
+msgid "Time Between Updates"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:324
+msgid "Set CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:331
+msgid "Set CPU Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:337
+msgid "Powersaving behavior"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:386
+msgid ""
+"There was an error trying to set the<br>cpu frequency governor via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:412
+msgid ""
+"Your kernel does not support setting the<br>CPU frequency at all. You may be "
+"missing<br>Kernel modules or features, or your CPU<br>simply does not "
+"support this feature."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:432
+msgid ""
+"There was an error trying to set the<br>cpu frequency setting via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:40
+msgid "Dropshadow Settings"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:108
+msgid "Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:111
+msgid "High Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:113
+msgid "Medium Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:115
+msgid "Low Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:119
+msgid "Blur Type"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:122
+msgid "Very Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:124
+msgid "Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:128
+msgid "Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:130
+msgid "Very Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:134
+msgid "Shadow Distance"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:137
+msgid "Very Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:139
+msgid "Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:141
+msgid "Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:143
+msgid "Very Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:145
+msgid "Extremely Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:147
+msgid "Underneath"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:151
+msgid "Shadow Darkness"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:154
+msgid "Very Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:156
+msgid "Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:158
+msgid "Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:160
+msgid "Very Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:90
+msgid "Dropshadow"
+msgstr ""
+
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+msgid "Run Command Dialog"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
+msgid "Home"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:322
+msgid "Favorites"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:334
+msgid "Root"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:431
+msgid ""
+"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
+"been wiped and a new set of defaults initialized. This<br>will happen "
+"regularly during development, so don't report a<br>bug. This simply means "
+"Fileman module needs new configuration<br>data by default for usable "
+"functionality that your old<br>configuration simply lacks. This new set of "
+"defaults will fix<br>that by adding it in. You can re-configure things now "
+"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:444
+msgid ""
+"Your Fileman Module configuration is NEWER than Fileman Module version. This "
+"is very<br>strange. This should not happen unless you downgraded<br>the "
+"Fileman Module or copied the configuration from a place where<br>a newer "
+"version of the Fileman Module was running. This is bad and<br>as a "
+"precaution your configuration has been now restored to<br>defaults. Sorry "
+"for the inconvenience.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:513
+msgid "Fileman Settings Updated"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:95
+msgid "Fileman Settings"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:227
+msgid "Icon Size"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:233
+msgid "View"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:236
+msgid "Open Dirs In Place"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:240
+msgid "Sort Dirs First"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:243
+msgid "Case Sensitive"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:247
+msgid "Use Single Click"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:250
+msgid "Use Alternate Selection Modifiers"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:254
+msgid "Show Icon Extension"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:257
+msgid "Show Full Path"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:260
+msgid "Show Desktop Icons"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:263
+msgid "Show Toolbar"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:775
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1412
+msgid "Go to Parent Directory"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1474
+msgid "Other application..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
+msgid "Open"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1838
+msgid "Known Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1848
+msgid "Specific Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1890
+msgid "Custom Command"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2146
+#: src/modules/fileman_opinfo/e_mod_main.c:94
+#, c-format
+msgid "Copying is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2149
+#: src/modules/fileman_opinfo/e_mod_main.c:97
+#, c-format
+msgid "Moving is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2152
+#: src/modules/fileman_opinfo/e_mod_main.c:100
+#, c-format
+msgid "Deleting is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2155
+#: src/modules/fileman_opinfo/e_mod_main.c:103
+#, c-format
+msgid "Unknown operation from slave is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2165
+#: src/modules/fileman_opinfo/e_mod_main.c:113
+#, c-format
+msgid "Copy of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2167
+#: src/modules/fileman_opinfo/e_mod_main.c:115
+#, c-format
+msgid "Copying %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2171
+#: src/modules/fileman_opinfo/e_mod_main.c:119
+#, c-format
+msgid "Move of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2173
+#: src/modules/fileman_opinfo/e_mod_main.c:121
+#, c-format
+msgid "Moving %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2177
+#: src/modules/fileman_opinfo/e_mod_main.c:125
+#, c-format
+msgid "Delete done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2179
+#: src/modules/fileman_opinfo/e_mod_main.c:127
+#, c-format
+msgid "Deleting files..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2182
+#: src/modules/fileman_opinfo/e_mod_main.c:130
+#, c-format
+msgid "Unknow operation from slave %d"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:138
+#: src/modules/fileman_opinfo/e_mod_main.c:148
+msgid "(no information)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:142
+#, c-format
+msgid "File: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:144
+#, c-format
+msgid "From: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:151
+#, c-format
+msgid "To: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
+msgid "Processing %d operation(s)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:333
+msgid "Filemanager is idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:414
+msgid "EFM Operation Info"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:58
+msgid "Gadgets Manager"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:147
+msgid "Background Mode"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
+msgid "Custom Image"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
+msgid "Custom Color"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:160
+msgid "Transparent"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:167
+msgid "Animations"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:168
+msgid "Background"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
+msgid "Gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:723
+msgid "Free"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:755
+msgid "Always on desktop"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:765
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:796
+msgid "Add other gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+msgid "Show/hide gadgets"
+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
+msgid "Window : List"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
+msgid "Next Window"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
+msgid "Previous Window"
+msgstr ""
+
+#: src/modules/winlist/e_winlist.c:141
+msgid "Select a window"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:56
+msgid "IBar Settings"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:102
+msgid "Selected Bar Source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:123
+msgid "Icon Labels"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
+msgid "Show Icon Label"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:130
+msgid "Display App Name"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:134
+msgid "Display App Comment"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:138
+msgid "Display App Generic"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:168
+msgid "Create new IBar source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:169
+msgid "Enter a name for this new source:"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:183
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:187
+msgid "Are you sure you want to delete this bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:215
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:797
+msgid "Change Icon Properties"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:802
+msgid "Remove Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:812
+msgid "Add An Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:819
+msgid "Create New Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:835
+msgid "Add Application"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:51
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:104
+msgid "Display Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:109
+msgid "Display Title"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:114
+msgid "Display Class"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:119
+msgid "Display Icon Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:124
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:154
+msgid "Show windows from all screens"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:159
+msgid "Show windows from current screen"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:168
+msgid "Show windows from all desktops"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:173
+msgid "Show windows from active desktop"
+msgstr ""
+
+#: src/modules/ibox/e_mod_main.c:227
+msgid "IBox"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:72
+msgid "Pager Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
+msgid "Flip desktop on mouse wheel"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
+msgid "Show desktop names"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
+msgid "Popup Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
+msgid "Show popup on desktop change"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:132
+msgid "Show popup for urgent windows"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:169
+msgid "Select and Slide button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:176
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:183
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:192
+msgid "Keyaction popup height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
+msgid "%.0f px"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:198
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:209
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
+msgid "Popup speed"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
+#, c-format
+msgid "%1.1f seconds"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:231
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:232
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:235
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:290
+msgid ""
+"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
+"<br>Or <hilight>Del</hilight> to reset the button."
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:345
+msgid "Attetion"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:346
+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 ""
+
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
+msgid "Button %i"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2850
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:111
+msgid "Start"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:34
+msgid "System Control"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:55
+msgid "System Controls"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:63
+msgid "Temperature Settings"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:352
+msgid "Display Units"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:354
+msgid "Celsius"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:356
+msgid "Fahrenheit"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:378
+msgid "Check Interval"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:258
+msgid "Fast"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:262
+msgid "Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Very Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:271
+#: src/modules/temperature/e_mod_config.c:295
+#: src/modules/temperature/e_mod_config.c:396
+#: src/modules/temperature/e_mod_config.c:408
+msgid "High Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:274
+msgid "200 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:276
+msgid "150 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:287
+msgid "110 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:282
+#: src/modules/temperature/e_mod_config.c:306
+#: src/modules/temperature/e_mod_config.c:401
+#: src/modules/temperature/e_mod_config.c:413
+msgid "Low Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:285
+msgid "130 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:289
+msgid "90 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:298
+msgid "93 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:300
+msgid "65 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:302
+#: src/modules/temperature/e_mod_config.c:311
+msgid "43 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:309
+msgid "55 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:313
+msgid "32 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:367
+msgid "Sensors"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:402
+#, c-format
+msgid "%1.0f F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:409
+#: src/modules/temperature/e_mod_config.c:414
+#, c-format
+msgid "%1.0f C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:147
+msgid "Temperature"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:221
+msgid "Next"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:281
+msgid "Welcome to Enlightenment"
+msgstr ""
+
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:58
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:91
+msgid ""
+"No menu files were<br>found on your system.<br>Please see "
+"the<br>documentation on<br>www.enlightenment.org<br>for more details "
+"on<br>how to get your<br>application menus<br>working."
+msgstr ""
+
+#: src/modules/wizard/page_030.c:107
+msgid "Select application menu"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:124
+msgid "System Default"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:25
+msgid "Launcher Bar"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:27
+msgid "Select applications"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:28
+msgid "Desktop Files"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:32
+msgid "No icons on desktop"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:35
+msgid "Enable desktop icons"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:28
+msgid "Focus mode"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:32
+msgid "Click to focus windows"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:35
+msgid "Mouse over focuses windows"
+msgstr ""
+
+#: src/modules/wizard/page_070.c:204
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:60
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Select Applications"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:165
+msgid "Capture"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:167
+msgid "Playback"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:289
+msgid "Output"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:363
+msgid "Cards"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
+msgid "Channels"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Card:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:394
+msgid "Channel:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:398
+msgid "Type:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:402
+msgid "Left:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:407
+msgid "Right:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
+msgid "Mute"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
+msgid "Lock Sliders"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:419
+msgid "Edit"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:202
+msgid "Show both sliders when locked"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:322
+msgid "Sound Cards"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:377
+msgid "Mixer Settings"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:98
+msgid "Mixer to use for global actions:"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:152
+msgid "Launch mixer..."
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:187
+msgid "Mixer Module Settings"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:123
+msgid "Mixer Settings Updated"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:602
+msgid "Controls"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:1157
+msgid ""
+"Mixer Module Settings data changed.<br>Your old configuration has been "
+"replaced with new default.<br>Sorry for the inconvenience."
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:214
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:731
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:737
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:742
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:745
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:748
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:769
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:891
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:892
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1094
+msgid "Systray"
+msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index d0c14a6..79a546f 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index e8ab1ee..2c5a7db 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,40 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment DR17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-03-21 16:28+0000\n"
-"Last-Translator: Kenneth Langdalen <Unknown>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-06-03 16:29+0000\n"
+"Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: E17-nb <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Lukk"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -65,564 +67,563 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr ""
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nei"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Vil du virkelig avslutte?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Du har bedt om å avslutte Enlightenment.<br><br>Er du sikker?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Vil du virkelig logge ut?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr ""
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr ""
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr ""
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Flytt"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr ""
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Drep"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr ""
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksimér"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr ""
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr ""
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr ""
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr ""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr ""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr ""
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr ""
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr ""
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr ""
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr ""
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr ""
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Bytt til skrivebord 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Bytt til skrivebord 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Bytt til skrivebord 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Bytt til skrivebord 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Bytt til skrivebord 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Bytt til skrivebord 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Bytt til skrivebord 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Bytt til skrivebord 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Bytt til skrivebord 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Bytt til skrivebord 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Bytt til skrivebord 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Bytt til skrivebord 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Bytt til skrivebord..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Skjerm"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr ""
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr ""
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Til skrivebord..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Vis meny..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr ""
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Avslutt"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Avslutt nå"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s-modul"
+msgstr ""
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Slå av nå"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Slå av"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr ""
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "LÃ¥s"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Rydd vinduer"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr ""
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr ""
 
@@ -630,41 +631,40 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Ok"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -675,7 +675,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -684,11 +684,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -696,7 +696,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -706,7 +706,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -715,7 +715,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -724,7 +724,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -732,11 +732,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -744,12 +744,12 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avansert"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Bruk"
 
@@ -757,7 +757,7 @@ msgstr "Bruk"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduler"
 
@@ -766,39 +766,39 @@ msgstr "Moduler"
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Beholder %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr ""
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr ""
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -806,22 +806,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -842,7 +842,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -887,7 +887,7 @@ msgstr ""
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Innstillinger"
 
@@ -919,23 +919,23 @@ msgstr "Velg et ikon"
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Slett"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopier"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -943,24 +943,24 @@ msgstr "Lim inn"
 msgid "Select All"
 msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Kjørefeil"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Kjørefeil i applikasjon"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -969,313 +969,307 @@ msgstr ""
 "Enlightenment klarte ikke kjøre applikasjonen:<br><br>%"
 "s<br><br>Applikasjonen startet ikke opp."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Feil ved kjøring av applikasjon"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s sluttet uventet å kjøre."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Feillogger"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Det var ingen feilmelding."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Feilinformasjon"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Feilsignalinformasjon"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Det var ingen utdata"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s eksisterer ikke."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Kjørefeil"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Kjørefeil"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Feil"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Opprett mappe"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Om"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Bakgrunn"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr ""
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr ""
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Gi nytt navn"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Feil"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Starter"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr ""
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1286,144 +1280,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Filegenskaper"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Størrelse:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Filtype:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Rettigheter"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Eier"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1433,7 +1431,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Vinduslåser"
 
@@ -1468,21 +1466,21 @@ msgid "Lock program changing:"
 msgstr "Ikke la programmet selv endre:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Posisjon"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Størrelse"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Nivå"
 
@@ -1491,12 +1489,12 @@ msgid "Iconified state"
 msgstr "Minimert"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Fasthet"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Opprullet"
 
@@ -1505,7 +1503,7 @@ msgid "Maximized state"
 msgstr "Maksimert"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Fullskjerm"
 
@@ -1513,7 +1511,7 @@ msgstr "Fullskjerm"
 msgid "Lock me from changing:"
 msgstr "Ikke la meg endre:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Vindusramme"
 
@@ -1561,115 +1559,116 @@ msgstr ""
 msgid "More..."
 msgstr "Mer..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimér"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Husk"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Alltid på toppen"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Opprullet"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Fast"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Fullskjerm"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1685,7 +1684,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Tittel"
 
@@ -1777,11 +1776,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1789,15 +1788,15 @@ msgstr ""
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Husk vindusegenskaper"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Vindusegenskaper er ikke en unik treff"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1821,11 +1820,11 @@ msgstr ""
 "Press <hilight>Avbryt</hilight> om du<br>ikke er sikker, og ingenting vil "
 "bli påvirket."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Ingen utvalgsoperatører valgt"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1836,105 +1835,92 @@ msgstr ""
 "ramme etc.)<br><hilight>uten å spesifisere hvordan de skal huskes</hilight>."
 "<br><br>Du må velge minst 1 måte å huske dette vinduet."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Du har bedt Enlightenment huske egenskaper<br>(slik som størrelse, posisjon, "
-"ramme etc.) for et vindu som <hilight>ikke har unike egenskaper</"
-"hilight><br><br>Dette betyr det deler Navn/Klasse/Transience/Rolle etc. "
-"egenskaper<br>med mer enn 1 annet vindu på skjermen og å huske<br>egenskaper "
-"for vinduet vil berøre alle andre vinduer<br>som samsvarer med disse "
-"egenskapene.<br><br>Du vil kanskje ønske å skru på <hilight>Kun første "
-"vindu</hilight> opsjonen dersom<br>du bare har intensjoner om at bare en "
-"instans av dette vinduet skal bli endret,<br>med andre uendret.<br><br>Dette "
-"er bare en advarsel tilfelle du ikke ville ha denne effekten.<br>Dersom du "
-"ville, bare press <hilight>Bruk</hilight> eller <hilight>Ok</hilight> igjen,"
-"<br>og dine innstillinger vil bli akseptert. Press <hilight>Avbryt</hilight> "
-"om du<br>ikke er sikker, og ingenting vil bli påvirket."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Ingenting"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Størrelse og posisjon"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "LÃ¥ser"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Størrelse, posisjon og låser"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Alt"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Husk vinduet på"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Vinduets navn og klasse"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Vindusrolle"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Type vindu"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Egenskaper å huske"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Skrivebord"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Hopp over vindu"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Kun første vindu"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
-msgid "Always focus on start"
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
@@ -1943,7 +1929,7 @@ msgstr ""
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Innstillinger"
@@ -1962,24 +1948,24 @@ msgstr ""
 msgid "Module Settings"
 msgstr "Modulinnstillinger"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2013,8 +1999,8 @@ msgstr ""
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2038,12 +2024,12 @@ msgid "Favorite Applications"
 msgstr "Favoritter"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2052,7 +2038,7 @@ msgstr ""
 msgid "Windows"
 msgstr "Vinduer"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Fortapte vinduer"
 
@@ -2085,133 +2071,131 @@ msgid "(No Applications)"
 msgstr "(Ingen programmer)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Skrivebord"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Ingen vindu)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Uten navn"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Midt på treet"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Alltid øverst"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f piksler"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunder"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2419,7 +2403,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2427,46 +2411,46 @@ msgstr ""
 "Enlightenment klarte ikke sette opp oppstartsskjermbilde.\n"
 "Er du tom for minne?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2474,191 +2458,191 @@ msgstr ""
 "Enlightenment klarte ikke sette opp vindushåndtering av alle skjermbildene.\n"
 "Kjører du en annen vindushåndterer?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment klarte ikke sette opp handlingssystemet."
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment klarer ikke å sette opp systemet som husker vindustatus."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment klarte ikke sette opp filbehandleren.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment klarer ikke å sette opp meldingssystemet."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment klarer ikke å sette opp dra-og-slipp-systemet."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment klarer ikke å sette opp håndtering av innenheter."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment klarer ikke å sette opp modulsystemet."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment klarer ikke å sette opp systemet som husker vindustatus."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment klarer ikke sette opp fargeklassesystemet."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment klarer ikke å sette opp dingskontrollsystemet."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment klarte ikke sette opp koblingssysstemet."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment klarte ikke sette opp sprettoppsystemet."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment klarte ikke sette opp hyllesystemet."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment klarte ikke sette opp miniatyrbildesystemet.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2666,11 +2650,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2678,15 +2662,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Nesten ferdig"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2695,11 +2679,11 @@ msgstr ""
 "Det oppstod en feil ved lasting av modulen: %s<br>Ingen modul kalt %s ble "
 "funnet i søkestien for moduler<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Feil ved lasting av modul"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2708,11 +2692,11 @@ msgstr ""
 "Det oppstod en feil ved lasting av modul: %s<br>Full sti til modulen:<br>%"
 "s<br>Følgende feil ble rapportert:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2722,12 +2706,12 @@ msgstr ""
 "Feil ved initialisering av modulen: %s<br>Den krever et modul-API med "
 "versjon: %i.<br>Enlightement rapporterer modul-API med versjon: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s-modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Vil du fjerne denne modulen fra minne?<br>"
 
@@ -2738,29 +2722,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -2777,120 +2761,120 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Logg ut nå"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Avbryt utlogging"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Utlogging pågår"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Utloggiing pågår.<br><hilight>Vennligst vent.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Slå av"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Slå av.<br><hilight>Vennligst vent.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2906,88 +2890,88 @@ msgstr ""
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Kan ikke avslutte - udødelige vinduer."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr ""
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år siden"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li måneder siden"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li uker siden"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dager siden"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timer siden"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minutter siden"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Ukjent"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3007,51 +2991,51 @@ msgstr "Opp"
 msgid "Down"
 msgstr "Ned"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permisjoner:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Du"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -3067,57 +3051,57 @@ msgstr "Grunnleggende innstillinger"
 msgid "Show alert when battery is low"
 msgstr "Vis advarsel når batterinivået er lavt"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Kolla varje:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3125,12 +3109,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3138,24 +3122,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3163,24 +3147,22 @@ msgstr ""
 msgid "Clock"
 msgstr "Klokke"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Posisjon"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Moduler"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3204,7 +3186,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3226,12 +3208,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menyer"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3239,14 +3221,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Valg av vindusbord"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Alltid bruk denne borden for dette vinduet"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3272,7 +3254,7 @@ msgstr "Grupper etter"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3540,9 +3522,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Navn:"
 
@@ -3608,10 +3590,10 @@ msgstr "%1.0f minutter"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr ""
@@ -3643,8 +3625,8 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3664,9 +3646,8 @@ msgid "Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Bakgrunn"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3749,9 +3730,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Bakgrunn"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -3767,46 +3747,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Avansert"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -3862,31 +3847,31 @@ msgstr "Gjenopprett"
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3895,11 +3880,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3954,7 +3939,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3964,102 +3949,107 @@ msgstr "<Ingen>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4234,9 +4224,8 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Innstillinger"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4355,18 +4344,17 @@ msgstr "Veldig stor"
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4374,37 +4362,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4419,7 +4419,7 @@ msgstr "Ikontemaer"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Ikontema"
 
@@ -4487,7 +4487,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Språk"
 
@@ -4657,7 +4657,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Pekermargin ved autoscrolling"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Diverse alternativer"
 
@@ -4833,24 +4833,24 @@ msgstr "Pekerstørrelse"
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4867,7 +4867,7 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temaer"
 
@@ -4967,33 +4967,33 @@ msgstr "%1.0f samlinger"
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Tilbakestill"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5057,9 +5057,8 @@ msgid "%1.2f times"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Beholder %d"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
@@ -5130,9 +5129,8 @@ msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Oppstart"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5158,23 +5156,23 @@ msgstr "Oppstart"
 msgid "Theme Selector"
 msgstr "Endre skrivebordstema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Importer..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5227,38 +5225,38 @@ msgid "Wallpaper Settings"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Bilde..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Alle skrivebord"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Dette Skrivebordet"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5279,14 +5277,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr ""
 
@@ -5311,9 +5309,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Musepeker"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5352,40 +5349,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Velg et bilde..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5497,14 +5494,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Tastaturfokusinnstillinger"
@@ -5637,17 +5626,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Smart utvidelse"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Utvid vinduet"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Fyll tilgjengelig plass"
 
@@ -5655,19 +5639,19 @@ msgstr "Fyll tilgjengelig plass"
 msgid "Maximize Policy"
 msgstr "Metode for maksimering"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Begge"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5706,49 +5690,57 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Ingen navn>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Klasse:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Ingen klasse>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Tittel:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Ingen tittel>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Rolle:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Ingen rolle>"
 
@@ -6099,7 +6091,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Oppførsel"
 
@@ -6115,97 +6107,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Favoritter"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Ã…pne"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Ã…pne med..."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "(Ingen programmer)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Velg en"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6213,14 +6203,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Feilinformasjon"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Fil:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6232,16 +6221,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Egenskaper"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6279,19 +6268,19 @@ msgstr "Bakgrunn"
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Alltid på skrivebord"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6328,7 +6317,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -6387,43 +6376,43 @@ msgstr "Lag nytt ikon"
 msgid "Add Application"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Vis navn"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Vis tittel"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Vis klasse"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Vis ikonnavn"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -6443,11 +6432,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Listeinnstillinger"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6455,108 +6444,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Dra hele skrivebordet"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Knapp %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6680,7 +6669,7 @@ msgstr "%1.0f°F"
 msgid "%1.0f C"
 msgstr "%1.0f°C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatur"
 
@@ -6692,15 +6681,15 @@ msgstr "Neste"
 msgid "Welcome to Enlightenment"
 msgstr "Velkommen til Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Velg en"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6747,15 +6736,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Hurtigstart"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6877,26 +6866,56 @@ msgstr ""
 msgid "Networks"
 msgstr "Nettverk"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "System"
+msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Fil:"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Du har bedt Enlightenment huske egenskaper<br>(slik som størrelse, "
+#~ "posisjon, ramme etc.) for et vindu som <hilight>ikke har unike "
+#~ "egenskaper</hilight><br><br>Dette betyr det deler Navn/Klasse/Transience/"
+#~ "Rolle etc. egenskaper<br>med mer enn 1 annet vindu på skjermen og å "
+#~ "huske<br>egenskaper for vinduet vil berøre alle andre vinduer<br>som "
+#~ "samsvarer med disse egenskapene.<br><br>Du vil kanskje ønske å skru på "
+#~ "<hilight>Kun første vindu</hilight> opsjonen dersom<br>du bare har "
+#~ "intensjoner om at bare en instans av dette vinduet skal bli endret,"
+#~ "<br>med andre uendret.<br><br>Dette er bare en advarsel tilfelle du ikke "
+#~ "ville ha denne effekten.<br>Dersom du ville, bare press <hilight>Bruk</"
+#~ "hilight> eller <hilight>Ok</hilight> igjen,<br>og dine innstillinger vil "
+#~ "bli akseptert. Press <hilight>Avbryt</hilight> om du<br>ikke er sikker, "
+#~ "og ingenting vil bli påvirket."
+
+#~ msgid "Window name and class"
+#~ msgstr "Vinduets navn og klasse"
 
 #~ msgid "Configure"
 #~ msgstr "Konfigurér"
 
+#~ msgid "Expand the window"
+#~ msgstr "Utvid vinduet"
+
 #~ msgid "Configuration Upgraded"
 #~ msgstr "Konfigurasjonen er oppgradert"
 
@@ -6960,9 +6979,6 @@ msgstr "System"
 #~ msgid "Window"
 #~ msgstr "Vindu"
 
-#~ msgid "Window Name"
-#~ msgstr "Vindusnavn"
-
 #~ msgid "Window Title"
 #~ msgstr "Vindustittel"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 29c7b5e..e0ee2b5 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 127c02c..c5e5a17 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,42 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2005-12-16 10:48+0100\n"
-"Last-Translator: Niels Abspoel <niels.abspoel at wanadoo.nl>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-08-25 14:34+0000\n"
+"Last-Translator: Niels Abspoel <Unknown>\n"
 "Language-Team: Nederlands <nl 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\n"
+"X-Launchpad-Export-Date: 2009-08-27 10:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Over Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -51,15 +51,6 @@ 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, door het Enlightenment Ontwikkel Team.<br><br>We "
-"hopen dat je net zo veel plezier hebt in deze software als wij hadden in het "
-"schrijven ervan.<br><br>Deze software is zoals het is, zonder enige "
-"expliciete of impliciete garantie. Deze software wordt beheerd door licentie "
-"condities, lees alsjeblieft COPYING en COPYING-PLAIN licentie bestanden die "
-"geinstalleerd zijn op je systeem<br><br>Enlightenment is onder "
-"<hilight>HEVIGE ONTWIKKELING</hilight> en nog niet stabiel. Verschillende "
-"mogelijkheden zijn incompleet of nog niet bestaand en kunnen veel fouten "
-"hebben. Je bent dus <hilight>GEWAARSCHUWD!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -72,701 +63,622 @@ msgid ""
 "window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
 "you want to kill this window?"
 msgstr ""
+"Je staat op het punt om %s geforceerd te sluiten.<br><br>Bemerk dat alle "
+"data in dit venster,<br>die niet opgeslagen is, verloren zal gaan!"
+"<br><br>Ben je zeker dat je dit venster wilt forceren af te sluiten?"
 
 #: src/bin/e_actions.c:357
-#, fuzzy
 msgid "Are you sure you want to kill this window?"
-msgstr "Weet je zeker dat je wilt afsluiten?"
+msgstr "Ben je zeker dat je dit venster wilt forceren af te sluiten?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nee"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
 "afsluiten?"
 
-#: src/bin/e_actions.c:1867
-#, fuzzy
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
-msgstr "Weet je zeker dat je wilt afsluiten?"
+msgstr "Ben je zeker dat je wilt afmelden?"
 
-#: src/bin/e_actions.c:1869
-#, fuzzy
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
+"Je staat op het punt om af te melden.<br><br>Ben je zeker dat je dit wil "
+"doen?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
-#, fuzzy
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
-msgstr "Weet je zeker dat je wilt afsluiten?"
+msgstr "Ben je zeker dat je wil afsluiten?"
 
-#: src/bin/e_actions.c:1933
-#, fuzzy
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
+"Je hebt gevraagd om jouw computer uit te schakelen.<br><br>Ben je zeker dat "
+"je wilt afsluiten?"
 
-#: src/bin/e_actions.c:1995
-#, fuzzy
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
-msgstr "Weet je zeker dat je wilt afsluiten?"
+msgstr "Ben je zeker dat je wilt herstarten?"
 
-#: src/bin/e_actions.c:1997
-#, fuzzy
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
+"Je hebt gevraagd om jouw computer te herstarten.<br><br>Ben je zeker dat je "
+"wilt herstarten?"
 
-#: src/bin/e_actions.c:2061
-#, fuzzy
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
 
-#: src/bin/e_actions.c:2123
-#, fuzzy
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr "Weet je zeker dat je wilt afsluiten?"
+msgstr "Ben je zeker dat je in slaapstand wilt gaan?"
 
-#: src/bin/e_actions.c:2125
-#, fuzzy
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
+"Je hebt gevraagd om de computer in slaapstand te zetten.<br><br>Ben je zeker "
+"dat je alles op de schijf wilt bewaren?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
-#, fuzzy
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
-msgstr "Vensterraam selectie"
+msgstr "Venster: Acties"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
-#, fuzzy
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
-msgstr "Ik"
+msgstr "Verplaatsen"
 
-#: src/bin/e_actions.c:2470
-#, fuzzy
+#: src/bin/e_actions.c:2518
 msgid "Resize"
-msgstr "Weerstand"
+msgstr "Verander formaat"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
-#, fuzzy
 msgid "Menu"
-msgstr "Ik"
+msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
-#, fuzzy
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
-msgstr "Venster rol"
+msgstr "Venster menu"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
-msgstr ""
+msgstr "Verhoog"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
-#, fuzzy
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
-msgstr "Laag"
+msgstr "Verlaag"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Vernietigen"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
-#, fuzzy
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
-msgstr "Venster Naam"
+msgstr "Venster : Status"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
-#, fuzzy
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
-msgstr "Volledig Scherm"
+msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximaliseer"
 
-#: src/bin/e_actions.c:2532
-#, fuzzy
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
-msgstr "Maximaliseer Verticaal"
+msgstr "Verticaal maximaliseren"
 
-#: src/bin/e_actions.c:2535
-#, fuzzy
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
-msgstr "Maximaliseer Horizontaal"
+msgstr "Horizontaal maximaliseren"
 
-#: src/bin/e_actions.c:2538
-#, fuzzy
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
-msgstr "Volledig Scherm"
+msgstr "Maximaliseer over het volledig scherm"
 
-#: src/bin/e_actions.c:2540
-#, fuzzy
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
-msgstr "Maximaliseren"
+msgstr "Maximaliseer mode \"Slim\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
-msgstr ""
+msgstr "Maximaliseer mode \"Vergroot\""
 
-#: src/bin/e_actions.c:2544
-#, fuzzy
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
-msgstr "Maximaliseer beleid"
+msgstr "Maximaliseer mode \"Vul\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
-#, fuzzy
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
-msgstr "Raamloos"
+msgstr ""
 
-#: src/bin/e_actions.c:2571
-#, fuzzy
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
-msgstr "Raamloos"
+msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: src/bin/e_actions.c:2576
-#, fuzzy
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
-msgstr "Bureaubladnaam"
+msgstr "Draai Bureaublad Links"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
-msgstr ""
+msgstr "Draai Bureaublad Rechts"
 
-#: src/bin/e_actions.c:2580
-#, fuzzy
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
-msgstr "Bureaublad"
+msgstr "Draai Bureaublad Boven"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
-msgstr ""
+msgstr "Draai Bureaublad Onder"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
-msgstr ""
+msgstr "Draai Bureaublad met..."
 
-#: src/bin/e_actions.c:2590
-#, fuzzy
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
-msgstr "Stuur naar bureaublad"
+msgstr "Bureaublad Weergeven"
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
-msgstr ""
+msgstr "Draai Bureaublad naar..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
-msgstr ""
+msgstr "Draai Bureaublad Lineair..."
 
-#: src/bin/e_actions.c:2612
-#, fuzzy
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 0"
 
-#: src/bin/e_actions.c:2614
-#, fuzzy
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 1"
 
-#: src/bin/e_actions.c:2616
-#, fuzzy
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 2"
 
-#: src/bin/e_actions.c:2618
-#, fuzzy
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 3"
 
-#: src/bin/e_actions.c:2620
-#, fuzzy
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 4"
 
-#: src/bin/e_actions.c:2622
-#, fuzzy
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 5"
 
-#: src/bin/e_actions.c:2624
-#, fuzzy
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 6"
 
-#: src/bin/e_actions.c:2626
-#, fuzzy
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 7"
 
-#: src/bin/e_actions.c:2628
-#, fuzzy
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 8"
 
-#: src/bin/e_actions.c:2630
-#, fuzzy
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 9"
 
-#: src/bin/e_actions.c:2632
-#, fuzzy
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 10"
 
-#: src/bin/e_actions.c:2634
-#, fuzzy
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 11"
 
-#: src/bin/e_actions.c:2636
-#, fuzzy
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad..."
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Bureaubladnaam"
+msgstr "Draai Bureaublad Links (Alle Schermen)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr ""
+msgstr "Draai Bureaublad Rechts (Alle Schermen)"
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Bureaublad"
+msgstr "Draai Bureaublad Boven (Alle Schermen)"
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Wissel bureaubladen als muis bij schermrand is"
+msgstr "Draai Bureaublad Onder (Alle Schermen)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr ""
+msgstr "Draai Bureaublad Met... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr ""
+msgstr "Draai Bureaublad naar... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr ""
+msgstr "Draai Bureaublad Lineair... (Alle Schermen)"
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Bureaubladnaam"
+msgstr "Draai Bureaublad in richting..."
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 0 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 1 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 2 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 3 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 4 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 5 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 6 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 7 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 8 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 9 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 10 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad 11 (Alle Schermen)"
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Stuur naar bureaublad"
+msgstr "Wissel Naar Bureaublad...  (Alle Schermen)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
-msgstr "Scherm zone"
+msgstr "Scherm"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
-msgstr ""
+msgstr "Zend Muis Naar Scherm 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
-msgstr ""
+msgstr "Zend Muis Naar Scherm 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
-msgstr ""
+msgstr "Zend Muis Naar Scherm..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
-msgstr ""
+msgstr "Zend Muis 1 Scherm Verder"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
-msgstr ""
+msgstr "Zend Muis 1 Scherm Terug"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
-msgstr ""
+msgstr "Zend Muis Scherm Verder/Terug..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
-#, fuzzy
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
-msgstr "Venster Schaduwen"
+msgstr "Venster : Verplaatsen"
 
-#: src/bin/e_actions.c:2755
-#, fuzzy
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
-msgstr "Stuur naar bureaublad"
+msgstr "Naar Volgend Bureaublad"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
-msgstr ""
+msgstr "Naar Vorig Bureaublad"
 
-#: src/bin/e_actions.c:2759
-#, fuzzy
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr "Bureaublad"
+msgstr "Per Bureaublad #..."
 
-#: src/bin/e_actions.c:2765
-#, fuzzy
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
-msgstr "Bureaublad"
+msgstr "Naar Bureaublad..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
-msgstr ""
+msgstr "Hoofdmenu weergeven"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
-msgstr ""
+msgstr "Favorietenmenu Weergeven"
 
-#: src/bin/e_actions.c:2775
-#, fuzzy
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
-msgstr "(Geen toepassingen)"
+msgstr "Alle Applicatiesmenu Weergeven"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
-msgstr ""
+msgstr "Clientmenu Weergeven"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
-msgstr ""
+msgstr "Weergeven van Menu..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
-msgstr ""
+msgstr "Uitvoeren"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
-#, fuzzy
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
-msgstr "Commando Uitvoeren"
+msgstr "Commando"
 
-#: src/bin/e_actions.c:2791
-#, fuzzy
+#: src/bin/e_actions.c:2840
 msgid "Application"
-msgstr "(Geen toepassingen)"
+msgstr "Applicatie"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
-msgstr ""
+msgstr "Herstarten"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
-#, fuzzy
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
-msgstr "Wacht Sluiten"
+msgstr "Afsluiten"
 
-#: src/bin/e_actions.c:2803
-#, fuzzy
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr "Wacht Sluiten"
+msgstr "Nu Afsluiten"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Enlightenment %s Module"
+msgstr "Enlightenment : Modus"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Volledig Scherm"
+msgstr ""
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Volledig Scherm"
+msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
-msgstr ""
+msgstr "Systeem"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
-msgstr ""
+msgstr "Afmelden"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
-msgstr ""
+msgstr "Nu Uitschakelen"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
-msgstr ""
+msgstr "Uitschakelen"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
-msgstr ""
+msgstr "Herstarten"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
-msgstr ""
+msgstr "Stand-by stand"
 
-#: src/bin/e_actions.c:2837
-#, fuzzy
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
-msgstr "Lineair"
+msgstr "Slaapstand"
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "Sloten"
+msgstr "Vergrendelen"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Vensters Opruimen"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Vensterraam selectie"
+msgstr "Generiek : Acties"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "Modules"
+msgstr "Uitgestelde Acties"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
-#, fuzzy
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr "Achtergrond instellingen"
+msgstr "Als Achtergrond Instellen"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
-msgstr ""
+msgstr "Scan van bureaubladbestanden voltooid"
 
-#: src/bin/e_border.c:5070
-#, fuzzy
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr "Bureaublad"
+msgstr "Scan van bureaubladbestanden"
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
-msgstr ""
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "Kleurenkiezer"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
-#, fuzzy
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -776,17 +688,8 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Configuratie data moest worden vernieuwd. Je oude configuratie\n"
-"is gewist en de nieuwe standaard instellingen opgestart. Dit\n"
-"gebeurd regelmatig gedurende de ontwikkeling, dus rapporteer dit\n"
-"niet als een bug. Dit houdt simpelweg in dat Enlightenment nieuwe\n"
-"instellingen nodig had om de nieuwe functie bruikbaar te maken, die je\n"
-"oude configuratie miste. Deze nieuwe standaard instellingen zullen\n"
-"dit maken. Je kan nu alles weer opnieuw instellen zoals jij het wilt.\n"
-"Het spijt ons voor deze onderbreking van je instellingen.\n"
 
-#: src/bin/e_config.c:775
-#, fuzzy
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -794,19 +697,12 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Je configuratie is NIEUWER dan Enlightenment. Dit is heel\n"
-"raar. Het zou niet mogen gebeuren behalve als je Enlightenment\n"
-"terugrolde of je configuratie gekopieerd hebt van een plek waar een\n"
-"nieuwere versie van Enlightenment liep. Dit is slecht en\n"
-"als een voorzorgsmaatregel word je configuratie nu teruggezet naar\n"
-"de standaard instellingen. Excuses voor het ongemak.\n"
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "Icon Instellingen"
+msgstr "Instellingen geupgrade"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -814,7 +710,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -824,7 +720,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -833,7 +729,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -842,7 +738,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -850,27 +746,24 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Enlightenment Configuratie"
+msgstr "Enlightenment Instellingen Schrijfproblemen"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
-#, fuzzy
 msgid "Advanced"
-msgstr "Geavanceerde instellingen"
+msgstr "Geavanceerd"
 
-#: src/bin/e_config_dialog.c:234
-#, fuzzy
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
-msgstr "Basis informatie"
+msgstr "Eenvoudig"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -878,48 +771,50 @@ msgstr "Toepassen"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Modules"
 
 #: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
 #: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
 msgid "Extensions"
-msgstr ""
+msgstr "Extensies"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Container %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
-msgstr ""
+msgstr "Fout - Geen PAM ondersteuning"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
+"Geen PAM ondersteuning is in Enlightenment ingebouwd,<br>dus "
+"bureaubladvergrendeling is uitgeschakeld."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
-msgstr ""
+msgstr "Vergrendeling Mislukt"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
-msgstr ""
+msgstr "Geef aub jouw ontgrendlingswachtwoord in"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
-msgstr ""
+msgstr "Authenticatiesysteem Foutmelding"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -927,28 +822,28 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Presentatiemode activeren?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Neen, maar vergroot timeout"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Neen, en stop met vragen"
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
-msgstr ""
+msgstr "Incomplete Venstereigenschappen"
 
 #: src/bin/e_eap_editor.c:159
 msgid ""
@@ -963,7 +858,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -976,9 +871,8 @@ msgstr "Basis informatie"
 
 #: src/bin/e_eap_editor.c:473 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:911
-#, fuzzy
 msgid "Name"
-msgstr "Bij Naam"
+msgstr "Naam"
 
 #: src/bin/e_eap_editor.c:479
 msgid "Executable"
@@ -993,9 +887,8 @@ msgid "General"
 msgstr "Algemeen"
 
 #: src/bin/e_eap_editor.c:515
-#, fuzzy
 msgid "Generic Name"
-msgstr "Algemene info"
+msgstr "Generieke Naam"
 
 #: src/bin/e_eap_editor.c:520
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:105
@@ -1004,16 +897,15 @@ msgstr "Venster Klasse"
 
 #: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 #: src/bin/e_eap_editor.c:528
 msgid "Mime Types"
-msgstr ""
+msgstr "Mimetypen"
 
-#: src/bin/e_eap_editor.c:534
-#, fuzzy
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr "Uitgebreide Opties"
+msgstr "Opties"
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
@@ -1021,571 +913,529 @@ msgstr "Opstart Melding"
 
 #: src/bin/e_eap_editor.c:537
 msgid "Run in Terminal"
-msgstr ""
+msgstr "Uitvoeren in terminal"
 
 #: src/bin/e_eap_editor.c:539
-#, fuzzy
 msgid "Show in Menus"
-msgstr "Algemene info"
+msgstr "Weergeven in Menus"
 
 #: src/bin/e_eap_editor.c:543
-#, fuzzy
 msgid "Desktop file"
-msgstr "Bureaublad Muis Wissel"
+msgstr "Desktopbestand"
 
 #: src/bin/e_eap_editor.c:544
-#, fuzzy
 msgid "Filename"
-msgstr "Hernoem"
+msgstr "Bestandsnaam"
 
 #: src/bin/e_eap_editor.c:573
-#, fuzzy
 msgid "Select an Icon"
-msgstr "Selecteer een venster"
+msgstr "Selecteer een Icoon"
 
 #: src/bin/e_eap_editor.c:642
-#, fuzzy
 msgid "Select an Executable"
-msgstr "Uitvoerbaar"
+msgstr "Selecteer een Uitvoerbaar bestand"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Wis"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
-#, fuzzy
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
-msgstr "knip"
+msgstr "Knippen"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopieer"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
-#, fuzzy
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
-msgstr "Snel"
+msgstr "Plakken"
 
 #: src/bin/e_entry.c:529
-#, fuzzy
 msgid "Select All"
-msgstr "Wis"
+msgstr "Alles selecteren"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Start Fout"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
-#, fuzzy, c-format
+#, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr ""
-"Enlightenment was niet in staat het child proces te splitsen:\n"
-"\n"
-"%s\n"
-"\n"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr ""
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr ""
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr ""
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
-#, fuzzy
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
-msgstr "Fout"
+msgstr ""
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr ""
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr ""
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
-#, fuzzy
+#: src/bin/e_exec.c:670
 msgid "Error Information"
-msgstr "Display informatie"
+msgstr ""
 
-#: src/bin/e_exec.c:645
-#, fuzzy
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
-msgstr "Display informatie"
+msgstr ""
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr ""
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr ""
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Start Fout"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Start Fout"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Fout"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
-#, fuzzy, c-format
+#: src/bin/e_fm.c:3685
+#, c-format
 msgid "%i Files"
-msgstr "Bestanden"
+msgstr ""
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr "Lineair"
+msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "Over..."
+msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
-#, fuzzy
 msgid "View Mode"
-msgstr "Bewerkmodus"
+msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
-#, fuzzy
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
-msgstr "Ververs"
+msgstr ""
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
-#, fuzzy
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
-msgstr "Onthouden gebruiken"
+msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
-#, fuzzy
 msgid "New Directory"
-msgstr "Map"
+msgstr ""
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Hernoem"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Test Menu Item"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
-#, fuzzy
+#: src/bin/e_fm.c:8090
 msgid "Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr "Details"
+msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
-#, fuzzy
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "Iconen"
+msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
-#, fuzzy
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "Automatisch passende Iconen"
+msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
-#, fuzzy
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
-msgstr "Vensterlijst overslaan"
+msgstr ""
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Icon Grote"
+msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Achtergrond instellingen"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
-msgstr "Dichtbij"
+msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
-#, fuzzy
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
-msgstr "Map"
+msgstr ""
 
-#: src/bin/e_fm.c:8858
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8821
+#, c-format
 msgid "Rename %s to:"
-msgstr "Hernoem"
+msgstr ""
 
-#: src/bin/e_fm.c:8860
-#, fuzzy
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
-msgstr "Hernoem"
+msgstr ""
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Fout"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "%s starten"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
-#, fuzzy
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
-msgstr "Bevestig"
+msgstr ""
 
-#: src/bin/e_fm.c:9297
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9260
+#, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
-msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:9303
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9266
+#, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
-msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
+msgstr ""
 
 #: src/bin/e_fm_prop.c:108
-#, fuzzy
 msgid "File Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Grote:"
 
-#: src/bin/e_fm_prop.c:352
-#, fuzzy
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
-msgstr "Laatst Aangepast:"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:359
-#, fuzzy
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
-msgstr "Bestand:"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:366
-#, fuzzy
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
-msgstr "Toestemmingen:"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
-#, fuzzy
 msgid "Default"
-msgstr "Details"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
-#, fuzzy
 msgid "Custom"
-msgstr "knip"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
-#, fuzzy
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr "Display informatie"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
-#, fuzzy
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
-msgstr "Selecteer een venster"
+msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
-#, fuzzy
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
-msgstr "Iconen"
+msgstr ""
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1595,7 +1445,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Venster vergrendeling"
 
@@ -1630,21 +1480,21 @@ msgid "Lock program changing:"
 msgstr "Vergrendel programma verandering:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Positie"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Grote"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Gestapeld"
 
@@ -1653,12 +1503,12 @@ msgid "Iconified state"
 msgstr "Geminimaliseerde staat"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Vastzetten"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Ingeklapt"
 
@@ -1667,7 +1517,7 @@ msgid "Maximized state"
 msgstr "Maximaliseren"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Volledig Scherm"
 
@@ -1675,7 +1525,7 @@ msgstr "Volledig Scherm"
 msgid "Lock me from changing:"
 msgstr "Sluit mij uit van verandering:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Vensterraam stijl"
 
@@ -1700,9 +1550,8 @@ msgid "Edit Icon"
 msgstr "Icon bewerken"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1713,137 +1562,127 @@ msgid "Send to Desktop"
 msgstr "Stuur naar bureaublad"
 
 #: src/bin/e_int_border_menu.c:111
-#, fuzzy
 msgid "Pin to Desktop"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:122
-#, fuzzy
 msgid "Unpin from Desktop"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:131
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimaliseren"
 
-#: src/bin/e_int_border_menu.c:362
-#, fuzzy
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
-msgstr "Maximaliseer Verticaal"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:373
-#, fuzzy
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
-msgstr "Maximaliseer Horizontaal"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:384
-#, fuzzy
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
-msgstr "Maximaliseer"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
-#, fuzzy
 msgid "Border"
-msgstr "Ramen"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Onthouden"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
-#, fuzzy
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Altijd op Voorgrond"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Altijd op Achtergrond"
 
-#: src/bin/e_int_border_menu.c:922
-#, fuzzy
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
-msgstr "Vensterraam stijl"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
-#, fuzzy
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Ingeklapt"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Vastgezet"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Volledig Scherm"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
-msgstr "Vensterlijst overslaan"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
-msgstr "Gevaar"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1856,23 +1695,20 @@ msgid "ICCCM"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:418
-#, fuzzy
 msgid "ICCCM Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titel"
 
 #: src/bin/e_int_border_prop.c:421
-#, fuzzy
 msgid "Class"
-msgstr "Icon Klasse"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
-#, fuzzy
 msgid "Icon Name"
-msgstr "Icon Grote"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
@@ -1883,19 +1719,16 @@ msgid "Role"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:426
-#, fuzzy
 msgid "Minimum Size"
-msgstr "Minimum snelheid"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:427
-#, fuzzy
 msgid "Maximum Size"
-msgstr "Maximaliseer"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:428
-#, fuzzy
 msgid "Base Size"
-msgstr "Grote"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:429
 msgid "Resize Steps"
@@ -1906,24 +1739,20 @@ msgid "Aspect Ratio"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:432
-#, fuzzy
 msgid "Initial State"
-msgstr "Geminimaliseerde staat"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:434
-#, fuzzy
 msgid "Window ID"
-msgstr "Venster"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:435
-#, fuzzy
 msgid "Window Group"
-msgstr "Venster type"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:436
-#, fuzzy
 msgid "Transient For"
-msgstr "Doorlopendheid"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
@@ -1934,9 +1763,8 @@ msgid "Gravity"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:441
-#, fuzzy
 msgid "Take Focus"
-msgstr "Activeren"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:442
 msgid "Accepts Focus"
@@ -1947,47 +1775,42 @@ msgid "Urgent"
 msgstr ""
 
 #: src/bin/e_int_border_prop.c:444
-#, fuzzy
 msgid "Request Delete"
-msgstr "Wis"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:445
-#, fuzzy
 msgid "Request Position"
-msgstr "Positie"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:466
-#, fuzzy
 msgid "NetWM Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:471
-#, fuzzy
 msgid "Modal"
-msgstr "Modules"
+msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
-#, fuzzy
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Venster Onthouden"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Venster eigenschappen zijn geen unieke match"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -2012,11 +1835,11 @@ msgstr ""
 "Druk <hilight>Annuleer</hilight> als je<br>niet zeker bent en niets "
 "veranderd."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Geen match eigenschappen ingesteld"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -2028,107 +1851,94 @@ msgstr ""
 "op<br>een venster<hilight>zonder aan te geven wat</hilight>.<br><br>Geef "
 "alsjeblieft 1 manier aan hoe dit venster herinnerd moet worden"
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Je probeert Enlightenment het toepassen van eigenschappen <br> (zoals grote, "
-"locatie, raam stijl, etc) op <br> een venster dat <hilight>geen unieke "
-"eigenschappen</hilight> heeft te herinneren<br><br>Dit betekent dat het Naam/"
-"klasse, Doorlopendheid, Rol, etc. eigenschappen deelt met<br>met meer dan 1 "
-"ander venster op het scherm en het herinneren<br>van deze eigenschappen zal "
-"dan op alle vensters van toepassing zijn<br>die overeenkomen hiermee."
-"<br><br>Je kan <hilight>Match alleen dit Venster</hilight> optie aanzetten "
-"als<br> je alleen deze versie van dit venster wilt aanpassen<br>andere "
-"versies zullen niet aangepast worden<br><br>Dit is een waarschuwing voor als "
-"je niet wilt dat dit gebeurt.<br>Als dit wel de bedoeling is druk "
-"op<hilight>Toepassen</hilight> of <hilight>OK</hilight> knoppen<br>en je  "
-"instellingen worden geaccepteerd. Druk  <hilight>Annuleer</hilight>als "
-"je<br>niet zeker  bent  en niets wilt veranderd."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Niets"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Grote en Positie"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Sloten"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Grote, Positie en Sloten"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Alles"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Onthouden gebruiken"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Venster naam en klasse"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Venster Naam"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Venster Klasse"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Venster rol"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Venster type"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Doorlopendheid"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Eigenschappen om te onthouden"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtueel bureaublad"
 
-#: src/bin/e_int_border_remember.c:531
-#, fuzzy
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
-msgstr "Scherm zone"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Vensterlijst overslaan"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Match alleen een venster"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
-msgid "Always focus on start"
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
 msgstr ""
 
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
@@ -2137,51 +1947,43 @@ msgstr ""
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 #: src/modules/wizard/page_050.c:26
-#, fuzzy
 msgid "File Manager"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:44
-#, fuzzy
 msgid "Shelf"
-msgstr "Thema's"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:120
-#, fuzzy
 msgid "Module Settings"
-msgstr "Activerings Instellingen"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:181
-#, fuzzy
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
-msgstr "Favoriete Programma's"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
-#, fuzzy
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
-msgstr "(Geen Geladen Modules)"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
-#, fuzzy
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
-msgstr "(Geen Geladen Modules)"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
-#, fuzzy
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
-msgstr "Klok Module"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2200,27 +2002,23 @@ msgid "Available Gadgets"
 msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
-#, fuzzy
 msgid "Add Gadget"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:133
-#, fuzzy
 msgid "Selected Gadgets"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:140
-#, fuzzy
 msgid "Remove Gadget"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2229,35 +2027,27 @@ msgid "Input Method Error"
 msgstr "Invoeg Methode Fout"
 
 #: src/bin/e_intl.c:362
-#, fuzzy
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
 "configuration's<br>executable is in your PATH<br>"
 msgstr ""
-"Fout bij het starten van de invoeg methode starter\n"
-"\n"
-"Controleer alsjeblieft dat de invoeg\n"
-"methode instellingen correct zijn en\n"
-"dat jou instellingen starter in PATH is\n"
 
 #: src/bin/e_int_menus.c:89
-#, fuzzy
 msgid "Main"
-msgstr "Handmatig"
+msgstr ""
 
 #: src/bin/e_int_menus.c:106
 msgid "Favorite Applications"
 msgstr "Favoriete Programma's"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2266,33 +2056,29 @@ msgstr "(Geen toepassingen)"
 msgid "Windows"
 msgstr "Vensters"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Verloren Vensters"
 
 #: src/bin/e_int_menus.c:170
-#, fuzzy
 msgid "About"
-msgstr "Over..."
+msgstr ""
 
 #: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
 #: src/modules/conf_theme/e_mod_main.c:40
 #: src/modules/conf_theme/e_mod_main.c:84
-#, fuzzy
 msgid "Theme"
-msgstr "Thema's"
+msgstr ""
 
 #: src/bin/e_int_menus.c:262
-#, fuzzy
 msgid "Virtual"
-msgstr "Virtueel bureaublad"
+msgstr ""
 
 #: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
 #: src/modules/conf_shelves/e_mod_main.c:41
 #: src/modules/conf_shelves/e_mod_main.c:85
-#, fuzzy
 msgid "Shelves"
-msgstr "Thema's"
+msgstr ""
 
 #: src/bin/e_int_menus.c:278
 msgid "Show/Hide All Windows"
@@ -2303,146 +2089,133 @@ msgid "(No Applications)"
 msgstr "(Geen toepassingen)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Virtueel bureaublad"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Geen Vensters)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Geen naam!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
-#, fuzzy
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
-msgstr "Wis"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
-#, fuzzy
 msgid "Shelf Settings"
-msgstr "Andere Instellingen"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Klein"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Middel"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Groot"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
-msgstr "Alles"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:579
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
-msgstr "(Geen Vensters)"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:581
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
-msgstr "Alles"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:583
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
-msgstr "Volg de vensters als het beweegt"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
-#, fuzzy, c-format
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
 msgid "%3.0f pixels"
-msgstr "%1.0f pixels"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr "Auto omhoog halen"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
-msgstr "Scherm zone"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
-#, fuzzy, c-format
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
 msgid "%.1f seconds"
-msgstr "%1.1f seconds"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
-msgstr "Configuratie"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2465,7 +2238,7 @@ msgid ""
 msgstr ""
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2492,23 +2265,6 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Opties:\n"
-"\t-display DISPLAY\n"
-"\t\tMet Beeldscherm DISPLAY verbinden.\n"
-"\t\tEG: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tEen nep Xinerama Beeldscherm met de aangegeven Geometrie word\n"
-"\t\tbijgevoegd. U kunt er zoveel bijvoegen als u wilt; elke\n"
-"\t\tvervangt een echt Xinerama-Beeldscherm (ipv. de echte).\n"
-"\t\tHierdoor kunt u. Xinerama nabootsen.\n"
-"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
-"+0\n"
-"\t-Goed\n"
-"\t\tBen Goed.\n"
-"\t-Slecht\n"
-"\t\tBen Slecht.\n"
-"\t-Psychotisch\n"
-"\t\tBen psychotisch.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2591,35 +2347,24 @@ msgstr ""
 "Misschien heeft u niet genoeg vrij geheugen?"
 
 #: src/bin/e_main.c:515
-#, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software X11\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
-"Enlightenment vond geen ecore_evas ondersteuning voor Software X11\n"
-"rendering in Evas. Controleer je installatie van Evas en\n"
-"Ecore op de ondersteuning van Software X11 rendering."
 
 #: src/bin/e_main.c:522
-#, fuzzy
 msgid ""
 "Enlightenment found ecore_evas doesn't support the Software Buffer\n"
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
-"Enlightenment vond geen ecore_evas ondersteuning voor Software X11\n"
-"rendering in Evas. Controleer je installatie van Evas en\n"
-"Ecore op de ondersteuning van Software X11 rendering."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
-#, fuzzy
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment kan het Bestand-systeem niet initialiseren.\n"
-"Misschien heeft u niet genoeg vrij geheugen?"
 
 #: src/bin/e_main.c:559
 msgid ""
@@ -2630,23 +2375,20 @@ msgstr ""
 "Misschien heeft u geen Home-map, of de Harde Schijf is vol?"
 
 #: src/bin/e_main.c:569
-#, fuzzy
 msgid "Enlightenment cannot set up its file registry system."
-msgstr "Enlightenment kan zijn Configuratie-systeem niet initialiseren."
+msgstr ""
 
 #: src/bin/e_main.c:578
 msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment kan zijn Configuratie-systeem niet initialiseren."
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment kan zijn thema systeem niet initialiseren."
+msgstr ""
 
 #: src/bin/e_main.c:600
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment kan het intl systeem niet instellen"
+msgstr ""
 
 #: src/bin/e_main.c:609
 msgid ""
@@ -2672,7 +2414,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan het intl systeem niet instellen"
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2680,47 +2422,46 @@ msgstr ""
 "Enlightenment kan het Startscherm niet initialiseren.\n"
 "Misschien heeft u niet genoeg geheugen?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
-#, fuzzy
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
-msgstr "Scherm zone"
+msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2728,214 +2469,191 @@ msgstr ""
 "Enlightenment kon zich voor geen enkel Beeldscherm als Window Manager\n"
 "aanbieden. Misschien loopt er al een andere Window Manager?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
-#, fuzzy
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr "Enlightenment kan de Bestandsbeheerder niet initialiseren.\n"
+msgstr ""
 
-#: src/bin/e_main.c:752
-#, fuzzy
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
-#: src/bin/e_main.c:757
-#, fuzzy
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr "Enlightenment kan het dnd systeem niet instellen"
+msgstr ""
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
-#, fuzzy
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
-msgstr "Regelaar instellen"
+msgstr ""
 
-#: src/bin/e_main.c:792
-#, fuzzy
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr "Enlightenment kan zijn Thumbnailing systeem niet instellen\n"
+msgstr ""
 
-#: src/bin/e_main.c:797
-#, fuzzy
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
-msgstr "Modules"
+msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kan zijn actie systeem niet instellen."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
-#, fuzzy
-msgid "Enlightenment cannot set up its exec system."
-msgstr "Enlightenment kan zijn thema systeem niet initialiseren."
-
 #: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Onthouden"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment kan zijn herinneringinstellingen niet initialiseren."
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan de Bestandsbeheerder niet initialiseren.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan het msg systeem niet instellen"
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan het dnd systeem niet instellen"
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment kan zijn input grab handling systeem niet initialiseren."
 
-#: src/bin/e_main.c:879
-#, fuzzy
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
-msgstr "Modules"
+msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan zijn Module-Subsysteem niet initialiseren."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
-#, fuzzy
-msgid "Setup Color Classes"
-msgstr "Icon Klasse"
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment kan zijn herinneringinstellingen niet initialiseren."
 
 #: src/bin/e_main.c:894
-#, fuzzy
-msgid "Enlightenment cannot set up its color class system."
-msgstr "Enlightenment kan zijn actie systeem niet instellen."
+msgid "Setup Color Classes"
+msgstr ""
 
 #: src/bin/e_main.c:899
-#, fuzzy
-msgid "Setup Gadcon"
-msgstr "Selecteer een venster"
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
 
 #: src/bin/e_main.c:904
-#, fuzzy
-msgid "Enlightenment cannot set up its gadget control system."
-msgstr "Enlightenment kan zijn Font-Subsysteem niet initialiseren."
+msgid "Setup Gadcon"
+msgstr ""
 
 #: src/bin/e_main.c:909
-msgid "Setup DPMS"
+msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 
 #: src/bin/e_main.c:914
-#, fuzzy
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
-msgstr "Enlightenment kan zijn herinneringinstellingen niet initialiseren."
+msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment kan het popup systeem niet instellen."
+msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
-#, fuzzy
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr "Enlightenment kan het dnd systeem niet instellen"
+msgstr ""
 
-#: src/bin/e_main.c:937
-#, fuzzy
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
-msgstr "Wis"
+msgstr ""
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment kan zijn herinneringinstellingen niet initialiseren."
+msgstr ""
 
-#: src/bin/e_main.c:947
-#, fuzzy
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kan het bindings systeem niet instellen."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan het popup systeem niet instellen."
 
-#: src/bin/e_main.c:967
-#, fuzzy
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
-msgstr "Thema's"
+msgstr ""
 
-#: src/bin/e_main.c:972
-#, fuzzy
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
-msgstr "Enlightenment kan zijn thema systeem niet initialiseren."
+msgstr ""
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kan zijn Thumbnailing systeem niet instellen\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
-#, fuzzy
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
-msgstr "Enlightenment kan zijn Module-Subsysteem niet initialiseren."
+msgstr ""
 
-#: src/bin/e_main.c:1026
-#, fuzzy
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
-msgstr "(Geen Geladen Modules)"
+msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2943,11 +2661,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2955,16 +2673,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
-#, fuzzy
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
-msgstr "Bevestig"
+msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2973,11 +2690,11 @@ msgstr ""
 "Bij het Laden van Module %s is een Fout opgetreden.<br>Er was geen Module "
 "met de Naam %s in de<br>Module-map gevonden.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Fout bij het Laden van de Module"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2987,11 +2704,11 @@ msgstr ""
 "naar de Module is:\n"
 "%s<br>De gemelde fout was:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr ""
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3002,12 +2719,12 @@ msgstr ""
 "minimum versie van Module API nodig van %i.<br>De module API die "
 "Enlightenment aangeeft is:  %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Module"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Wil je deze module ontladen?<br>"
 
@@ -3018,41 +2735,35 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
-#, fuzzy
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
-msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
+msgstr ""
 
-#: src/bin/e_shelf.c:1273
-#, fuzzy
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Thema's"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
 #: src/bin/e_startup.c:66
-#, fuzzy
 msgid "Starting"
-msgstr "%s starten"
+msgstr ""
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
@@ -3063,243 +2774,225 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
-#, fuzzy
+#: src/bin/e_sys.c:321
 msgid "Logout now"
-msgstr "Verloren Vensters"
+msgstr ""
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
-#, fuzzy
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
-msgstr "Annuleer"
+msgstr ""
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
-#, fuzzy
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
-msgstr "Kan niet verwijderen <br><b>%s</b>"
+msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
-#, fuzzy
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
-msgstr "Enlightenment kan zijn thema systeem niet initialiseren."
+msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "Bureaublad Muis Wissel"
+msgstr ""
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
-#, fuzzy
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Kan niet verwijderen <br><b>%s</b>"
+msgstr ""
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
-#: src/bin/e_sys.c:565
-#, fuzzy
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Kan niet verwijderen <br><b>%s</b>"
+msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
-#, fuzzy
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Kan niet verwijderen <br><b>%s</b>"
+msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "Over dit Thema"
+msgstr ""
 
 #: src/bin/e_theme.c:42
-#, fuzzy
 msgid "Set As Theme"
-msgstr "Over dit Thema"
+msgstr ""
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Configuratie"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Kan niet afsluiten - onsterfelijke vensters."
 
-#: src/bin/e_utils.c:247
-#, fuzzy
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
-"Er zijn nog vensters met de Levensloop vergrending aan. Dit houdt in\n"
-"dat Enlightenment zichzelf niet uit kan zetten zonder dat deze vensters\n"
-"gesloten zijn of de levensloop vergrendeling eraf is.\n"
 
-#: src/bin/e_utils.c:811
-#, fuzzy, c-format
+#: src/bin/e_utils.c:804
+#, c-format
 msgid "%'.0f Bytes"
-msgstr "%1.0f van minuten"
+msgstr ""
 
-#: src/bin/e_utils.c:815
-#, fuzzy, c-format
+#: src/bin/e_utils.c:808
+#, c-format
 msgid "%'.0f KB"
-msgstr "%1.0f F"
+msgstr ""
 
-#: src/bin/e_utils.c:819
-#, fuzzy, c-format
+#: src/bin/e_utils.c:812
+#, c-format
 msgid "%'.0f MB"
-msgstr "%1.0f F"
+msgstr ""
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr ""
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
 msgstr ""
 
 #: src/bin/e_widget_config_list.c:69
-#, fuzzy
 msgid "Remove"
-msgstr "Hernoem"
+msgstr ""
 
 #: src/bin/e_widget_config_list.c:83
 #: src/modules/conf_applications/e_int_config_apps.c:258
@@ -3311,60 +3004,57 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
-#, fuzzy
 msgid "Go up a Directory"
-msgstr "Map"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Toestemmingen:"
 
-#: src/bin/e_widget_fsel.c:376
-#, fuzzy
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
-msgstr "Laatst Aangepast:"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
-#, fuzzy, c-format
+#: src/bin/e_widget_fsel.c:663
+#, c-format
 msgid "Protected"
-msgstr "Eigenschappen"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
-#, fuzzy, c-format
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
+#, c-format
 msgid "Read Only"
-msgstr "Alleen Naam"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Enlightenment Configuratie"
+msgstr ""
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3374,128 +3064,118 @@ msgstr "basisinstellingen"
 msgid "Show alert when battery is low"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Opvraag interval"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f pixels"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "%1.0f van minuten"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%1.0f"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f sec"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "Versnelling"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "Auto omhoog halen"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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 "Algemeen"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
 #: src/modules/battery/e_mod_main.c:135
-#, fuzzy
 msgid "Battery"
-msgstr "Batterij Module"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
-msgstr "Batterij Module"
+msgstr ""
 
 #: src/modules/clock/e_mod_main.c:98
-#, fuzzy
 msgid "Clock"
-msgstr "Sluiten"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "Icon Instellingen"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Modules"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3505,42 +3185,35 @@ msgstr ""
 #: src/modules/conf_applications/e_int_config_apps.c:104
 #: src/modules/conf_applications/e_int_config_apps.c:119
 #: src/modules/conf_applications/e_mod_main.c:36
-#, fuzzy
 msgid "IBar Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:135
 #: src/modules/conf_applications/e_mod_main.c:38
-#, fuzzy
 msgid "Startup Applications"
-msgstr "Favoriete Programma's"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:151
 #: src/modules/conf_applications/e_mod_main.c:37
-#, fuzzy
 msgid "Restart Applications"
-msgstr "Favoriete Programma's"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
-#, fuzzy
 msgid "Selected Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Toepassen"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:35
-#, fuzzy
 msgid "New Application"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
@@ -3548,28 +3221,27 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
-#, fuzzy
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
-msgstr "Vensterraam stijl"
+msgstr ""
 
 #: src/modules/conf_borders/e_int_config_borders.c:50
 msgid "Window Border Selection"
 msgstr "Vensterraam selectie"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Vensterraam herinneren de volgende keer dat het verschijnt"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3577,28 +3249,25 @@ msgstr "Vensterraam herinneren de volgende keer dat het verschijnt"
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "Sloten"
+msgstr ""
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
 msgstr "Ramen"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
-#, fuzzy
 msgid "Client List Settings"
-msgstr "Venster oversla lijst"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
-#, fuzzy
 msgid "Group By"
-msgstr "Groep:"
+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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3627,23 +3296,20 @@ msgid "Client Sort Order"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
-#, fuzzy
 msgid "Alphabetical"
-msgstr "Verticaal Centreren"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
-#, fuzzy
 msgid "Window stacking layer"
-msgstr "Venster Naam"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:134
-#, fuzzy
 msgid "Iconified Windows"
-msgstr "Match alleen een venster"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
@@ -3662,28 +3328,25 @@ msgid "Warp to owning desktop"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
-#, fuzzy
 msgid "Menu Item Captions"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f Chars"
-msgstr "%1.0f F"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
-#, fuzzy
 msgid "Client List Menu"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
-#, fuzzy
 msgid "Window Manager"
-msgstr "Venster Naam"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
 msgid "About Dialog Title"
@@ -3694,25 +3357,21 @@ msgid "About Dialog Version"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#, fuzzy
 msgid "Border Title"
-msgstr "Vensterraam stijl"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Configuratie Paneel"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#, fuzzy
 msgid "Error Text"
-msgstr "Fout"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 #: src/modules/conf_fonts/e_int_config_fonts.c:63
-#, fuzzy
 msgid "Menu Title"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
@@ -3720,14 +3379,12 @@ msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
-#, fuzzy
 msgid "Menu Item"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
-#, fuzzy
 msgid "Menu Item Active"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
@@ -3749,15 +3406,13 @@ msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
-#, fuzzy
 msgid "Winlist Title"
-msgstr "Venster Titel"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 #: src/modules/conf_fonts/e_int_config_fonts.c:82
-#, fuzzy
 msgid "Widgets"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
 msgid "Button Text"
@@ -3813,24 +3468,21 @@ msgid "Slider Text Disabled"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
-#, fuzzy
 msgid "Module Label"
-msgstr "Modules"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:130
 #: src/modules/conf_colors/e_mod_main.c:35
-#, fuzzy
 msgid "Colors"
-msgstr "Sluiten"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
 msgid "Other"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
-#, fuzzy
 msgid "Window Manager Colors"
-msgstr "Venster naam en klasse"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:437
 #: src/modules/conf_colors/e_int_config_color_classes.c:445
@@ -3843,23 +3495,20 @@ msgstr "Aan"
 #: src/modules/conf_colors/e_int_config_color_classes.c:447
 #: src/modules/conf_colors/e_int_config_color_classes.c:455
 #: src/modules/conf_colors/e_int_config_color_classes.c:522
-#, fuzzy
 msgid "Disabled"
-msgstr "Uit"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:443
 msgid "Widget Colors"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:451
-#, fuzzy
 msgid "Module Colors"
-msgstr "Modules"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:501
-#, fuzzy
 msgid "Color Classes"
-msgstr "Icon Klasse"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:529
 msgid "Object Color"
@@ -3874,32 +3523,27 @@ msgid "Shadow Color"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:556
-#, fuzzy
 msgid "Defaults"
-msgstr "Details"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:52
-#, fuzzy
 msgid "Desk Settings"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:149
-#, fuzzy
 msgid "Desktop Name"
-msgstr "Bureaublad"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
-msgstr "Bij Naam"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:156
-#, fuzzy
 msgid "Desktop Wallpaper"
-msgstr "Bureaublad Muis Wissel"
+msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
@@ -3907,24 +3551,20 @@ msgid "Set"
 msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
-msgstr "Bureaublad"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
-#, fuzzy
 msgid "Screen Lock Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
-#, fuzzy
 msgid "Automatic Locking"
-msgstr "Automatisch Hoogte"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Enlightenment: fout!"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
@@ -3938,9 +3578,9 @@ msgstr ""
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:189
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:207
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f seconds"
-msgstr "%1.1f seconds"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
@@ -3963,33 +3603,29 @@ msgstr "%1.0f van minuten"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
-#, fuzzy
 msgid "Personal"
-msgstr "Toestemmingen:"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:391
-#, fuzzy
 msgid "Login Box Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:394
-#, fuzzy
 msgid "Show on all screen zones"
-msgstr "Scherm zone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:402
-#, fuzzy
 msgid "Show on screen zone #:"
-msgstr "Scherm zone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:406
 #: src/modules/conf_desks/e_int_config_desks.c:247
@@ -4002,8 +3638,8 @@ msgstr "Scherm zone"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -4023,9 +3659,8 @@ msgid "Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Bureaublad Muis Wissel"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -4043,24 +3678,21 @@ msgid "If deactivated before"
 msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:457
-#, fuzzy
 msgid "Custom Screenlock"
-msgstr "Scherm zone"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
 msgstr ""
 
 #: src/modules/conf_desklock/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Lock"
-msgstr "Scherm zone"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:62
 #: src/modules/pager/e_mod_main.c:822
-#, fuzzy
 msgid "Virtual Desktops Settings"
-msgstr "Virtueel bureaublad"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
@@ -4076,37 +3708,32 @@ msgid "Animated flip"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:277
-#, fuzzy
 msgid "Desktops"
-msgstr "Bureaublad"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
-#, fuzzy
 msgid "Flip when dragging objects to the screen edge"
-msgstr "Wissel bureaubladen als muis bij schermrand is"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:302
-#, fuzzy
 msgid "Flip Animation"
-msgstr "Display informatie"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:307
-#, fuzzy
 msgid "Pane"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:310
-#, fuzzy
 msgid "Zoom"
-msgstr "Onder"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:313
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
@@ -4116,9 +3743,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f sec"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Achtergrond instellingen"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -4131,56 +3757,54 @@ msgid "%.2f Y-axis pan factor"
 msgstr ""
 
 #: src/modules/conf_desks/e_mod_main.c:35
-#, fuzzy
 msgid "Virtual Desktops"
-msgstr "Virtueel bureaublad"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr "Algemene instellingen"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Algemene instellingen"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr "Configuratie Paneel"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(Geen Vensters)"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "Configuratie Paneel"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
-msgstr "Basis informatie"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
-msgstr "Geavanceerde instellingen"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr ""
 
@@ -4222,50 +3846,45 @@ msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
-msgstr " Resolutie veranderen"
+msgstr "Resolutie veranderen"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Ingeklapt"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Weerstand"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:228
-#, fuzzy
 msgid "Screen Resolution Settings"
-msgstr "Resolutie"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/modules/conf_display/e_int_config_display.c:412
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
-msgstr "Herstel Beheerder bij opstarten"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Ververs"
 
-#: src/modules/conf_display/e_int_config_display.c:475
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
-msgstr "Resolutie"
+msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4274,11 +3893,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4288,9 +3907,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_display/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Resolution"
-msgstr "Resolutie"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
@@ -4306,154 +3924,145 @@ msgid "The current display server does not <br>have the DPMS extension."
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
-#, fuzzy
 msgid "Display Power Management Settings"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "Thema's"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
 msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:216
-#, fuzzy
 msgid "Suspend time"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
 msgstr ""
 
 #: src/modules/conf_dpms/e_mod_main.c:35
-#, fuzzy
 msgid "Power Management"
-msgstr "Venster Naam"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
-#, fuzzy
 msgid "<None>"
-msgstr "Niets"
+msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Bureaublad instellingen"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "Hulpmiddelen"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "Wis"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "Laatst Aangepast:"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
-#, fuzzy
 msgid "Delete All"
-msgstr "Wis"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
-#, fuzzy
 msgid "Action"
-msgstr "Icon"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "Algemene instellingen"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "basisinstellingen"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%1.1f seconds"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr ""
 
@@ -4463,24 +4072,20 @@ msgstr ""
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "Eenheden"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
-#, fuzzy
 msgid "Engine Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:95
-#, fuzzy
 msgid "Enable Composite"
-msgstr "Popup aanzetten"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
-#, fuzzy
 msgid "Default Engine"
-msgstr "Details"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
@@ -4498,9 +4103,8 @@ msgid "Engine"
 msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:49
-#, fuzzy
 msgid "Run Command Settings"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:115
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:168
@@ -4521,23 +4125,20 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:182
 #: src/modules/conf_winlist/e_int_config_winlist.c:183
 #: src/modules/conf_winlist/e_int_config_winlist.c:269
-#, fuzzy
 msgid "Scroll Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:130
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:183
 #: src/modules/conf_winlist/e_int_config_winlist.c:184
 #: src/modules/conf_winlist/e_int_config_winlist.c:270
-#, fuzzy
 msgid "Scroll Animate"
-msgstr "Opvraag Tijd"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:185
 #: src/modules/conf_winlist/e_int_config_winlist.c:272
-#, fuzzy
 msgid "Scroll Speed"
-msgstr "Autoscroll Snelheid:"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:189
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:228
@@ -4551,9 +4152,8 @@ msgid "%1.2f"
 msgstr "%1.2f"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:197
-#, fuzzy
 msgid "Terminal Settings"
-msgstr "Algemene instellingen"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
@@ -4561,15 +4161,13 @@ msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
-#, fuzzy
 msgid "Size Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:207
 #: src/modules/conf_winlist/e_int_config_winlist.c:296
-#, fuzzy
 msgid "Minimum Width"
-msgstr "Minimum snelheid"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:209
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:213
@@ -4579,45 +4177,39 @@ msgstr "Minimum snelheid"
 #: src/modules/conf_winlist/e_int_config_winlist.c:302
 #: src/modules/conf_winlist/e_int_config_winlist.c:306
 #: src/modules/conf_winlist/e_int_config_winlist.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "%4.0f"
-msgstr "%1.0f"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:211
 #: src/modules/conf_winlist/e_int_config_winlist.c:300
-#, fuzzy
 msgid "Minimum Height"
-msgstr "Minimum snelheid"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:215
 #: src/modules/conf_winlist/e_int_config_winlist.c:304
-#, fuzzy
 msgid "Maximum Width"
-msgstr "Maximale Snelheid"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:219
 #: src/modules/conf_winlist/e_int_config_winlist.c:308
-#, fuzzy
 msgid "Maximum Height"
-msgstr "Maximale Snelheid"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:225
 #: src/modules/conf_winlist/e_int_config_winlist.c:284
-#, fuzzy
 msgid "Position Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:226
 #: src/modules/conf_winlist/e_int_config_winlist.c:285
-#, fuzzy
 msgid "X-Axis Alignment"
-msgstr "Enlightenment Verlaten"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:230
 #: src/modules/conf_winlist/e_int_config_winlist.c:289
-#, fuzzy
 msgid "Y-Axis Alignment"
-msgstr "Enlightenment Verlaten"
+msgstr ""
 
 #: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
 #: src/modules/exebuf/e_mod_main.c:129
@@ -4625,14 +4217,12 @@ msgid "Run Command"
 msgstr "Commando Uitvoeren"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
 msgid "Core"
-msgstr "Sluiten"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
-#, fuzzy
 msgid "Title Bar"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
@@ -4647,23 +4237,20 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
-#, fuzzy
 msgid "About Title"
-msgstr "Over dit Thema"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
-#, fuzzy
 msgid "About Text"
-msgstr "Over dit Thema"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
@@ -4678,9 +4265,8 @@ msgid "Dialog Error"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
-#, fuzzy
 msgid "Exebuf Command"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
@@ -4703,19 +4289,16 @@ msgid "Frame"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:85
-#, fuzzy
 msgid "Label"
-msgstr "Groot"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:86
-#, fuzzy
 msgid "Buttons"
-msgstr "Onder"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:87
-#, fuzzy
 msgid "Slider"
-msgstr "Grote"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
@@ -4726,47 +4309,40 @@ msgid "Check Buttons"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:90
-#, fuzzy
 msgid "Text List Item"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
-#, fuzzy
 msgid "List Item"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
-#, fuzzy
 msgid "Filemanager"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
-#, fuzzy
 msgid "Typebuf"
-msgstr "Type:"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Bureaublad"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
-#, fuzzy
 msgid "Normal Styled"
-msgstr "Normaal"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:168
-#, fuzzy
 msgid "Font Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
@@ -4777,106 +4353,108 @@ msgid "Really Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "%d pixels"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
-msgstr "Icon Klasse"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
-#, fuzzy
 msgid "Fonts"
-msgstr "Eenheden"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:604
-#, fuzzy
 msgid "Font Classes"
-msgstr "Icon Klasse"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Titel"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
-#, fuzzy
 msgid "Icon Theme Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
-#, fuzzy
 msgid "Icon Themes"
-msgstr "Thema's"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
-#, fuzzy
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
-msgstr "Icon Grote"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:109
 #: src/modules/conf_imc/e_mod_main.c:35
-#, fuzzy
 msgid "Input Method Settings"
-msgstr "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:297
-#, fuzzy
 msgid "Input Method Selector"
-msgstr "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:300
 #: src/modules/conf_imc/e_int_config_imc.c:894
-#, fuzzy
 msgid "Use No Input Method"
-msgstr "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:961
-#, fuzzy
 msgid "Setup Selected Input Method"
-msgstr "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:901
 msgid "New"
@@ -4887,34 +4465,29 @@ msgid "Import..."
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:908
-#, fuzzy
 msgid "Input Method Parameters"
-msgstr "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:918
-#, fuzzy
 msgid "Execute Command"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:925
-#, fuzzy
 msgid "Setup Command"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc.c:934
 msgid "Exported Environment Variables"
 msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "Configuratie"
+msgstr ""
 
 #: 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 "Invoeg Methode Fout"
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:282
 msgid ""
@@ -4923,25 +4496,18 @@ msgid ""
 msgstr ""
 
 #: 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 ""
-"Enlightenment was niet in staat het child proces te splitsen:\n"
-"\n"
-"%s\n"
-"\n"
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
-#, fuzzy
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
 msgid "Thumbscroll"
@@ -4966,29 +4532,27 @@ msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%4.0f pixels/sec"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f sec"
+msgstr ""
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Resolutie"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
-#, fuzzy
 msgid "Language Settings"
-msgstr "Geavanceerde instellingen"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:900
 #: src/modules/conf_intl/e_int_config_intl.c:977
@@ -5011,9 +4575,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:92
-#, fuzzy
 msgid "Key Binding Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:223
 #: src/modules/conf_keybindings/e_mod_main.c:35
@@ -5025,9 +4588,8 @@ msgid "Add Key"
 msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:231
-#, fuzzy
 msgid "Delete Key"
-msgstr "Wis"
+msgstr ""
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:235
 msgid "Modify Key"
@@ -5052,27 +4614,23 @@ msgstr ""
 #: src/modules/conf_menus/e_int_config_menus.c:110
 #: src/modules/conf_menus/e_int_config_menus.c:169
 #: src/modules/conf_menus/e_mod_main.c:35
-#, fuzzy
 msgid "Menu Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: 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 "Icon Instellingen"
+msgstr ""
 
 #: 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 "Algemene info"
+msgstr ""
 
 #: 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 "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:111
 #: src/modules/conf_menus/e_int_config_menus.c:170
@@ -5081,9 +4639,8 @@ msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:114
 #: src/modules/conf_menus/e_int_config_menus.c:173
-#, fuzzy
 msgid "Show Generic In Menu"
-msgstr "Algemene info"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:117
 #: src/modules/conf_menus/e_int_config_menus.c:176
@@ -5091,14 +4648,12 @@ msgid "Show Comment In Menu"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:181
-#, fuzzy
 msgid "Autoscroll Settings"
-msgstr "Autoscroll Snelheid:"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
-#, fuzzy
 msgid "Autoscroll Margin"
-msgstr "Autoscroll Snelheid:"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:184
 #: src/modules/conf_menus/e_int_config_menus.c:189
@@ -5116,19 +4671,18 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Uitgebreide Opties"
 
 #: src/modules/conf_menus/e_int_config_menus.c:195
-#, fuzzy
 msgid "Menu Scroll Speed"
-msgstr "Autoscroll Snelheid:"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "%5.0f pixels/sec"
-msgstr "%4.0f pixels/sec"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:200
 msgid "Fast Mouse Move Threshhold"
@@ -5145,58 +4699,50 @@ msgid "Click Drag Timeout"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "%2.2f seconds"
-msgstr "%1.1f seconds"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime.c:64
 #: src/modules/conf_mime/e_mod_main.c:35
-#, fuzzy
 msgid "File Icons"
-msgstr "Bestandsinformatie:"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime.c:186
-#, fuzzy
 msgid "File Types"
-msgstr "Bestanden"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:69
-#, fuzzy
 msgid "File Icon"
-msgstr "Bestandsinformatie:"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
-#, fuzzy
 msgid "Mime:"
-msgstr "Maximaliseer"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:147
 msgid "Use Generated Thumbnail"
 msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:150
-#, fuzzy
 msgid "Use Theme Icon"
-msgstr "Icon maken"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:153
 msgid "Use Edje File"
 msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:156
-#, fuzzy
 msgid "Use Image"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:159
-#, fuzzy
 msgid "Use Default"
-msgstr "Details"
+msgstr ""
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:270
-#, fuzzy
 msgid "Select an Edj File"
-msgstr "Selecteer een venster"
+msgstr ""
 
 #: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
 #: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
@@ -5211,9 +4757,8 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
-#, fuzzy
 msgid "Mouse Binding Settings"
-msgstr "Activerings Instellingen"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
 #: src/modules/conf_mousebindings/e_mod_main.c:35
@@ -5225,14 +4770,12 @@ msgid "Add Binding"
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
-#, fuzzy
 msgid "Delete Binding"
-msgstr "Wis"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
-#, fuzzy
 msgid "Modify Binding"
-msgstr "Laatst Aangepast:"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
 msgid "Restore Mouse and Wheel Binding Defaults"
@@ -5247,29 +4790,24 @@ msgid "Any"
 msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
-#, fuzzy
 msgid "Win List"
-msgstr "Vensterlijst overslaan"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
-#, fuzzy
 msgid "Popup"
-msgstr "Popup snelheid "
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
-#, fuzzy
 msgid "Zone"
-msgstr "Niets"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
-#, fuzzy
 msgid "Container"
-msgstr "Container %d"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
-#, fuzzy
 msgid "Manager"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
 msgid "Mouse Binding Sequence"
@@ -5278,9 +4816,8 @@ msgstr ""
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
-#, fuzzy
 msgid "Cursor Settings"
-msgstr "aangepaste instellingen"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
@@ -5294,9 +4831,8 @@ msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
-#, fuzzy
 msgid "Use Enlightenment Cursor"
-msgstr "Enlightenment: fout!"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
@@ -5304,54 +4840,48 @@ msgid "Use X Cursor"
 msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
-#, fuzzy
 msgid "Cursor Size"
-msgstr "Icon Grote"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Activerings Instellingen"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
-msgstr "Modules"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
-msgstr "Versnelling"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Andere Instellingen"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:75
-#, fuzzy
 msgid "Images"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Thema's"
 
@@ -5360,18 +4890,16 @@ msgid "Icons"
 msgstr "Iconen"
 
 #: src/modules/conf_paths/e_int_config_paths.c:85
-#, fuzzy
 msgid "Backgrounds"
-msgstr "Achtergrond instellingen"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:87
 msgid "Messages"
 msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:168
-#, fuzzy
 msgid "E Paths"
-msgstr "Pad"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:199
 msgid "Default Directories"
@@ -5386,9 +4914,8 @@ msgid "Search Directories"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:40
-#, fuzzy
 msgid "Performance Settings"
-msgstr "Geavanceerde instellingen"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:95
 #: src/modules/conf_performance/e_int_config_performance.c:135
@@ -5397,111 +4924,100 @@ msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:97
 #: src/modules/conf_performance/e_int_config_performance.c:137
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f fps"
-msgstr "%1.0f pixels"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
-#, fuzzy
 msgid "Cache Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:147
-#, fuzzy
 msgid "Cache Flush Interval"
-msgstr "Opvraag interval"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:152
 msgid "Size Of Font Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:154
-#, fuzzy, c-format
+#, c-format
 msgid "%1.1f MB"
-msgstr "%1.1f sec"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:157
 msgid "Size Of Image Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:159
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f MB"
-msgstr "%1.0f F"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:162
 msgid "Number Of Edje Files To Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f files"
-msgstr "%1.0f pixels"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:167
 msgid "Number Of Edje Collections To Cache"
 msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f collections"
-msgstr "%1.1f seconds"
+msgstr ""
 
 #: src/modules/conf_performance/e_mod_main.c:35
 msgid "Performance"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
-msgstr "Favoriete Programma's"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Selecteer een venster"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "Weerstand"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "Wis"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "Bestanden"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
@@ -5517,9 +5033,9 @@ msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.0f F"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
@@ -5531,9 +5047,8 @@ msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Icon Grote"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
@@ -5551,34 +5066,29 @@ msgstr ""
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%1.0f pixels"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Container %d"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Minimum snelheid"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Maximaliseer"
+msgstr ""
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Gestapeld"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
-#, fuzzy
 msgid "Screen Saver Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:135
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:173
@@ -5600,9 +5110,8 @@ msgid "Time until X screensaver alternates"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
-#, fuzzy
 msgid "Blanking"
-msgstr "Gestapeld"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
@@ -5617,18 +5126,16 @@ msgid "Exposure Events"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:234
-#, fuzzy
 msgid "Allow"
-msgstr "Langzaam"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
 msgstr ""
 
 #: src/modules/conf_screensaver/e_mod_main.c:35
-#, fuzzy
 msgid "Screen Saver"
-msgstr "Scherm zone"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:71
 msgid "Configured Shelves"
@@ -5636,23 +5143,19 @@ msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Scherp"
+msgstr ""
 
 #: 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 ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
 
 #: src/modules/conf_startup/e_int_config_startup.c:39
-#, fuzzy
 msgid "Startup Settings"
-msgstr "Andere Instellingen"
+msgstr ""
 
 #: src/modules/conf_startup/e_int_config_startup.c:328
 msgid "Show Splash Screen on Login"
@@ -5660,34 +5163,32 @@ msgstr ""
 
 #: src/modules/conf_startup/e_mod_main.c:35
 #: src/modules/conf_transitions/e_int_config_transitions.c:134
-#, fuzzy
 msgid "Startup"
-msgstr "Scherp"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme.c:90
 msgid "Theme Selector"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
-msgstr "Wis"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
@@ -5709,75 +5210,67 @@ msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Thema's"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
-#, fuzzy
 msgid "Transition Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:126
 msgid "Events"
 msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:135
-#, fuzzy
 msgid "Desk Change"
-msgstr "Bureaubladnaam"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:136
-#, fuzzy
 msgid "Background Change"
-msgstr "Achtergrond instellingen"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:144
 #: src/modules/conf_transitions/e_mod_main.c:35
-#, fuzzy
 msgid "Transitions"
-msgstr "Doorlopendheid"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
-#, fuzzy
 msgid "Wallpaper Settings"
-msgstr "Andere Instellingen"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
-msgstr "Bureaubladen"
+msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
-msgstr "Bureaublad"
+msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr ""
 
@@ -5794,23 +5287,20 @@ msgid "Color 2:"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
-#, fuzzy
 msgid "Fill Options"
-msgstr "Uitgebreide Opties"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
-msgstr "Horizontaal Centreren"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
-msgstr "Verticaal Centreren"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
 msgid "Diagonal Up"
@@ -5833,95 +5323,82 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Andere Instellingen"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
-#, fuzzy
 msgid "Fill and Stretch Options"
-msgstr "Uitgebreide Opties"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
 msgid "Stretch"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
-#, fuzzy
 msgid "Center"
-msgstr "Algemeen"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
-#, fuzzy
 msgid "Tile"
-msgstr "Titel"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
-#, fuzzy
 msgid "Within"
-msgstr "Niets"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
-#, fuzzy
 msgid "Fill"
-msgstr "Vernietigen"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
-#, fuzzy
 msgid "File Quality"
-msgstr "Hoge Kwaliteit"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
 msgid "Use original file"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
-#, fuzzy, c-format
+#, c-format
 msgid "%3.0f%%"
-msgstr "%1.0f"
+msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
-"Enlightenment was niet in staat het child proces te splitsen:\n"
-"\n"
-"%s\n"
-"\n"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "Thema's"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -6020,26 +5497,15 @@ msgid "Decelerate"
 msgstr "Vertraging"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
-#, fuzzy
 msgid "Window Border"
-msgstr "Venster rol"
+msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
 msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:274
-#, fuzzy
 msgid "Prefer application provided icon"
-msgstr "(Geen toepassingen)"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-#, fuzzy
-msgid "Internal Windows"
-msgstr "(Geen Vensters)"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
 msgstr ""
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
@@ -6124,15 +5590,13 @@ msgstr ""
 
 #: src/modules/conf_window_focus/e_mod_main.c:35
 #: src/modules/wizard/page_060.c:26
-#, fuzzy
 msgid "Window Focus"
-msgstr "Nieuw Venster Activatie"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "Venster Bewegingsgeometrie"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -6165,33 +5629,25 @@ msgid "Automatically accept changes after:"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Ik"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Weerstand"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "Maximaliseer beleid"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Slim uitbreiden"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Breid venster uit"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Gebruik beschikbare ruimte"
 
@@ -6199,30 +5655,26 @@ msgstr "Gebruik beschikbare ruimte"
 msgid "Maximize Policy"
 msgstr "Maximaliseer beleid"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "Maximaliseer Horizontaal"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#, fuzzy
-msgid "Allow window manipulation"
-msgstr "Venster manipulatie"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
-msgstr "Een klik op het venster haalt het omhoog"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "Venster Schaduwen"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -6243,94 +5695,87 @@ msgid "Delay before raising:"
 msgstr "Vertraging voor Omhoog halen:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
-#, fuzzy
 msgid "Raise Window"
-msgstr "Venster"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
 msgid "Raise when starting to move or resize"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
-#, fuzzy
 msgid "Raise when clicking to focus"
-msgstr "Klikken om te activeren"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Venster Onthouden"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
 #, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Onthoud deze Sloten"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "Onthouden"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
-msgstr "Details"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "Geen naam!!"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Icon Klasse"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "Icon Klasse"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Titel"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "Titel"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Bestand:"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "Niets"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
-#, fuzzy
 msgid "Window List Settings"
-msgstr "Venster oversla lijst"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:145
-#, fuzzy
 msgid "Show iconified windows"
-msgstr "Match alleen een venster"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:147
-#, fuzzy
 msgid "Show iconified windows from other desks"
-msgstr "Match alleen een venster"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:151
-#, fuzzy
 msgid "Show iconified windows from other screens"
-msgstr "Match alleen een venster"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:157
 msgid "Show windows from other desks"
@@ -6342,9 +5787,8 @@ msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:163
 #: src/modules/conf_winlist/e_int_config_winlist.c:241
-#, fuzzy
 msgid "Selection Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:164
 #: src/modules/conf_winlist/e_int_config_winlist.c:242
@@ -6373,9 +5817,8 @@ msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:176
 #: src/modules/conf_winlist/e_int_config_winlist.c:254
-#, fuzzy
 msgid "Warp Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:177
 #: src/modules/conf_winlist/e_int_config_winlist.c:255
@@ -6383,38 +5826,32 @@ msgid "Warp At End"
 msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:257
-#, fuzzy
 msgid "Warp Speed"
-msgstr "Popup snelheid "
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:135
 msgid "Cpufreq"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Snel opvragen (0.5 sec)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Normal opvragen (1 sec)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normal opvragen (2 sec)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "langzaam opvragen (5 sec)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Zeer langzaam opvragen (30 sec)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6441,19 +5878,18 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Automatisch Hoogte"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:299
-#, fuzzy, c-format
+#, c-format
 msgid "%i MHz"
-msgstr "%i MHz"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:301
-#, fuzzy, c-format
+#, c-format
 msgid "%i.%i GHz"
-msgstr "%i.%i GHz"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:318
 msgid "Time Between Updates"
@@ -6464,22 +5900,18 @@ msgid "Set CPU Power Policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:331
-#, fuzzy
 msgid "Set CPU Speed"
-msgstr "Snelheid instellen"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:386
-#, fuzzy
 msgid ""
 "There was an error trying to set the<br>cpu frequency governor via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Er is een Fout bij het instellen van de CPU-Frequentie<br>via het module "
-"eigen setfreq Hulpprogramma."
 
 #: src/modules/cpufreq/e_mod_main.c:412
 msgid ""
@@ -6489,23 +5921,18 @@ msgid ""
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:432
-#, fuzzy
 msgid ""
 "There was an error trying to set the<br>cpu frequency setting via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Er was een fout met het instellen van de cpu frequentie<br>via de module's "
-"eigen setfreq gereedschap."
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Algemene instellingen"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:108
-#, fuzzy
 msgid "Quality"
-msgstr "Lage kwaliteit"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:111
 msgid "High Quality"
@@ -6540,9 +5967,8 @@ msgid "Very Sharp"
 msgstr "Zeer Scherp"
 
 #: src/modules/dropshadow/e_mod_config.c:134
-#, fuzzy
 msgid "Shadow Distance"
-msgstr "Ingeklapt"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:137
 msgid "Very Far"
@@ -6565,9 +5991,8 @@ msgid "Extremely Near"
 msgstr "Extreem dichtbij"
 
 #: src/modules/dropshadow/e_mod_config.c:147
-#, fuzzy
 msgid "Underneath"
-msgstr "Direct eronder"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:151
 msgid "Shadow Darkness"
@@ -6594,26 +6019,22 @@ msgid "Dropshadow"
 msgstr ""
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
-#, fuzzy
 msgid "Run Command Dialog"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
 msgstr "Thuis"
 
 #: src/modules/fileman/e_mod_main.c:322
-#, fuzzy
 msgid "Favorites"
-msgstr "Favoriete Programma's"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "Resolutie"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:431
-#, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6623,17 +6044,8 @@ 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 ""
-"Configuratie data moest worden vernieuwd. Je oude configuratie\n"
-"is gewist en de nieuwe standaard instellingen opgestart. Dit\n"
-"gebeurd regelmatig gedurende de ontwikkeling, dus rapporteer dit\n"
-"niet als een bug. Dit houdt simpelweg in dat Enlightenment nieuwe\n"
-"instellingen nodig had om de nieuwe functie bruikbaar te maken, die je\n"
-"oude configuratie miste. Deze nieuwe standaard instellingen zullen\n"
-"dit maken. Je kan nu alles weer opnieuw instellen zoals jij het wilt.\n"
-"Het spijt ons voor deze onderbreking van je instellingen.\n"
 
 #: src/modules/fileman/e_mod_main.c:444
-#, 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 "
@@ -6642,27 +6054,18 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Je configuratie is NIEUWER dan Enlightenment. Dit is heel\n"
-"raar. Het zou niet mogen gebeuren behalve als je Enlightenment\n"
-"terugrolde of je configuratie gekopieerd hebt van een plek waar een\n"
-"nieuwere versie van Enlightenment liep. Dit is slecht en\n"
-"als een voorzorgsmaatregel word je configuratie nu teruggezet naar\n"
-"de standaard instellingen. Excuses voor het ongemak.\n"
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:95
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:227
-#, fuzzy
 msgid "Icon Size"
-msgstr "Icon Grote"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:233
 msgid "View"
@@ -6677,9 +6080,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Grote"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6698,16 +6100,15 @@ msgid "Show Full Path"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:260
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6723,99 +6124,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Open"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr "Commando Uitvoeren"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Wis"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Bureaublad Muis Wissel"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6823,14 +6220,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Display informatie"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Bestand:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6842,80 +6238,68 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Configuratie"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Gevaar"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Gevaar"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Achtergrond instellingen"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "knip"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "knip"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Doorlopendheid"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Display informatie"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Achtergrond instellingen"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "Hulpmiddel test"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "Ver"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "Altijd op Voorgrond"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "Hulpmiddelen"
+msgstr ""
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
 msgid "Show/hide gadgets"
@@ -6923,56 +6307,48 @@ 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
-#, fuzzy
 msgid "Window : List"
-msgstr "Vensterlijst overslaan"
+msgstr ""
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
-#, fuzzy
 msgid "Next Window"
-msgstr "Venster"
+msgstr ""
 
 #: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
-#, fuzzy
 msgid "Previous Window"
-msgstr "Verloren Vensters"
+msgstr ""
 
 #: src/modules/winlist/e_winlist.c:141
 msgid "Select a window"
 msgstr "Selecteer een venster"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
 msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:123
-#, fuzzy
 msgid "Icon Labels"
-msgstr "Icon Klasse"
+msgstr ""
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:130
-#, fuzzy
 msgid "Display App Name"
-msgstr "Display"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:134
-#, fuzzy
 msgid "Display App Comment"
-msgstr "Display"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:138
-#, fuzzy
 msgid "Display App Generic"
-msgstr "Display"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
@@ -6983,91 +6359,77 @@ msgid "Enter a name for this new source:"
 msgstr ""
 
 #: 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 ""
-"Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-"afsluiten?"
 
 #: src/modules/ibar/e_mod_config.c:187
-#, fuzzy
 msgid "Are you sure you want to delete this bar source?"
-msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:215
 msgid "IBar"
 msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:797
-#, fuzzy
 msgid "Change Icon Properties"
-msgstr "Eigenschappen"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:802
-#, fuzzy
 msgid "Remove Icon"
-msgstr "Icon maken"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:812
-#, fuzzy
 msgid "Add An Icon"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:819
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Icon maken"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:835
-#, fuzzy
 msgid "Add Application"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
-msgstr "Display"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:110
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
-msgstr "Display"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:115
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
-msgstr "Display"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "Display informatie"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
-msgstr "Scherm zone"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr ""
 
@@ -7076,181 +6438,159 @@ msgid "IBox"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:72
-#, fuzzy
 msgid "Pager Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
-#, fuzzy
 msgid "Flip desktop on mouse wheel"
-msgstr "Wissel bureaubladen als muis bij schermrand is"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
-msgstr "Activerings Instellingen"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
 #: src/modules/pager/e_mod_config.c:132
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Match alleen een venster"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr "Selecteer een venster"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
 msgid "Click to set"
-msgstr "Klikken om te activeren"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr "Virtueel bureaublad"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
 msgid "%.0f px"
-msgstr "%1.0f pixels"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:196
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
-msgstr "Weerstand tussen vensters:"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "Popup snelheid "
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr "Popup snelheid "
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f seconds"
 
-#: src/modules/pager/e_mod_config.c:229
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr "Venster oversla lijst"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "Match alleen een venster"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr "Icon"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
-#, fuzzy, c-format
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
 msgid "Button %i"
-msgstr "Onder"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "Activerings Instellingen"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "Bureaubladnaam"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "Bureaublad"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
-#, fuzzy
 msgid "Start"
-msgstr "%s starten"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Regelaar instellen"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:55
-#, fuzzy
 msgid "System Controls"
-msgstr "Regelaar instellen"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Algemene instellingen"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
-#, fuzzy
 msgid "Display Units"
-msgstr "Display"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:250
 #: src/modules/temperature/e_mod_config.c:354
-#, fuzzy
 msgid "Celsius"
-msgstr "Celsius"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:252
 #: src/modules/temperature/e_mod_config.c:356
@@ -7282,20 +6622,17 @@ msgid "High Temperature"
 msgstr "Hoge Temperatuur"
 
 #: src/modules/temperature/e_mod_config.c:274
-#, fuzzy
 msgid "200 F"
-msgstr "100 F"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:276
-#, fuzzy
 msgid "150 F"
-msgstr "100 F"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:278
 #: src/modules/temperature/e_mod_config.c:287
-#, fuzzy
 msgid "110 F"
-msgstr "100 F"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:282
 #: src/modules/temperature/e_mod_config.c:306
@@ -7305,14 +6642,12 @@ msgid "Low Temperature"
 msgstr "Lage Temperatuur"
 
 #: src/modules/temperature/e_mod_config.c:285
-#, fuzzy
 msgid "130 F"
-msgstr "100 F"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:289
-#, fuzzy
 msgid "90 F"
-msgstr "40 F"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:298
 msgid "93 C"
@@ -7347,35 +6682,31 @@ msgstr "%1.0f F"
 
 #: src/modules/temperature/e_mod_config.c:409
 #: src/modules/temperature/e_mod_config.c:414
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f C"
-msgstr "%1.0f F"
+msgstr ""
 
-#: src/modules/temperature/e_mod_main.c:148
-#, fuzzy
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
-msgstr "Lage Temperatuur"
+msgstr ""
 
 #: src/modules/wizard/e_wizard.c:221
 msgid "Next"
 msgstr ""
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Over Enlightenment"
+msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "Selecteer een venster"
+msgstr ""
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "Bestanden"
+msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7383,66 +6714,56 @@ msgid ""
 msgstr ""
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Details"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:25
 msgid "Launcher Bar"
 msgstr ""
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Bureaublad Muis Wissel"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Stuur naar bureaublad"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Activeren"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Klikken om te activeren"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "Selecteer een venster"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
@@ -7457,53 +6778,44 @@ msgid "Output"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Ingeklapt"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Annuleer"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:390
-#, fuzzy
 msgid "Card:"
-msgstr "Ingeklapt"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Annuleer"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Type:"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Licht"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
-#, fuzzy
 msgid "Mute"
-msgstr "Test Menu Item"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "Grote"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Wacht Sluiten"
+msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -7514,9 +6826,8 @@ msgid "Sound Cards"
 msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "basisinstellingen"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
@@ -7527,19 +6838,16 @@ msgid "Launch mixer..."
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Activerings Instellingen"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Configuratie Vernieuwd"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "Regelaar instellen"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -7548,186 +6856,102 @@ msgid ""
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:214
-#, fuzzy
 msgid "Connection Manager"
-msgstr "Venster Naam"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Icon Instellingen"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:737
 msgid "Network Device"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
-#, fuzzy
 msgid "Wifi"
-msgstr "Niets"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "(Geen toepassingen)"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Configure Virtual Desktops"
-#~ msgstr "Virtueel bureaublad"
-
-#, fuzzy
-#~ msgid "Configure"
-#~ msgstr "Bevestig"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Je probeert Enlightenment het toepassen van eigenschappen <br> (zoals "
+#~ "grote, locatie, raam stijl, etc) op <br> een venster dat <hilight>geen "
+#~ "unieke eigenschappen</hilight> heeft te herinneren<br><br>Dit betekent "
+#~ "dat het Naam/klasse, Doorlopendheid, Rol, etc. eigenschappen deelt "
+#~ "met<br>met meer dan 1 ander venster op het scherm en het "
+#~ "herinneren<br>van deze eigenschappen zal dan op alle vensters van "
+#~ "toepassing zijn<br>die overeenkomen hiermee.<br><br>Je kan <hilight>Match "
+#~ "alleen dit Venster</hilight> optie aanzetten als<br> je alleen deze "
+#~ "versie van dit venster wilt aanpassen<br>andere versies zullen niet "
+#~ "aangepast worden<br><br>Dit is een waarschuwing voor als je niet wilt dat "
+#~ "dit gebeurt.<br>Als dit wel de bedoeling is druk op<hilight>Toepassen</"
+#~ "hilight> of <hilight>OK</hilight> knoppen<br>en je  instellingen worden "
+#~ "geaccepteerd. Druk  <hilight>Annuleer</hilight>als je<br>niet zeker  "
+#~ "bent  en niets wilt veranderd."
+
+#~ msgid "Window name and class"
+#~ msgstr "Venster naam en klasse"
+
+#~ msgid "Expand the window"
+#~ msgstr "Breid venster uit"
 
 #~ msgid "Flip desktops when mouse at screen edge"
 #~ msgstr "Wissel bureaubladen als muis bij schermrand is"
 
-#, fuzzy
-#~ msgid "Flip when moving mouse to the screen edge"
-#~ msgstr "Wissel bureaubladen als muis bij schermrand is"
-
 #~ msgid "Time the mouse is at the edge before flipping:"
 #~ msgstr "Tijd voordat muis bij de rand is voor het wisselen:"
 
-#, fuzzy
-#~ msgid "Configure Heading"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Custom Grid Icons"
-#~ msgstr "Automatisch passende Iconen"
-
-#, fuzzy
-#~ msgid "Defined Command"
-#~ msgstr "Commando Uitvoeren"
-
-#, fuzzy
-#~ msgid "Suspend to Disk"
-#~ msgstr "Stuur naar bureaublad"
-
-#, fuzzy
-#~ msgid "Desktop Lock"
-#~ msgstr "Bureaublad"
-
 #~ msgid "Advanced Settings"
 #~ msgstr "Geavanceerde instellingen"
 
-#, fuzzy
-#~ msgid "%1.0f percent"
-#~ msgstr "%1.1f seconds"
-
-#, fuzzy
-#~ msgid ""
-#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
-#~ "this profile?"
-#~ msgstr ""
-#~ "Je vroeg Enlightenment om af te sluiten.<br><br>Weet je zeker dat je wilt "
-#~ "afsluiten?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete this profile?"
-#~ msgstr "Weet je zeker dat je dit wilt verwijderen <br><b>%s</b> ?"
-
-#, fuzzy
-#~ msgid "Desktop %i, %i"
-#~ msgstr "Bureaublad"
-
 #~ msgid "Configuration Upgraded"
 #~ msgstr "Configuratie Vernieuwd"
 
 #~ msgid "Configuration"
 #~ msgstr "Configuratie"
 
-#, fuzzy
-#~ msgid "Shelf Configuration"
-#~ msgstr "Configuratie"
-
 #~ msgid "Enlightenment Configuration"
 #~ msgstr "Enlightenment Configuratie"
 
 #~ msgid "Configuration Panel"
 #~ msgstr "Configuratie Paneel"
 
-#, fuzzy
-#~ msgid "Input Method Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Language Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Search Path Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Dropshadow Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Fileman Configuration Updated"
-#~ msgstr "Configuratie Vernieuwd"
-
-#, fuzzy
-#~ msgid "IBar Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "IBox Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Pager Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Virtual Desktops Configuration"
-#~ msgstr "Virtueel bureaublad"
-
-#, fuzzy
-#~ msgid "Temperature Configuration"
-#~ msgstr "Enlightenment Configuratie"
-
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
-#~ msgstr ""
-#~ "Enlightenment was niet in staat het child proces te splitsen:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-
 #~ msgid "X reports there are no root windows and %i screens!\n"
 #~ msgstr ""
 #~ "De X-Server deelt mee, dat het geen Root-Venster heeft, maar %i "
@@ -7748,190 +6972,15 @@ msgstr ""
 #~ msgid "About..."
 #~ msgstr "Over..."
 
-#, fuzzy
-#~ msgid "Miscellaneous"
-#~ msgstr "Uitgebreide Opties"
-
 #~ msgid "Window Manipulation"
 #~ msgstr "Venster manipulatie"
 
-#, fuzzy
-#~ msgid "Danish"
-#~ msgstr "Details"
-
-#, fuzzy
-#~ msgid "French"
-#~ msgstr "Fahrenheit"
-
-#, fuzzy
-#~ msgid "German"
-#~ msgstr "Algemeen"
-
-#, fuzzy
-#~ msgid "Portuguese"
-#~ msgstr "Eigenschappen"
-
-#, fuzzy
-#~ msgid "Slovak"
-#~ msgstr "Langzaam"
-
-#, fuzzy
-#~ msgid "Amharic"
-#~ msgstr "Automatisch"
-
-#, fuzzy
-#~ msgid "Aragonese"
-#~ msgstr "Schik iconen"
-
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "Toestemmingen:"
-
-#, fuzzy
-#~ msgid "Manx"
-#~ msgstr "Handmatig"
-
-#, fuzzy
-#~ msgid "Lingala"
-#~ msgstr "Lineair"
-
-#, fuzzy
-#~ msgid "Lao"
-#~ msgstr "Laag"
-
-#, fuzzy
-#~ msgid "Nepali"
-#~ msgstr "Dichtbij"
-
-#, fuzzy
-#~ msgid "Somali"
-#~ msgstr "Klein"
-
-#, fuzzy
-#~ msgid "Tamil"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Tigre"
-#~ msgstr "Titel"
-
-#, fuzzy
-#~ msgid "Vietnamese"
-#~ msgstr "Hernoem"
-
-#, fuzzy
-#~ msgid "Antarctica"
-#~ msgstr "Automatisch"
-
-#, fuzzy
-#~ msgid "Australia"
-#~ msgstr "Auto omhoog halen"
-
-#, fuzzy
-#~ msgid "Austria"
-#~ msgstr "Auto omhoog halen"
-
-#, fuzzy
-#~ msgid "Belgium"
-#~ msgstr "Middel"
-
-#, fuzzy
-#~ msgid "Belize"
-#~ msgstr "Grote"
-
-#, fuzzy
-#~ msgid "Chile"
-#~ msgstr "Sluiten"
-
-#, fuzzy
-#~ msgid "China"
-#~ msgstr "Laden"
-
-#, fuzzy
-#~ msgid "Denmark"
-#~ msgstr "Donker"
-
-#, fuzzy
-#~ msgid "France"
-#~ msgstr "Annuleer"
-
-#, fuzzy
-#~ msgid "Guinea"
-#~ msgstr "Lineair"
-
-#, fuzzy
-#~ msgid "Mali"
-#~ msgstr "Handmatig"
-
-#, fuzzy
-#~ msgid "Mexico"
-#~ msgstr "Misc"
-
-#, fuzzy
-#~ msgid "Myanmar"
-#~ msgstr "Handmatig"
-
-#, fuzzy
-#~ msgid "Nauru"
-#~ msgstr "Dichtbij"
-
-#, fuzzy
-#~ msgid "Nepal"
-#~ msgstr "Dichtbij"
-
-#, fuzzy
-#~ msgid "Niger"
-#~ msgstr "Dichtbij"
-
-#, fuzzy
-#~ msgid "Norway"
-#~ msgstr "Normaal"
-
-#, fuzzy
-#~ msgid "Pitcairn"
-#~ msgstr "Positie"
-
-#, fuzzy
-#~ msgid "Reunion"
-#~ msgstr "Resolutie"
-
-#, fuzzy
-#~ msgid "Samoa"
-#~ msgstr "Klein"
-
-#, fuzzy
-#~ msgid "Senegal"
-#~ msgstr "Algemeen"
-
-#, fuzzy
-#~ msgid "Somalia"
-#~ msgstr "Klein"
-
-#, fuzzy
-#~ msgid "United States"
-#~ msgstr "Geminimaliseerde staat"
-
-#, fuzzy
-#~ msgid "Uzbekistan"
-#~ msgstr "Weerstand"
-
-#, fuzzy
-#~ msgid "Vanuatu"
-#~ msgstr "Handmatig"
-
-#, fuzzy
-#~ msgid "Viet Nam"
-#~ msgstr "Bureaubladnaam"
-
 #~ msgid "Window list skip"
 #~ msgstr "Venster oversla lijst"
 
 #~ msgid "Window"
 #~ msgstr "Venster"
 
-#~ msgid "Window Name"
-#~ msgstr "Venster Naam"
-
 #~ msgid "Window Title"
 #~ msgstr "Venster Titel"
 
@@ -7941,62 +6990,10 @@ msgstr ""
 #~ msgid "Wait Exit"
 #~ msgstr "Wacht Sluiten"
 
-#, fuzzy
-#~ msgid "Window Frame"
-#~ msgstr "Venster Naam"
-
 #~ msgid "When moving or resizing windows, resist at the boundaries"
 #~ msgstr ""
 #~ "Bij verplaatsen of aanpassen van het venster, Weerstand bieden bij grenzen"
 
-#, fuzzy
-#~ msgid "Module State"
-#~ msgstr "Modules"
-
-#, fuzzy
-#~ msgid "Terminal Command"
-#~ msgstr "Commando Uitvoeren"
-
-#, fuzzy
-#~ msgid "Widget"
-#~ msgstr "Hulpmiddelen"
-
-#, fuzzy
-#~ msgid "Font Size:"
-#~ msgstr "Icon Grote:"
-
-#, fuzzy
-#~ msgid "%2.1f pixels"
-#~ msgstr "%2.0f pixels"
-
-#, fuzzy
-#~ msgid "Font Class Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Could not create directory:<br><hilight>%s</hilight>"
-#~ msgstr "Kan niet verwijderen <br><b>%s</b>"
-
-#, fuzzy
-#~ msgid "Modify"
-#~ msgstr "Minimaliseren"
-
-#, fuzzy
-#~ msgid "Edit Application"
-#~ msgstr "Favoriete Programma's"
-
-#, fuzzy
-#~ msgid "Create a new application"
-#~ msgstr "Favoriete Programma's"
-
-#, fuzzy
-#~ msgid "Regenerate \"Applications\" Menu"
-#~ msgstr "Favoriete Programma's"
-
-#, fuzzy
-#~ msgid "Move application up"
-#~ msgstr "(Geen toepassingen)"
-
 #~ msgid ""
 #~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
 #~ "switch to an AC source."
@@ -8124,10 +7121,6 @@ msgstr ""
 #~ msgid "Temp 3"
 #~ msgstr "Temp 3"
 
-#, fuzzy
-#~ msgid "ACPI Temperature"
-#~ msgstr "Lage Temperatuur"
-
 #~ msgid "CPU Frequency Controller Module"
 #~ msgstr "CPU Frequentie Controle module"
 
@@ -8144,22 +7137,6 @@ msgstr ""
 #~ msgid "Experimental Button module for E17"
 #~ msgstr "Experimentele Startknop-Module voor E17"
 
-#, fuzzy
-#~ msgid "ITray Configuration"
-#~ msgstr "Configuratie"
-
-#, fuzzy
-#~ msgid "Number of Rows"
-#~ msgstr "Nieuwe Regel Bureaubladen"
-
-#, fuzzy
-#~ msgid "%3.0f"
-#~ msgstr "%1.0f"
-
-#, fuzzy
-#~ msgid "Enlightenment ITray Module"
-#~ msgstr "Enlightenment IBar-Module"
-
 #~ msgid "The border style"
 #~ msgstr "De raam stijl"
 
@@ -8333,7 +7310,7 @@ msgstr ""
 #~ "Deze module is erg simpel en wordt alleen gebruik tijdens het testen van "
 #~ "basis<br>interface van Enlightenment 0.17.0 module systeem. "
 #~ "Alsjeblieft<br>negeer deze module als je niet werkt aan het module "
-#~ "systeem. "
+#~ "systeem."
 
 #~ msgid "Set Poll Time"
 #~ msgstr "Tussentijd instellen"
diff --git a/po/pl.gmo b/po/pl.gmo
index 0f99e68..d49e291 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 19d150b..9305cad 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,40 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-02-27 09:10+0000\n"
-"Last-Translator: Stanislaw Gackowski <launchpad at soeb.eu>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-02 17:26+0000\n"
+"Last-Translator: poczciwy <Unknown>\n"
 "Language-Team: Polish <en at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -63,59 +65,62 @@ msgid ""
 "window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
 "you want to kill this window?"
 msgstr ""
+"Chcesz zakończyć %s <br><br>Proszę miej na względzie, że wszystkie dane tego "
+"programu,<br>które nie zostały zachowane będą stracone!<br><br>Czy na pewno "
+"chcesz zakończyć ten program?"
 
 #: src/bin/e_actions.c:357
 msgid "Are you sure you want to kill this window?"
 msgstr "Na pewno chcesz zakończyć ten program?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Tak"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Czy na pewno chcesz wyjść ?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "Zażądałeś opuszczenie Enlightenment.<br><br>Czy na pewno chcesz wyjść?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Czy na pewno chcesz wylogować ?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Zaraz nastąpi wylogowanie.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Czy na pewno chcesz wyłączyć ?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Zażądałeś wyłączenia komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Czy na pewno chcesz uruchomić ponownie komputer ?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -123,514 +128,511 @@ msgstr ""
 "Zażądałeś ponownego uruchomienia komputera.<br><br>Czy na pewno chcesz to "
 "zrobić?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Zażądałeś uśpienia komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Czy na pewno chcesz zahibernować komputer ?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 "Zażądałeś zahibernowania komputera.<br><br>Czy na pewno chcesz to zrobić?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Okno : Akcje"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Przesuń"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr ""
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "PodnieÅ›"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Obniż"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Zabij"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Okno : Stan"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Znacznik Trybu Przyklejenia"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Znacznik Ikonizacji"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Znacznik Trybu Pełnego Ekranu"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksymalizuj"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maksymalizuj pionowo"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maksymalizuj poziomo"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maksymalizuj na Pełny Ekran"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Tryb Maksymalizacji \"Inteligentny\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Tryb Maksymalizacji \"Rozrzerzaj\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Tryb Maksymalizacji \"Wypełnij\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Znacznik Zwijania Do Góry"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Znacznik Zwijania w Dół"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Znacznik Zwijania w Lewo"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Znacznik Zwijania w Prawo"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Znacznik Zwijania Do Góry"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Znaczik Braku ramki"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Przełączaj Pulpity w Lewo"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Przełączaj Pulpity w Prawo"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Przełączaj Pulpity w Górę"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Przełączaj Pulpity w Dół"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Przełączaj Pulpity o..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Pokaż Pulpit"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Pokaż półkę"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Przełączaj na Pulpit..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Przełączaj Pulpity Liniowo..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Pokaż Nazwę Pulpitu"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Przełącz na Pulpit 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Przełącz na Pulpit 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Przełącz na Pulpit 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Przełącz na Pulpit 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Przełącz na Pulpit 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Przełącz na Pulpit 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Przełącz na Pulpit 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Przełącz na Pulpit 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Przełącz na Pulpit 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Przełącz na Pulpit 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Przełącz na Pulpit 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Przełąćz na Pulpit..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Przejdź do pulpitu 0 (wszędzie)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Przejdź do pulpitu 1 (wszędzie)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Przejdź do pulpitu 2 (wszędzie)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Przejdź do pulpitu 3 (wszędzie)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Przejdź do pulpitu 4 (wszędzie)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Przejdź do pulpitu 5 (wszędzie)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Przejdź do pulpitu 6 (wszędzie)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Przejdź do pulpitu 7 (wszędzie)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Przejdź do pulpitu 8 (wszędzie)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Przejdź do pulpitu 9 (wszędzie)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Przejdź do pulpitu 10 (wszędzie)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Przejdź do pulpitu 11 (wszędzie)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Przejdź do pulpitu... (wszędzie)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Przesuń Mysz na Ekran 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Przesuń Mysz na Ekran 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Przesuń Mysz na Ekran..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Przesuń Mysz do Przodu o 1 Ekran"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Przesuń Mysz do Tyłu o 1 Ekran"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Przesuń Mysz do Przodu/Tyłu o ... Ekranów"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Okno : Przesuwanie"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Do Następnego Pulpitu"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Do Poprzedniego Pulpitu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "O # Pulpitów..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Do Pulpitu..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Pokaż Główne Menu"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Pokaż Menu Ulubione"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Pokaż Menu Wszystkie Aplikacje"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Pokaż Menu Klientów"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Pokaż Menu..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Uruchom"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplikacja"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Uruchom Ponownie"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Zakończ"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Wyłącz teraz"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Moduł %s dla Enlightenment"
+msgstr "Enlightenment: Tryby"
 
-#: src/bin/e_actions.c:2808
-#, fuzzy
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr "Znacznik Trybu Pełnego Ekranu"
+msgstr "Tryb prezentacji"
 
-#: src/bin/e_actions.c:2813
-#, fuzzy
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr "Znacznik Zwijania Do Góry"
+msgstr "Tryb offline"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Wyloguj"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Ponowne uruchamianie"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Usypianie"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernacja"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "UporzÄ…dkuj Okna"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Ogólne : Akcje"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Ustaw jako tło"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr ""
 
@@ -638,41 +640,40 @@ msgstr ""
 msgid "Color Selector"
 msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -683,7 +684,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -692,11 +693,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Ustawienia zaktualizowane"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -704,7 +705,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -714,7 +715,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -723,7 +724,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -732,7 +733,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -740,11 +741,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -752,12 +753,12 @@ msgstr ""
 msgid "Advanced"
 msgstr "Ustawienia Zaawansowane"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Proste"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -765,7 +766,7 @@ msgstr "Zastosuj"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduły"
 
@@ -774,25 +775,25 @@ msgstr "Moduły"
 msgid "Extensions"
 msgstr "Dodatki"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Pojemnik %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "BÅ‚Ä…d - brak wsparcia dla PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Blokada nie powiodła się"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -800,15 +801,15 @@ msgstr ""
 "Nie powiodła się blokada ekranu, gdyż jedna z<br>aplikacji przechwyciła "
 "klawiaturę lub mysz<br> i nie udało się tego przechwycenia anulować."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Podaj hasło odblokowujące ekran"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Błąd Systemu Uwieżytelniania"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -819,22 +820,22 @@ msgstr ""
 "uwierzytalniania. Kod błedu to <highlight>%i</highligh>.<br>To niedobrze i "
 "nie powinno się wydarzyć. Proszę, zgłoś ten błąd."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -860,7 +861,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -905,7 +906,7 @@ msgstr "Kategorie"
 msgid "Mime Types"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opcje"
 
@@ -937,23 +938,23 @@ msgstr "Wybierz IkonÄ™"
 msgid "Select an Executable"
 msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Skasuj"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Wklej"
 
@@ -961,24 +962,24 @@ msgstr "Wklej"
 msgid "Select All"
 msgstr "Wybierz wszystkie"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "BÅ‚Ä…d Uruchamiania"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nie zdołał stworzyć procesu potomnego:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "BÅ‚Ä…d wykonania aplikacji"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -987,314 +988,307 @@ msgstr ""
 "Enlightenment nie był w stanie uruchomić aplikacji:<br><br>%"
 "s<br><br>Aplikacja nie uruchomiła się."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "BÅ‚Ä…d Wykonania Aplikacji"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s niespodziewanie zakończył działanie"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Dziennik Błędów"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Nie było wiadomości o błędzie"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Zapamiętaj Ten Komunikat"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informacja o Błędzie"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informacja o Sygnale Błędu"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Dane Wyjściowe"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Nie było danych wyjściowych"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Nieistniejąca ścieżka"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s nieistnieje"
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "BÅ‚Ä…d Uruchamiania"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "BÅ‚Ä…d Uruchamiania"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "BÅ‚Ä…d"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Plików"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Anuluj"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Odświerz Widok"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Pokaż Ukryte Pliki"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr ""
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nowy Katalog"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Zmień Nazwę"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Czcionka"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Ustawienia"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Użyj domyślny"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "WÅ‚asne ikony"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr ""
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Wielkość ikony (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Ustaw jako tło"
+msgstr "Zmień tło..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Zawartość Półki"
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Stwórz Nowy Katalog"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nazwa Nowego Katalogu:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Zmień Nazwę %s na:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Zmień Nazwę Pliku"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Spróbuj ponownie"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Nie dla wszystkich"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Tak dla wszystkich"
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Ładowanie"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Nie można skasować  <br><highlight>%s</highlight>"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignoruj"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignoruj wszystkie"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Wystąpił błąd podczas wykonywania operacji.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Potwierdź Skasowanie"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Jesteś pewien że chcesz usunąć<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1307,144 +1301,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Właściwości pliku"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Plik:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Ostatinio zmodyfikowany:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Typ pliku"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
-msgstr ""
+msgstr "Uprawnienia"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Właściciel:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "PodglÄ…d"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Domyślny"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "WÅ‚asne"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Zwykły"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Wstawka"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "WyglÄ…d"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Automatycznie przewiń zawartość"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Można zmieniać rozmiar"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Usuń Gadżet"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1454,7 +1452,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Blokady Okna"
 
@@ -1488,21 +1486,21 @@ msgid "Lock program changing:"
 msgstr "Nie pozwól programowi na zmianę:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Pozycja"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Rozmiar"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Położenie"
 
@@ -1511,12 +1509,12 @@ msgid "Iconified state"
 msgstr "Stan Zwinięcia do Ikony"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Przyklejenie"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Zwinięcie (Użytkownik)"
 
@@ -1525,7 +1523,7 @@ msgid "Maximized state"
 msgstr "Stan maksymalizacji"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Stan Pełnego Ekran"
 
@@ -1533,7 +1531,7 @@ msgstr "Stan Pełnego Ekran"
 msgid "Lock me from changing:"
 msgstr "Nie pozwól mi na zmianę:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Typ ramki"
 
@@ -1581,115 +1579,116 @@ msgstr "Odepnij od pulpitu"
 msgid "More..."
 msgstr "Więcej..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Do Ikony"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Zmaksymalizuj pionowo"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Zmaksymalizuj poziomo"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Zlikwiduj MaksymalizacjÄ™"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Skrót klawiszowy"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Do menu ulubionych"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Ramka"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Pomiń"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Stan"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Właściwości Okna"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normalny"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Zawsze poniżej"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Wybierz typ obramowania"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Używaj domyślnych właściwości E17 dla ikon"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr ""
+msgstr "Użyj ikonę dostarczoną przez program "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Użyj ikonę zdefiniowaną przez użytkownika"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Zwiniń"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Przyklej"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Pełny Ekran"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista Okien"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Pasek zadań"
 
@@ -1705,7 +1704,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Ustawienia ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1797,11 +1796,11 @@ msgstr "Ustawienia NetWM"
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Pomiń pasek zadań"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Pomiń pager"
 
@@ -1809,15 +1808,15 @@ msgstr "Pomiń pager"
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Zapamiętaj"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Własności pasują do więcej niż jednego okna"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1842,11 +1841,11 @@ msgstr ""
 "<hilight>Anuluj</hilight> jeśli<br>nie jesteś pewien, a nic nie zostanie "
 "zmienione"
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nie ustawiono właściwości"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1858,115 +1857,101 @@ msgstr ""
 "okno rozpoznać</highlight>.<br><br>Musisz podać przynajmniej 1 sposób na "
 "zapamiętanie tego okna."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Prosisz Enlightenment o zapamiętanie ustawień<BR>(takich jak rozmiar "
-"położenie, typ ramki itd.) dla okna,<br>które <highlight>nie jest "
-"jednoznacznie identyfikowane przez własności</highlight>.<br><br>Oznacza to, "
-"że ma taką samą Nazwę(Name)/Klasę(Class), Typ Okna, Rolę itd.<br>jak co "
-"najmniej jeszcze jedno inne okno na ekranie. Zapamiętane ustawienia zostaną "
-"zastosowane<br>do wszystkich okien które spełniają te kryteria.<br><br>Być "
-"może chcesz włączyć opcję <highlight>Dopasuj tylko jedno okno</"
-"highlight><br>jeżeli tylko jedna kopia tego okna ma być zmodyfikowana<br>a "
-"pozostałe mają pozostać bez zmian. To tylko ostrzeżenie na wypadek, gdyby "
-"nie to było twoim zamiarem.<br>Jeżeli było, po prostu naciśnij przycisk "
-"<hightligh>Zastosuj</highlight> lub <hightligh>OK</highlight><br> i "
-"ustawienia zostaną zaakceptowane. Naciśnij <hilight>Anuluj</hilight> "
-"jeśli<br>nie jesteś pewien, a nic nie zostanie zmienione"
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nic"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Rozmiar i Położenie"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Blokady"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Rozmiar, Położenie i Blokady"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Wszystko"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Zapamiętaj przy pomocy"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nazwa i Klasa okna"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Rola Okna"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Typ Okna"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Rodzaj okna"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Zapamiętaj właściwości"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Właściwości ikony"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Wirtualny Pulpit"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Pomiń Na Liście Okien"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Dopasuj tylko jedno okno"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Uruchom ten program przy Starcie"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Uruchom ten program przy Starcie"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Ustawienia"
@@ -1985,24 +1970,24 @@ msgstr "Półka"
 msgid "Module Settings"
 msgstr "Ustawienia Modułów"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Dostępne moduły"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Załaduj moduł"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Załadowane moduły"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2036,8 +2021,8 @@ msgstr "Usuń Gadżet"
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Ułożenie"
 
@@ -2064,12 +2049,12 @@ msgid "Favorite Applications"
 msgstr "Ulubione Aplikacje"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplikacje"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2078,7 +2063,7 @@ msgstr "Aplikacje"
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Utracone Okna"
 
@@ -2111,134 +2096,131 @@ msgid "(No Applications)"
 msgstr "(Brak Aplikacji)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Wirtualne Pulpity"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Brak Okien)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Bez nazwy!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Ustawienia Półek"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Malutki"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Mały"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Åšredni"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Duży"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Ogromny"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Zawartość Półki"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Ponad Wszystkim"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Pod Oknami"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Poniżej Wszystkiego"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Pozwól oknom na przykrywanie półki"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Zmniejsz do Rozmiaru Zawartości"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikseli"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Style"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr ""
+msgstr "Autoukrywanie"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr ""
 
@@ -2458,7 +2440,7 @@ msgid "Enlightenment cannot set up its intl system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu wspierania wielu języków."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2466,11 +2448,11 @@ msgstr ""
 "Enlightenment nie może ustawić ekranu startowego.Może masz zbyt mało "
 "pamięci ?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2478,7 +2460,7 @@ msgstr ""
 "Enlightenment stwierdził, że Evas nie potrafi stworzyć bufora\n"
 "Upewnij siÄ™, czy Evas wspiera Programowe Renderowanie do Bufora\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2486,7 +2468,7 @@ msgstr ""
 "Enlightenment stwierdził, że Evas nie ładuje plików PNG. Sprawdź\n"
 "czy Evas posiada moduł ładujący obrazy PNG\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2494,7 +2476,7 @@ msgstr ""
 "Enlightenment stwierdził, że Evas nie ładuje plików JPG. Sprawdź\n"
 "czy Evas posiada moduł ładujący obrazy JPG\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2502,18 +2484,18 @@ msgstr ""
 "Enlightenment stwierdził, że Evas nie ładuje plików EET. Sprawdź\n"
 "czy Evas posiada moduł ładujący pliki EET\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2522,194 +2504,194 @@ msgstr ""
 "Twoim\n"
 "systemie. Być może jest uruchomiony jakiś inny menedżer okien ?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment nie może ustawić swojego systemu blokowania ekranu."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment nie może zainicjalizować systemu System Command.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment nie może ustawić swojego systemu zdarzeń."
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment nie może ustawić swojego systemu zapamiętywania."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment nie może uruchomić Menadżera Plików.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment nie może ustawić swojego systemu wiadomości."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu \"przeciągnij i upuść\"."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment nie może ustawić swojego systemu obsługi przechwytu "
 "wprowadzania."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment nie może ustawić swojego systemu modułów."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment nie może ustawić swojego systemu zapamiętywania."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nie może ustawić swojego systemu klas kolorów."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment nie może ustawić swojego systemu kontroli gadżetów."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment nie może ustawić swojego systemu powiązań."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment nie może ustawić swojego systemu wyskakujących okien."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment nie może ustawić swojego systemu półki."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment nie może ustawić swojego systemu tworzenia miniatur.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2721,11 +2703,11 @@ msgstr ""
 "można było usunąć<br>problematyczne moduły z konfiguracji. "
 "Okno<br>konfiguracji Modułów pozwala na powtórne<br>wybranie modułów."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2733,15 +2715,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2750,11 +2732,11 @@ msgstr ""
 "Podczas  ładowania modułu %s wystąpił błąd.<br>Nie odnaleziono modułu %s w "
 "katalogu modułów.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Błąd ładowania Modułu"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2763,11 +2745,11 @@ msgstr ""
 "Podczas ładowania modułu %s wystąpił błąd.<br>Pełna ścieżka do modułu to:<br>"
 "%s<br>Zgłoszony błąd to:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Moduł nie zawiera wszystkich potrzebnych funkcji"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2778,12 +2760,12 @@ msgstr ""
 "modułu w wersji przynajmniej: %i.<br>API modułu polecane przez Enlightenment "
 "to: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Moduł %s dla Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Czy chciałbyś wyładować ten moduł?<br>"
 
@@ -2794,30 +2776,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz skasować tę półkę?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Zażądałeś usunięcia tej Półki.<br><br>Czy na pewno chcesz ją usunąć?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Zakończ Przesuwanie/Zmianę Rozmiaru składników"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Rozpocznij Przesuwanie/Zmianę Rozmiaru składników"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Zawartość Półki"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Usuń tę półkę"
 
@@ -2834,11 +2815,11 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problem przy wylogowaniu"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2848,109 +2829,109 @@ msgstr ""
 "chcesz mimo to zakończyć<br>wylogowywanie się bez zamykania<br>wcześniej "
 "tych aplikacji?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Wyloguj teraz"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Jeszcze poczekaj"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Anuluj Wylogowanie"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Wylogowanie trwa"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment jest zajęty przez inne zadanie"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! To się nie powinno zdarzyć"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Usypianie"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernowanie"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2963,15 +2944,14 @@ msgid "Set As Theme"
 msgstr ""
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Zawartość Półki"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Nie można wyjść - nieśmiertelne okna."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -2981,77 +2961,77 @@ msgstr ""
 "to, że Enlightenment nie może zezwolić<br> sobie na wyjściedopóki te okna "
 "nie zostaną zamknięte,<br> bądź usunięta blokada czasu działania."
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bajtów"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "W przyszłości"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Podczas ostatniej minuty"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li lat temu"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li miesięcy temu"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li tygodni temu"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dni temu"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li godzin temu"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minut temu"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Nieznane"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3071,51 +3051,51 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Dodaj do Menu Ulubione"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Katalog Wyżej"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Prawa dostępu:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Ostatnio Modyfikowany:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ty"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Chroniony"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Tylko Do Odczytu"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Zabronione"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -3131,57 +3111,57 @@ msgstr "Ustawienia Podstawowe"
 msgid "Show alert when battery is low"
 msgstr "Pokaż alarm gdy stan baterii jest niski"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3189,12 +3169,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3202,24 +3182,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr ""
 
@@ -3227,25 +3207,22 @@ msgstr ""
 msgid "Clock"
 msgstr "Zegar"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Pozycja"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Wyłącz"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Moduły"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3269,7 +3246,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3291,12 +3268,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menu"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3304,14 +3281,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Wybór Ramki Okna"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamiętaj Ramkę tego okna i użyj jej przy ponownym jego pokazaniu"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3337,7 +3314,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3605,9 +3582,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -3617,9 +3594,8 @@ msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "RozciÄ…gnij"
+msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
@@ -3674,10 +3650,10 @@ msgstr "%1.0f min"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Osobiste"
@@ -3709,8 +3685,8 @@ msgstr "Pokaż w strefie ekranu #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3730,9 +3706,8 @@ msgid "Theme Wallpaper"
 msgstr "TÅ‚o Pulpitu z Wystroju"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "TÅ‚o Pulpitu z Wystroju"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -3816,9 +3791,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f sek"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Zmiana TÅ‚a"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -3834,46 +3808,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Wirtualne Pulpity"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Ustawienia Ogólne"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Tryb Podstawowy"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Tryb Zaawansowany"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Domyślny Tryb Okien Dialogowych"
 
@@ -3929,31 +3908,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Przywróć przy Starcie"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Odświerz"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Obrót Ekranu"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Odbicie Lustrzane"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "BrakujÄ…ce Funkcje"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3962,11 +3941,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4021,7 +4000,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4031,102 +4010,107 @@ msgstr "Brak"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcja"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parametry Akcji"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4301,9 +4285,8 @@ msgid "Textblock Big"
 msgstr "Duży Blok Tekstu"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Ustawienia zaktualizowane"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4422,18 +4405,17 @@ msgstr ""
 msgid "%d pixels"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4441,37 +4423,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "WÅ‚Ä…cz Klasy Czcionek"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Czcionka"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Wygładzanie"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Czcionki Zastępcze"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nazwa Czcionki Zastępczej"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Włącz Czcionki Zastępcze"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4486,7 +4480,7 @@ msgstr "Wystrój Ikony"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Wystrój Ikony"
 
@@ -4554,7 +4548,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr ""
 
@@ -4724,7 +4718,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Margines Automatycznego Przewijania"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Opcje Różne"
 
@@ -4903,24 +4897,24 @@ msgstr "Rozmiar Kursora"
 msgid "Mouse Cursor"
 msgstr "Kursor Myszy"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4937,7 +4931,7 @@ msgid "Images"
 msgstr "Obrazy"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Wystroje"
 
@@ -5037,33 +5031,33 @@ msgstr "%1.0f kolekcji"
 msgid "Performance"
 msgstr "Wydajność"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5127,9 +5121,8 @@ msgid "%1.2f times"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Pojemnik"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
@@ -5200,9 +5193,8 @@ msgstr "Skonfigurowane Półki"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Uruchamianie"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5229,23 +5221,23 @@ msgstr "Uruchamianie"
 msgid "Theme Selector"
 msgstr "Wybór Wystroju"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr ""
 
@@ -5302,38 +5294,38 @@ msgid "Wallpaper Settings"
 msgstr "Ustawienia TÅ‚a Pulpitu"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "TÅ‚o Pulpitu z Wystroju"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Obraz..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradient..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Gdzie Umieścić Tło Pulpitu"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Wszystkie Pulpity"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Ten Pulpit"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Ten Ekran"
 
@@ -5354,14 +5346,14 @@ msgid "Fill Options"
 msgstr "Opcje Wypełnienia"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Poziomo"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Pionowo"
 
@@ -5386,9 +5378,8 @@ msgid "For some reason, Enlightenment was unable to create a gradient."
 msgstr "Z jakiegoś powodu, Enlightenment nie był w stanie stworzyć gradientu."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Ustawienia TÅ‚a Pulpitu"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5427,36 +5418,36 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Wybierz Obraz..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "BÅ‚Ä…d Wczytywania Obrazu"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment nie był w stanie wczytać obrazu<br>ze względu na błąd "
 "konwersji."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "BÅ‚Ä…d Importowania TÅ‚a"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5464,7 +5455,7 @@ msgstr ""
 "Enlightenment nie był w stanie zaimportować tła.<br><br>Czy to jest na "
 "pewnowłaściwe tło?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5577,14 +5568,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Ustawienia Fokusu"
@@ -5717,17 +5700,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Inteligentne powiększanie"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Powiększ okno"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Wypełnij dostępną przestrzeń"
 
@@ -5735,19 +5713,19 @@ msgstr "Wypełnij dostępną przestrzeń"
 msgid "Maximize Policy"
 msgstr "Sposób Maksymalizacji"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Pozwól na Operowanie oknem"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5786,49 +5764,57 @@ msgstr "PodnieÅ› podczas ruchu i zmiany rozmiaru"
 msgid "Raise when clicking to focus"
 msgstr "Kliknij by aktywizować"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6158,9 +6144,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Bazowy Rozmiar"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6187,7 +6172,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Zachowanie"
 
@@ -6203,97 +6188,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Katalog Wyżej"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Dodaj program..."
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "Aplikacje"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Skasuj"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6301,14 +6284,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Informacja o Błędzie"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Plik:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6320,16 +6302,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Ustawienia"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6367,19 +6349,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr "Gadżety"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6416,7 +6398,7 @@ msgstr "Wybrane Żródło Paska"
 msgid "Icon Labels"
 msgstr "Etykiety Ikon"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Pokaż etykietę ikony"
 
@@ -6476,43 +6458,43 @@ msgstr ""
 msgid "Add Application"
 msgstr "Dodaj AplikacjÄ™"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Wyświetl Nazwę"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Wyświetl Tytuł"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Wyświet Klasę"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Wyświetl Nazwę Ikony"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Pokaż okna ze wszystkich pulpitów"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Pokaż okna z aktywnego pulpitu"
 
@@ -6532,11 +6514,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Ustawienia Okien Popup"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6544,108 +6526,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6769,7 +6751,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6781,15 +6763,15 @@ msgstr ""
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6836,15 +6818,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6966,22 +6948,50 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "System"
+msgstr ""
 
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Układanka"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Prosisz Enlightenment o zapamiętanie ustawień<BR>(takich jak rozmiar "
+#~ "położenie, typ ramki itd.) dla okna,<br>które <highlight>nie jest "
+#~ "jednoznacznie identyfikowane przez własności</highlight>.<br><br>Oznacza "
+#~ "to, że ma taką samą Nazwę(Name)/Klasę(Class), Typ Okna, Rolę itd.<br>jak "
+#~ "co najmniej jeszcze jedno inne okno na ekranie. Zapamiętane ustawienia "
+#~ "zostaną zastosowane<br>do wszystkich okien które spełniają te kryteria."
+#~ "<br><br>Być może chcesz włączyć opcję <highlight>Dopasuj tylko jedno "
+#~ "okno</highlight><br>jeżeli tylko jedna kopia tego okna ma być "
+#~ "zmodyfikowana<br>a pozostałe mają pozostać bez zmian. To tylko "
+#~ "ostrzeżenie na wypadek, gdyby nie to było twoim zamiarem.<br>Jeżeli było, "
+#~ "po prostu naciśnij przycisk <hightligh>Zastosuj</highlight> lub "
+#~ "<hightligh>OK</highlight><br> i ustawienia zostanÄ… zaakceptowane. "
+#~ "Naciśnij <hilight>Anuluj</hilight> jeśli<br>nie jesteś pewien, a nic nie "
+#~ "zostanie zmienione"
+
+#~ msgid "Window name and class"
+#~ msgstr "Nazwa i Klasa okna"
 
 #~ msgid "Configure Contents..."
 #~ msgstr "Konfiguracja Zawartości"
@@ -6998,6 +7008,12 @@ msgstr "System"
 #~ msgid "Configure Heading"
 #~ msgstr "Nagłówek Konfiguracji"
 
+#~ msgid "Expand the window"
+#~ msgstr "Powiększ okno"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Pozwól na Operowanie oknem"
+
 #~ msgid "Defined Command"
 #~ msgstr "Zdefiniowane polecenie"
 
@@ -7134,9 +7150,6 @@ msgstr "System"
 #~ msgid "Window"
 #~ msgstr "Okno"
 
-#~ msgid "Window Name"
-#~ msgstr "Nazwa Okna"
-
 #~ msgid "Window Title"
 #~ msgstr "Tytuł Okna"
 
@@ -7907,9 +7920,6 @@ msgstr "System"
 #~ msgid "Lifespan"
 #~ msgstr "Użyteczność"
 
-#~ msgid "Remember This Window"
-#~ msgstr "Zapamiętaj To Okno"
-
 #~ msgid "Remember This Instance Only"
 #~ msgstr "Zapamiętaj Tylko Ten Przypadek"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 8ca9bdf..c99611f 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 9635ab9..b48e350 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,42 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-04-28 23:53+0100\n"
-"Last-Translator: Jean Dominique Ackle <jdalinux at yahoo.com.br>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-06 10:49+0000\n"
+"Last-Translator: jdackle <Unknown>\n"
 "Language-Team: None. but contact-me on <mdkcore at gmail.com>\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"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Fechar"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,15 +50,6 @@ 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-2007, pelo Time de Desenvolvimento do Enlightenment."
-"<br><br>Nós esperamos que você se divirta usando este software bastante "
-"assim como nós nos divertimos o escrevendo.<br><br> Este software é "
-"fornecido desta forma sem garantia explícita ou implícita. Este software é "
-"dirigido pelas condções de licensiamento, portanto por favor veja os "
-"arquivos de licença COPYING e COPYING-PLAIN instalados no seu sistema."
-"<br><br>Enlightenment está sobre <hilight>DESENVOLVIMENTO PESADO</hilight> e "
-"não é estável. Muitas características estão incompletas ou ainda nem existem "
-"e muitas tem muitos bugs. Você foi <hilight>AVISADO!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -79,46 +70,46 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Você tem certeza que deseja matar esta janela?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Você requisitou sair do Enlightenment.<br><br>Você tem certeza que deseja "
 "sair?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Você tem certeza que deseja deslogar-se?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Você está perto de deslogar.<br><br>Você tem certeza que deseja isto?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Você tem certeza que deseja desligar?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -126,11 +117,11 @@ msgstr ""
 "Você requisitiu desligar o seu Computador.<br><br>Você tem certeza que "
 "deseja desligá-lo?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Você tem certeza que deseja reiniciar?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -138,7 +129,7 @@ msgstr ""
 "Você requisitou reiniciar o seu Computador.<br><br>Você tem certeza que "
 "deseja reiniciá-lo?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -146,11 +137,11 @@ msgstr ""
 "Você requisitou suspender o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Você tem certeza que deseja hibernar?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -158,567 +149,535 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr ""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2595
-#, fuzzy
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr "Mostrar a Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
-msgstr "Mudar Para Área de Trabalho 7 "
+msgstr "Mudar Para Área de Trabalho 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2642
-#, fuzzy
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "Virar Área de Trabalho a Esquerda"
+msgstr ""
 
-#: src/bin/e_actions.c:2644
-#, fuzzy
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr "Virar Área de Trabalho a Direita"
+msgstr ""
 
-#: src/bin/e_actions.c:2646
-#, fuzzy
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "Virar Área de Trabalho Acima"
+msgstr ""
 
-#: src/bin/e_actions.c:2648
-#, fuzzy
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "Virar Área de Trabalho Abaixo"
+msgstr ""
 
-#: src/bin/e_actions.c:2650
-#, fuzzy
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr "Virar Área de Trabalho Por..."
+msgstr ""
 
-#: src/bin/e_actions.c:2656
-#, fuzzy
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr "Virar Área de Trabalho Para..."
+msgstr ""
 
-#: src/bin/e_actions.c:2662
-#, fuzzy
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr "Virar Área de Trabalho Linearmente..."
+msgstr ""
 
-#: src/bin/e_actions.c:2668
-#, fuzzy
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr "Virar Área de Trabalho Para..."
+msgstr ""
 
-#: src/bin/e_actions.c:2673
-#, fuzzy
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 0"
+msgstr ""
 
-#: src/bin/e_actions.c:2675
-#, fuzzy
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 1"
+msgstr ""
 
-#: src/bin/e_actions.c:2677
-#, fuzzy
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 2"
+msgstr ""
 
-#: src/bin/e_actions.c:2679
-#, fuzzy
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 3"
+msgstr ""
 
-#: src/bin/e_actions.c:2681
-#, fuzzy
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 4"
+msgstr ""
 
-#: src/bin/e_actions.c:2683
-#, fuzzy
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 5"
+msgstr ""
 
-#: src/bin/e_actions.c:2685
-#, fuzzy
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 6"
+msgstr ""
 
-#: src/bin/e_actions.c:2687
-#, fuzzy
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 7 "
+msgstr ""
 
-#: src/bin/e_actions.c:2689
-#, fuzzy
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 8"
+msgstr ""
 
-#: src/bin/e_actions.c:2691
-#, fuzzy
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 9"
+msgstr ""
 
-#: src/bin/e_actions.c:2693
-#, fuzzy
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 10"
+msgstr ""
 
-#: src/bin/e_actions.c:2695
-#, fuzzy
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr "Mudar Para Área de Trabalho 11"
+msgstr ""
 
-#: src/bin/e_actions.c:2697
-#, fuzzy
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr "Mudar Para Área de Trabalho..."
+msgstr ""
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr "Por Área de Trabalho #... "
+msgstr "Por Área de Trabalho #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Lançar"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
-msgstr "Aplicativo"
+msgstr "Aplicação"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2803
-#, fuzzy
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
-msgstr "Sair"
+msgstr ""
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
-#, fuzzy
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr "Módulo %s do Enlightenment"
+msgstr ""
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2845
-#, fuzzy
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr "Travas"
+msgstr ""
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr "Travas Genéricas"
+msgstr ""
 
-#: src/bin/e_actions.c:2855
-#, fuzzy
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr "Ações do Módulo"
+msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
-#, fuzzy
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr "Papéis de Parede"
+msgstr ""
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
-#, fuzzy
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr "Área de Trabalho %i, %i"
+msgstr ""
 
 #: src/bin/e_color_dialog.c:29
-#, fuzzy
 msgid "Color Selector"
-msgstr "Seletor de Tema"
+msgstr ""
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
-#, fuzzy
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -728,17 +687,8 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
-"Dados de configuração precisam de atualização. Sua antiga "
-"configuração<br>será limpa e um novo conjunto de padrões inicializado. "
-"Isto<br>acontece regularmente durante o desenvolvimento, portanto não relate "
-"um<br>bug. Isto simplesmente acontece pois o Enlightenment precisa de dados "
-"novos de<br>configuração por padrão para funcionalidade de uso que sua "
-"contiguração<br>antiga simplesmente faltava. Este novo conjunto de padrões "
-"vai fixar<br>aquele adicionando este nele. Você pode reconfigurar as coisas "
-"agora ao seu<br>gosto. Desculpe por ?HICCUP? em sua configuração.<br>"
-
-#: src/bin/e_config.c:775
-#, fuzzy
+
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -746,32 +696,21 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
-"Sua configuração é mais NOVA que o Enlightenment. Isto é muito<br>estranho. "
-"Isto não pode ter acontecido a menos que você tenha desatualizado "
-"o<br>Enlightenment ou copiado a configuração de um lugar onde<br>uma versão "
-"mais nova do Enlightenment esteja rodando. Isso é ruim e<br>como precaução "
-"sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
-"inconveniência.<br>"
 
-#: src/bin/e_config.c:1750
-#, fuzzy
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr "Configurações do Menu"
+msgstr ""
 
-#: src/bin/e_config.c:1773
-#, fuzzy, c-format
+#: src/bin/e_config.c:1763
+#, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings 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 ""
-"Um erro ocorreu enquanto salvava a configuração do<br>Enlightenment para o "
-"disco. O erro não pode ser<br> determinado.<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:1784
-#, fuzzy, c-format
+#: src/bin/e_config.c:1774
+#, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
 "being saved to.<br>This error is very strange as the files should<br>be "
@@ -779,58 +718,38 @@ 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 ""
-"Os arquivos de configuração do Enlightenment são muito grandes<br>para o "
-"sistema de arquivos que eles serão salvos.<br>Este erro é muito estranho "
-"como os arquivos podem<br>ser extremamente pequenos. Por favor verifique as "
-"configurações<br>para o seu diretório home.<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:1797
-#, fuzzy, c-format
+#: src/bin/e_config.c:1787
+#, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
 "Enlightenment. Your disk is having troubles<br>and possibly needs "
 "replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Um erro de saída ocorreu enquanto gravava os arquivos de<br>configuração "
-"para o Enlightenment. Seu disco está tendo problemas<br>e possivelmente "
-"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:1808
-#, fuzzy, c-format
+#: src/bin/e_config.c:1798
+#, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
 "to write the file.<br>You have either run out of disk space or have<br>gone "
 "over your quota limit.<br><br>The file where the error occured was:<br>%"
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
-"Enlightenment não pode gravar este arquivo de configuração<br>porque está "
-"sem espaço para gravar o arquivo.<br>Ou você está sem espaço disponível no "
-"disco ou seu limite da quota<br>estourou.<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:1820
-#, fuzzy, c-format
+#: src/bin/e_config.c:1810
+#, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings 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 ""
-"Enlightenment inesperadamente teve o arquivo de configuração que<br>estava "
-"gravando fechado. ISso é muito incomum.<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:1845
-#, fuzzy
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr "Problemas ao Gravar as Configurações do Enlightenment"
+msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -838,12 +757,12 @@ msgstr "Problemas ao Gravar as Configurações do Enlightenment"
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Básico"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -851,7 +770,7 @@ msgstr "Aplicar"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Módulos"
 
@@ -860,27 +779,27 @@ msgstr "Módulos"
 msgid "Extensions"
 msgstr "Extensões"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Contêiner %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte ao PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM não tem suporte gerado no Enlightenment, portanto<br>travamento da área "
 "de trabalho está desativado."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Falha ao Travar"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -888,15 +807,15 @@ msgstr ""
 "Travar a área de trabalho falhou porque alguma aplicação<br>está prendendo o "
 "teclado ou o mouse ou ambos<br>e sua garra é impossível de ser quebrada."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Por favor entre com sua senha de destravamento"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Erro no Sistema de Autenticação"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -907,22 +826,22 @@ msgstr ""
 "código de erro foi <hilight>%i</hilight>.<br>Isso é ruim e não podia ter "
 "acontecido. Por favor relate este bug."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -949,7 +868,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de Entrada da Área de Trabalho"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -991,14 +910,12 @@ msgid "Categories"
 msgstr "Categorias"
 
 #: src/bin/e_eap_editor.c:528
-#, fuzzy
 msgid "Mime Types"
-msgstr "Tipos de Arquivo"
+msgstr ""
 
-#: src/bin/e_eap_editor.c:534
-#, fuzzy
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr "Opções de Preenchimento"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
@@ -1013,58 +930,52 @@ msgid "Show in Menus"
 msgstr "Mostar nos Menus"
 
 #: src/bin/e_eap_editor.c:543
-#, fuzzy
 msgid "Desktop file"
-msgstr "Nome da Área de Trabalho"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:544
-#, fuzzy
 msgid "Filename"
-msgstr "Renomear"
+msgstr ""
 
 #: src/bin/e_eap_editor.c:573
 msgid "Select an Icon"
 msgstr "Selecione um Ícone"
 
 #: src/bin/e_eap_editor.c:642
-#, fuzzy
 msgid "Select an Executable"
-msgstr "Selecione uma Imagem"
+msgstr ""
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
-#, fuzzy
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
-msgstr "Customizado"
+msgstr ""
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr ""
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
-#, fuzzy
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
-msgstr "Vidraça"
+msgstr ""
 
 #: src/bin/e_entry.c:529
-#, fuzzy
 msgid "Select All"
-msgstr "Apagar Tudo"
+msgstr ""
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Erro ao Rodar"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -1073,11 +984,11 @@ msgstr ""
 "Enlightenment está impossibilitado de bifurcar um processo filho:<br><br>%"
 "s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Erro ao executar aplicativo"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1086,326 +997,308 @@ 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, 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:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Erro ao Rodar"
+msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Erro ao Rodar"
+msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Erro ao Rodar"
+msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
-#, fuzzy
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
-msgstr "Linear"
+msgstr ""
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
-#, fuzzy
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "Sobre"
+msgstr ""
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
-#, fuzzy
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr "Configurações de Seleção"
+msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
-#, fuzzy
 msgid "View Mode"
-msgstr "Modo Básico"
+msgstr ""
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Erro ao Rodar"
+msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
-#, fuzzy
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr "Usar Padrão"
+msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
-#, fuzzy
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr "Ícones de Arquivo"
+msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
-#, fuzzy
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr "Customizado"
+msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
-#, fuzzy
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
-msgstr "Lista da Janela"
+msgstr ""
 
-#: src/bin/e_fm.c:8429
-#, fuzzy, c-format
+#: src/bin/e_fm.c:8392
+#, c-format
 msgid "Icon Size (%d)"
-msgstr "Tamanho da Fonte:"
+msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
-#, fuzzy
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr "Papéis de Parede"
+msgstr ""
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
-#, fuzzy
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr "Conteúdo da Bandeja"
+msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
-#, fuzzy
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
-msgstr "Próximo"
+msgstr ""
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
-#, fuzzy
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
-msgstr "Reiniciar"
+msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
-#, fuzzy
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
-msgstr "Erro ao Rodar"
+msgstr ""
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
-#, fuzzy
+#: src/bin/e_fm.c:9027
 msgid "Warning"
-msgstr "Inicializando %s"
+msgstr ""
 
-#: src/bin/e_fm.c:9067
-#, fuzzy, c-format
+#: src/bin/e_fm.c:9030
+#, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr "Você tem certeza que deseja apagar<br><hilight>%s</hilight> ?"
+msgstr ""
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1418,145 +1311,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Propriedades do Arquivo"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Última Modificação:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tipo do Arquivo:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Outros podem ler"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Outros podem escrever"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Dono pode ler"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Dono pode escrever"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Prever"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Padrão"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Customizado"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Usar este ícone para arquivos deste tipo"
 
-#: src/bin/e_fm_prop.c:456
-#, fuzzy
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr "Informação do Erro"
+msgstr ""
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
-#, fuzzy, c-format
+#: src/bin/e_fm_hal.c:222
+#, c-format
 msgid "Unknown Volume"
-msgstr "Desconhecido"
+msgstr ""
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Capaz de ser redimensionado"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Iniciar mover/redimensionar este gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Remover este gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/redimensionar este gadget"
 
@@ -1568,7 +1464,7 @@ msgstr ""
 "Uma instância prévia do Enlightenment está ativa\n"
 "nesta tela ainda. Abortando inicialização.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Travas de Janela"
 
@@ -1603,21 +1499,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Empilhamento"
 
@@ -1626,12 +1522,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Estado protegido"
 
@@ -1640,7 +1536,7 @@ msgid "Maximized state"
 msgstr "Estado maximizado"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Estado tela cheia"
 
@@ -1648,7 +1544,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Estilo da borda"
 
@@ -1673,9 +1569,8 @@ msgid "Edit Icon"
 msgstr "Editar Ícone"
 
 #: src/bin/e_int_border_menu.c:78
-#, fuzzy
 msgid "Add Application..."
-msgstr "Adicionar Aplicação"
+msgstr ""
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
@@ -1694,129 +1589,121 @@ msgid "Unpin from Desktop"
 msgstr "Desprender da Área de Trabalho"
 
 #: src/bin/e_int_border_menu.c:131
-#, fuzzy
 msgid "More..."
-msgstr "Importar..."
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Iconificar"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:485
-#, fuzzy
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
-msgstr "Teclado & Mouse"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
-#, fuzzy
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
-msgstr "Menu de Favoritos"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
-#, fuzzy
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
-msgstr "Lançar"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
-msgstr "Borda "
+msgstr "Borda"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Estado"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propriedades da Janela"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Sempre por Cima"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Sempre por Baixo"
 
-#: src/bin/e_int_border_menu.c:922
-#, fuzzy
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
-msgstr "Estilo de Borda Padrão"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
-#, fuzzy
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr "Usar icone fornecido pelo aplicativo ao invés"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
-#, fuzzy
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
-msgstr "Usar Diretórios Definidos"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Protegido"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
-msgstr "Viscoso"
+msgstr ""
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Tela Cheia"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
-#, fuzzy
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
-msgstr "Pular Barra de Tarefas"
+msgstr ""
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
@@ -1830,7 +1717,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propriedades ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Título"
 
@@ -1922,11 +1809,11 @@ msgstr "Propriedades do NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Pular Barra de Tarefas"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Pular Pager"
 
@@ -1934,15 +1821,15 @@ msgstr "Pular Pager"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Lembrar Janela"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 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:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1967,11 +1854,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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nenhuma combinação de propriedades designada"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1983,161 +1870,137 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Você está tentando pedir ao Enlightenment para lembrar de "
-"aplicar<br>propriedades (como tamanho, localização, estilo da borda, etc) "
-"para<br>uma janela quie<hilight>não tem propriedades únicas</hilight>."
-"<br><br>Parece que isto compartilha as propriedades de Nome/Classe, "
-"Transição, Papel, etc.,<br>com mais do que 1 outra janela na tela e "
-"lembrando<br>propriedades para esta janela vai aplicar para todas as outras "
-"janelas<br>que combinam com estas propriedades.<br><br> Você pode desejar "
-"ativar a opção <hilight>Combinar somente uma janela</hilight> se você "
-"somente pretende que uma instância desta janela seja modificada, com<br>as "
-"instâncias adicionais não sendo modificadas.<br><br>Isto é apenas uma "
-"advertência no caso de você não pretenda que isso aconteça.<br>Se você quer, "
-"simplesmente pressione os botões <hilight>Aplicar</hilight> ou <hilight>OK</"
-"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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Tamanho e Posição"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Travas"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Tamanho, Posição e Travas"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Qualquer coisa"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Lembrar usando"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nome da janela e classe"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Papel da Janela"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tipo da Janela"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Transiente"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propriedades para lembrar"
 
-#: src/bin/e_int_border_remember.c:521
-#, fuzzy
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
-msgstr "Não Preferido"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Área de Trabalho Virtual"
 
-#: src/bin/e_int_border_remember.c:531
-#, fuzzy
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
-msgstr "Customizar Trava de Tela"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Pular Lista da Janela"
 
-#: src/bin/e_int_border_remember.c:541
-msgid "Match only one window"
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Iniciar este programa no login"
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Iniciar este programa no login"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
-#, fuzzy
 msgid "Settings"
-msgstr "Configurações do Menu"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 #: src/modules/wizard/page_050.c:26
-#, fuzzy
 msgid "File Manager"
-msgstr "Gerenciador"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:44
-#, fuzzy
 msgid "Shelf"
-msgstr "Bandeja #"
+msgstr ""
 
 #: src/bin/e_int_config_modules.c:120
 msgid "Module Settings"
 msgstr "Configurações dos Módulos"
 
-#: src/bin/e_int_config_modules.c:181
-#, fuzzy
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
-msgstr "Gadgets Disponíveis"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:188
-#, fuzzy
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
-msgstr "Módulos"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:195
-#, fuzzy
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
-msgstr "Módulos"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:202
-#, fuzzy
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
-msgstr "Erro carregando Módulo"
+msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2148,9 +2011,8 @@ msgid "Shelf Contents"
 msgstr "Conteúdo da Bandeja"
 
 #: src/bin/e_int_gadcon_config.c:42
-#, fuzzy
 msgid "Toolbar Contents"
-msgstr "Conteúdo da Bandeja"
+msgstr ""
 
 #: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
 msgid "Available Gadgets"
@@ -2169,12 +2031,11 @@ msgid "Remove Gadget"
 msgstr "Remover Gadget"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
-#, fuzzy
 msgid "Toolbar Settings"
-msgstr "Configurações dos Módulos"
+msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Esquema"
 
@@ -2201,12 +2062,12 @@ msgid "Favorite Applications"
 msgstr "Aplicativos Favoritos"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
-msgstr "Aplicativos"
+msgstr "Aplicações"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2215,7 +2076,7 @@ msgstr "Aplicativos"
 msgid "Windows"
 msgstr "Janelas"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Janelas Perdidas"
 
@@ -2248,140 +2109,133 @@ msgid "(No Applications)"
 msgstr "(Sem Aplicativos)"
 
 #: src/bin/e_int_menus.c:709
-#, fuzzy
 msgid "Set Virtual Desktops"
-msgstr "Áreas de Trabalho Virtuais"
+msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Sem Janelas)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Configurações da Bandeja"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pequeno"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Médio"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Gigante"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr "Conteúdo da Bandeja"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Sobre Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Abaixo das Janelas"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Abaixo de Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Encolher ao Tamanho do Conteúdo"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:684
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr "Esconder Automaticamente"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Esconder automaticamente a bandeja"
 
-#: src/bin/e_int_shelf_config.c:689
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
-msgstr "Mostrar na zona da tela #:"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Timeout para esconder"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Esconder duração"
 
-#: src/bin/e_int_shelf_config.c:722
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
-msgstr "Mostrar a Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_int_shelf_config.c:724
-#, fuzzy
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
-msgstr "Mostrar a Área de Trabalho"
+msgstr ""
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2414,7 +2268,7 @@ msgstr ""
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "\t-display DISPLAY\n"
@@ -2441,26 +2295,6 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
-"Opções:\n"
-"\t-display DISPLAY\n"
-"\t\tConecta à tela de nome DISPLAY.\n"
-"\t\tEx.: -display :1.0\n"
-"\t-fake-xinerama-screen WxH+X+Y\n"
-"\t\tAdiciona uma FALSA tela de xinerama (ao invés de uma real)\n"
-"\t\tdada a geometria. Adiciona quantas você quiser. Todas\n"
-"\t\tsubstituirão as telas reais de xinerama, se houver. Isso poder\n"
-"\t\tser usado para simular xinerama.\n"
-"\t\tEx.: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
-"+0\n"
-"\t-profile CONF_PROFILE\n"
-"\t\tUsa o perfil de configuração CONF_PROFILE ao invés do que o usuário "
-"selecionou comopadrão ou apenas \"padrão\".\n"
-"\t-good\n"
-"\t\tSeja bom.\n"
-"\t-evil\n"
-"\t\tSeja mal.\n"
-"\t-psychotic\n"
-"\t\tSeja psicótico.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
@@ -2588,14 +2422,12 @@ msgid "Enlightenment cannot set up its config system."
 msgstr "Enlightenment não pode ativar seu sistema de configuração."
 
 #: src/bin/e_main.c:592
-#, fuzzy
 msgid "Enlightenment cannot set up its scale system."
-msgstr "Enlightenment não pode ativar seu sistema de bandeja."
+msgstr ""
 
 #: src/bin/e_main.c:600
-#, fuzzy
 msgid "Enlightenment cannot set up the pointer system."
-msgstr "Enlightenment não pode ativar seu sistema de internacionalização."
+msgstr ""
 
 #: src/bin/e_main.c:609
 msgid ""
@@ -2621,7 +2453,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment não pode ativar seu sistema de internacionalização."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2629,11 +2461,11 @@ msgstr ""
 "Enlightenment não pode ativar a tela de inicialização.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2642,7 +2474,7 @@ msgstr ""
 "favor cheque\n"
 "se Evas tem suporte a engine do Software Buffer.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2651,7 +2483,7 @@ msgstr ""
 "o Evas tem\n"
 "suporte ao carregamento de PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2660,7 +2492,7 @@ msgstr ""
 "se o Evas tem\n"
 "suporte ao carregamento de JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2669,23 +2501,18 @@ msgstr ""
 "o Evas tem\n"
 "suporte ao carregamento de EET.\n"
 
-#: src/bin/e_main.c:722
-#, fuzzy
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
-"Enlightenment descobriu que o Evas não pode carregar arquivos PNG. Cheque se "
-"o Evas tem\n"
-"suporte ao carregamento de PNG.\n"
 
-#: src/bin/e_main.c:732
-#, fuzzy
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
-msgstr "Tela"
+msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2694,210 +2521,194 @@ msgstr ""
 "em seu sistema.\n"
 "Talvez outro gerenciador de janela esteja rodando?\n"
 
-#: src/bin/e_main.c:743
-#, fuzzy
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
-msgstr "Proteção de Tela"
+msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment não pode congigurar a proteção de tela do X."
 
-#: src/bin/e_main.c:752
-#, fuzzy
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
-msgstr "Enviar para Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de travamento da área de trabalho."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Comandos do Sistema.\n"
 
-#: src/bin/e_main.c:797
-#, fuzzy
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
-msgstr "Inicializar Aplicativos"
+msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment não pode ativar seu sistema de ações."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment não pode ativar seu sistema de execução."
 
-#: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Lembrar"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment não pode instalar as configurações de lembrança."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment não pode ativar seu sistema de mensagem."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment não pode ativar seu sistema dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de manipulação da garra de entrada."
 
-#: src/bin/e_main.c:879
-#, fuzzy
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
-msgstr "Módulos"
+msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment não pode ativar seu sistema de módulo."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
-#, fuzzy
-msgid "Setup Color Classes"
-msgstr "Classes de Cor"
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment não pode instalar as configurações de lembrança."
 
 #: src/bin/e_main.c:894
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment não pode ativar seu sistema de casse de cor."
 
-#: src/bin/e_main.c:899
-#, fuzzy
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
-msgstr "Comando de Instalar"
+msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment não pode ativar seu sistema de controle de gadgets."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment não pode configurar as configurações DPMS"
 
-#: src/bin/e_main.c:918
-#, fuzzy
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
-msgstr "Ajustar Política de Energia da CPU"
+msgstr ""
 
-#: src/bin/e_main.c:922
-#, fuzzy
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr "Enlightenment não pode ativar seu sistema de popup."
+msgstr ""
 
-#: src/bin/e_main.c:927
-#, fuzzy
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
-msgstr "Papel de Parede da Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de fundo da área de trabalho."
 
-#: src/bin/e_main.c:937
-#, fuzzy
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
-msgstr "Virar Área de Trabalho com o Mouse"
+msgstr ""
 
-#: src/bin/e_main.c:942
-#, fuzzy
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr "Enlightenment não pode configurar as configurações DPMS"
+msgstr ""
 
-#: src/bin/e_main.c:947
-#, fuzzy
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
-msgstr "Atalhos do Teclado"
+msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment não pode ativar seu sistema de ligações."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment não pode ativar seu sistema de popup."
 
-#: src/bin/e_main.c:967
-#, fuzzy
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
-msgstr "Bandejas"
+msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment não pode ativar seu sistema de bandeja."
 
-#: src/bin/e_main.c:977
-#, fuzzy
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
-msgstr "Miniatura"
+msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Miniaturização.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
-#, fuzzy
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
-msgstr "Módulos"
+msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2910,11 +2721,11 @@ msgstr ""
 "diálogo de configuração de módulos pode permitir que você selecione<br>seus "
 "módulos novamente."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment deixou de funcionar cedo ao iniciar e foi reiniciado"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2927,16 +2738,15 @@ msgstr ""
 "<br><br>A janela de diálogo de configuração de módulos pode permitir que "
 "você selecione seus<br>módulos novamente."
 
-#: src/bin/e_main.c:1050
-#, fuzzy
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
-msgstr "Bandejas Configuradas"
+msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2945,11 +2755,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Erro carregando Módulo"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2958,11 +2768,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:150
+#: src/bin/e_module.c:159
 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:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2973,12 +2783,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s do Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
@@ -2989,11 +2799,11 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Você tem certeza que deseja apagar esta bandeja?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -3001,27 +2811,25 @@ msgstr ""
 "Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
 "deletar isso?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1703
-#, fuzzy
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr "Conteúdo da Bandeja"
+msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Apagar esta Bandeja"
 
 #: src/bin/e_startup.c:66
-#, fuzzy
 msgid "Starting"
-msgstr "Inicializando %s"
+msgstr ""
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
@@ -3032,11 +2840,11 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problemas no logout"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -3046,235 +2854,206 @@ msgstr ""
 "<br>Você deseja terminar o logout<br>de qualquer maneira sem fechar "
 "estes<br>aplicativos antes?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Logout agora"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Aguardar mais"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Cancelar logout"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Logout em progresso"
 
-#: src/bin/e_sys.c:366
-#, fuzzy
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
-"Logout está correntemente em progresso.<br><hilight>Por favor aguarde</"
-"hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment está ocupado com outra requisição"
 
-#: src/bin/e_sys.c:401
-#, fuzzy
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
-"Enlightenment está ocupando fazendo o logout.<br>Você não pode fazer outras "
-"ações no sistema<br>uma vez que o logout começou."
 
-#: src/bin/e_sys.c:409
-#, fuzzy
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
-"Enlightenment está desligando o sistema.<br>Você não pode fazer outras ações "
-"no sistema<br>uma vez que o desligamento começou."
 
-#: src/bin/e_sys.c:416
-#, fuzzy
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
-"Enlightenment está restartando o sistema.<br.Você não pode fazer outras "
-"ações no sistema<br>uma vez que restart começou."
 
-#: src/bin/e_sys.c:423
-#, fuzzy
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
-"Enlightenment está suspendendo o sistema.<br>Até que a suspenção esteja "
-"completa você não pode fazer<br>nenhuma outras ações no sistema."
 
-#: src/bin/e_sys.c:430
-#, fuzzy
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
-"Enlightenment está hibernando o sistema.<br>Você não pode fazer outras ações "
-"no sistema<br>até que isto esteja completo."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "HIC! Isto parece não ser legal"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
-#, fuzzy
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr "Nome da Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_sys.c:473
-#, fuzzy
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr "Tempo para suspender"
+msgstr ""
 
-#: src/bin/e_sys.c:478
-#, fuzzy
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
-msgstr "Falha ao hibernar seu sistema."
+msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
-#, fuzzy
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Reiniciando seu Computador.<br><hilight>Por favor aguarde</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:562
-#, fuzzy
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr "Configurações da Área de Trabalho"
+msgstr ""
 
-#: src/bin/e_sys.c:565
-#, fuzzy
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Reiniciando seu Computador.<br><hilight>Por favor aguarde</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Suspendendo"
 
-#: src/bin/e_sys.c:591
-#, fuzzy
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Suspendendo seu Computador.<br><hilight>Por favor aguarde</hilight>"
+msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernando"
 
-#: src/bin/e_sys.c:617
-#, fuzzy
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr "Hibernando seu Computador<br><hilight>Por favor aguarde</hilight>"
+msgstr ""
 
 #: src/bin/e_theme_about.c:17
-#, fuzzy
 msgid "About Theme"
-msgstr "Sobre Este Tema"
+msgstr ""
 
 #: src/bin/e_theme.c:42
-#, fuzzy
 msgid "Set As Theme"
-msgstr "Selecione um Tema..."
+msgstr ""
 
 #: src/bin/e_toolbar.c:340
-#, fuzzy
 msgid "Set Toolbar Contents"
-msgstr "Conteúdo da Bandeja"
+msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Não pode sair - janelas imortais."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr "Algumas janelas"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "No Futuro"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "No último Minuto"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Anos atrás"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Meses atrás"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Semanas atrás"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dias atrás"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Horas atrás"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minutos atrás"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3291,62 +3070,60 @@ msgstr ""
 
 #: src/bin/e_widget_config_list.c:89
 #: src/modules/conf_applications/e_int_config_apps.c:263
-#, fuzzy
 msgid "Down"
-msgstr "Desligar"
+msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Adicionar a Favoritos"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Subir um Diretório"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permissões:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Você"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Somente Leitura"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Leitura-Gravação"
 
 #: src/modules/battery/e_mod_config.c:41
-#, fuzzy
 msgid "Battery Monitor Settings"
-msgstr "Configuração do Monitor de Bateria"
+msgstr ""
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
@@ -3356,78 +3133,70 @@ msgstr "Configurações Básicas"
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_config.c:137
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr "Checar bateria a cada:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f ticks"
-msgstr "%1.0f arquivos"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
-msgstr "Plano"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
-msgstr "Mostrar alerta quando a bateria estiver baixa"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr "Alertar quando a bateria estiver abaixo de:"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
 msgid "%1.0f min"
-msgstr "%1.0f minutos"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
 msgid "%1.0f %%"
-msgstr "%3.0f%%"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
-#, fuzzy, c-format
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
 msgid "%1.0f sec"
-msgstr "%1.1f seg"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr "Acelerar"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
-#, fuzzy
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr "Esconder Automaticamente"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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 "Geral"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
-#, fuzzy
 msgid "HAL"
-msgstr "ALT"
+msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3435,53 +3204,47 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:844
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
-msgstr "Mostrar alerta quando a bateria estiver baixa"
+msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
-msgstr "Bateria"
+msgstr ""
 
 #: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
 msgstr "Relógio"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr "Configurações do Menu"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr "Configurações da Área de Trabalho"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr "Tempo da desligar"
+msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
-#, fuzzy
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr "Módulos"
+msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3505,24 +3268,21 @@ msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
-#, fuzzy
 msgid "Selected Applications"
-msgstr "Aplicativos Específicos"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:34
-#, fuzzy
 msgid "Apps"
-msgstr "Aplicar"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:35
-#, fuzzy
 msgid "New Application"
-msgstr "Aplicativo"
+msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
@@ -3530,12 +3290,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menus"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Estilo de Borda Padrão"
 
@@ -3543,14 +3303,14 @@ msgstr "Estilo de Borda Padrão"
 msgid "Window Border Selection"
 msgstr "Seleção da Borda da Janela"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Lembrar esta Borda desta janela na próxima vez que ela aparecer."
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3558,9 +3318,8 @@ msgstr "Lembrar esta Borda desta janela na próxima vez que ela aparecer."
 #: src/modules/conf_transitions/e_mod_main.c:34
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
-#, fuzzy
 msgid "Look"
-msgstr "Travas"
+msgstr ""
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
@@ -3577,7 +3336,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3602,9 +3361,8 @@ msgid "Using menus"
 msgstr "Usando menus"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:122
-#, fuzzy
 msgid "Client Sort Order"
-msgstr "Ordem do Sorteio do Cliente"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
 msgid "Alphabetical"
@@ -3639,9 +3397,8 @@ msgid "Warp to owning desktop"
 msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
-#, fuzzy
 msgid "Menu Item Captions"
-msgstr "Títulos do Menu de Item"
+msgstr ""
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
@@ -3657,124 +3414,102 @@ msgid "Client List Menu"
 msgstr "Menu da Lista do Cliente"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
-#, fuzzy
 msgid "Window Manager"
-msgstr "Gerenciador de Cores da Janela"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
-#, fuzzy
 msgid "About Dialog Title"
-msgstr "Sobre Este Tema"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
 msgid "About Dialog Version"
 msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
-#, fuzzy
 msgid "Border Title"
-msgstr "Estilo da borda"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
-#, fuzzy
 msgid "Settings Dialog Title"
-msgstr "Configuração de Janelas de Diálogo"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
-#, fuzzy
 msgid "Error Text"
-msgstr "Logs de Erro"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 #: src/modules/conf_fonts/e_int_config_fonts.c:63
-#, fuzzy
 msgid "Menu Title"
-msgstr "Título"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
-#, fuzzy
 msgid "Menu Title Active"
-msgstr "Títulos do Menu de Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
-#, fuzzy
 msgid "Menu Item"
-msgstr "Títulos do Menu de Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
-#, fuzzy
 msgid "Menu Item Active"
-msgstr "Títulos do Menu de Item"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
-#, fuzzy
 msgid "Move Text"
-msgstr "Mover para Cima"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
 #: src/modules/conf_fonts/e_int_config_fonts.c:68
-#, fuzzy
 msgid "Resize Text"
-msgstr "Redimensionar"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
-#, fuzzy
 msgid "Winlist Item"
-msgstr "Lista da Janela"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
-#, fuzzy
 msgid "Winlist Label"
-msgstr "Lista da Janela"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
-#, fuzzy
 msgid "Winlist Title"
-msgstr "Título do Display"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 #: src/modules/conf_fonts/e_int_config_fonts.c:82
-#, fuzzy
 msgid "Widgets"
-msgstr "Cores do Widget"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
-#, fuzzy
 msgid "Button Text"
-msgstr "Botão %i"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:69
-#, fuzzy
 msgid "Button Text Disabled"
-msgstr "Configurações dos Botões"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
-#, fuzzy
 msgid "Check Text"
-msgstr "Checar bateria a cada:"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
-#, fuzzy
 msgid "Check Text Disabled"
-msgstr "Configurações dos Botões"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
-#, fuzzy
 msgid "Entry Text"
-msgstr "Logs de Erro"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
-#, fuzzy
 msgid "Label Text"
-msgstr "Rótulos dos Ícones"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
-#, fuzzy
 msgid "List Item Text"
-msgstr "Menu da Lista do Cliente"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "List Item Odd Text"
@@ -3782,34 +3517,28 @@ msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:76
 #: src/modules/conf_fonts/e_int_config_fonts.c:92
-#, fuzzy
 msgid "List Header"
-msgstr "Guia do Cliente"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
-#, fuzzy
 msgid "Radio Text"
-msgstr "Redimensionar"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
-#, fuzzy
 msgid "Radio Text Disabled"
-msgstr "Configurações dos Botões"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
-#, fuzzy
 msgid "Slider Text"
-msgstr "Tamanho"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
-#, fuzzy
 msgid "Slider Text Disabled"
-msgstr "Configurações dos Botões"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
-#, fuzzy
 msgid "Module Label"
-msgstr "Estado do Módulo"
+msgstr ""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:130
 #: src/modules/conf_colors/e_mod_main.c:35
@@ -3836,7 +3565,7 @@ msgstr "Ativado"
 #: src/modules/conf_colors/e_int_config_color_classes.c:455
 #: src/modules/conf_colors/e_int_config_color_classes.c:522
 msgid "Disabled"
-msgstr "Desativado"
+msgstr "Desactivado"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:443
 msgid "Widget Colors"
@@ -3875,9 +3604,9 @@ msgid "Desktop Name"
 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:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nome:"
 
@@ -3887,14 +3616,12 @@ msgstr "Papel de Parede da Área de Trabalho"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
-#, fuzzy
 msgid "Set"
-msgstr "Estender"
+msgstr ""
 
 #: src/modules/conf_desk/e_mod_main.c:35
-#, fuzzy
 msgid "Desk"
-msgstr "Área de Trabalho"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
@@ -3905,18 +3632,16 @@ msgid "Automatic Locking"
 msgstr "Travamento Automático"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
-#, fuzzy
 msgid "Lock when Enlightenment starts"
-msgstr "Usar Cursor do Enlightenment"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
 msgstr "Travar quando o X screensaver iniciar"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
-#, fuzzy
 msgid "Time after screensaver activated"
-msgstr "Tempo até que o X screensaver alterne"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3947,17 +3672,17 @@ msgstr "%1.0f minutos"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Pessoal"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
-msgstr "Configurações da Caixa de Login "
+msgstr "Configurações da Caixa de Login"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
@@ -3982,8 +3707,8 @@ msgstr "Mostrar na zona da tela #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -4003,9 +3728,8 @@ msgid "Theme Wallpaper"
 msgstr "Papel de Parede do Tema"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
-#, fuzzy
 msgid "User Wallpaper"
-msgstr "Usar Papel de Parede do Tema"
+msgstr ""
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
@@ -4053,9 +3777,8 @@ msgid "Animated flip"
 msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:277
-#, fuzzy
 msgid "Desktops"
-msgstr "Área de Trabalho"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
@@ -4089,9 +3812,8 @@ msgid "%1.1f sec"
 msgstr "%1.1f seg"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
-#, fuzzy
 msgid "Background panning"
-msgstr "Mudança de Fundo"
+msgstr ""
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
@@ -4107,50 +3829,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Áreas de Trabalho Virtuais"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr "Ajustes dos Diálogos de Configuração"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr "Configuração de Janelas de Diálogo"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr "(Sem Janelas)"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
-#, fuzzy
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr "Modo de Diálogo Padrão"
+msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Modo Básico"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Modo Avançado"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Modo de Diálogo Padrão"
 
@@ -4159,93 +3882,78 @@ msgid "Dialogs"
 msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:129
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored in %d seconds."
 msgstr ""
-"Isto parece estar OK? Pressione <hilight>Sim</hilight> se tudo bem , ou Não "
-"se não estiver bom.<br>Se você não pressionar um botão, a resolução antiga "
-"de<br>%dx%d em %d Hz será restaurada em %d segundos."
 
 #: src/modules/conf_display/e_int_config_display.c:136
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
-"Isto parece estar OK? Pressione <hilight>Sim</hilight> se tudo bem , ou Não "
-"se não estiver bom.<br>Se você não pressionar um botão, a resolução antiga "
-"de<br>%dx%d será restaurada em %d segundos."
 
 #: src/modules/conf_display/e_int_config_display.c:146
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
 "will be restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Isto parece estar OK? Pressione <hilight>Sim</hilight> se tudo bem , ou Não "
-"se não estiver bom.<br>Se você não pressionar um botão, a resolução antiga "
-"de<br>%dx%d em %d Hz será restaurada <hilight>IMEDIATAMENTE</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:153
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
-"Isto parece estar OK? Pressione <hilight>Sim</hilight> se tudo bem , ou Não "
-"se não estiver bom.<br>Se você não pressionar um botão, a resolução antiga "
-"de<br>%dx%d será restaurada <hilight>IMEDIATAMENTE</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
 msgstr "Mudar resolução"
 
 #: src/modules/conf_display/e_int_config_display.c:194
-#, fuzzy
 msgid "Save"
-msgstr "Estado"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:195
-#, fuzzy
 msgid "Restore"
-msgstr "Reiniciar"
+msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
 msgstr "Configurações da Resolução da Tela"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaurar ao logar-se"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Atualisar"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotação"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Espelhamento"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Características Perdidas"
 
-#: src/modules/conf_display/e_int_config_display.c:642
-#, fuzzy
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4253,17 +3961,12 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
-"Seus Servidor X está com falta da<br>extensão <hilight>XRandr</hilight> (X "
-"Resize and Rotate).<br> Você não poderá mudar as resoluções de tela sem<br>o "
-"suporte a esta extensão. Pode ter sido<br>que na hora em que o "
-"<hilight>ecore</hilight> foi criado, não havia sido detectado o suporte ao "
-"XRandr."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Nenhuma Taxa de Atualização Encontrada"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4295,19 +3998,16 @@ msgid "The current display server does not <br>have the DPMS extension."
 msgstr "O servidor de tela corrente não<br>tem a extensão DPMS."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
-#, fuzzy
 msgid "Display Power Management Settings"
-msgstr "Ajustes da Exibição de Gerenciamento de Energia"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:198
-#, fuzzy
 msgid "Enable Display Power Management"
-msgstr "Ativar Exibição de Gerenciamento de Energia"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
-#, fuzzy
 msgid "Timers"
-msgstr "Temporizador(es)"
+msgstr ""
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
@@ -4326,7 +4026,7 @@ msgid "Power Management"
 msgstr "Gerenciamento de Energia"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4336,113 +4036,107 @@ msgstr "<Nenhum>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr "Configurações de Ligações das Teclas"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
-#, fuzzy
 msgid "Edge Bindings"
-msgstr "Atalhos do Teclado"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr "Adicionar Gadget"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr "ApagarTecla"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr "Modificar Tecla"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Apagar Tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Restaurar Ligações Padrões"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parâmetros da Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr "Configurações Gerais"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr "Sequência de Ligações das Teclas"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
 msgid "%.2f seconds"
-msgstr "%2.2f segundos"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
-#, fuzzy
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr "Erro na Ligação de Tecla"
+msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
-#, fuzzy, c-format
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
-"A sequência de ligação de teclas, que você escolheu, já está em uso pela "
-"ação <br><hilight>%s</hilight>.<br>Por favor escolha outra sequência de "
-"ligação de teclas."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4452,23 +4146,20 @@ msgstr "WIN"
 #: src/modules/conf_mousebindings/e_mod_main.c:34
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
-#, fuzzy
 msgid "Input"
-msgstr "Init"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
-#, fuzzy
 msgid "Engine Settings"
-msgstr "Configurações de Tamanho"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:95
 msgid "Enable Composite"
 msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
-#, fuzzy
 msgid "Default Engine"
-msgstr "Padrão"
+msgstr ""
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
@@ -4600,14 +4291,12 @@ msgid "Run Command"
 msgstr "Executar Comando"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
-#, fuzzy
 msgid "Core"
-msgstr "Fechar"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
-#, fuzzy
 msgid "Title Bar"
-msgstr "Título"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
@@ -4622,29 +4311,24 @@ msgid "Textblock Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
-#, fuzzy
 msgid "Settings Heading"
-msgstr "Configurações do Menu"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
-#, fuzzy
 msgid "About Title"
-msgstr "Sobre Este Tema"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
-#, fuzzy
 msgid "About Version"
-msgstr "Sobre"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
-#, fuzzy
 msgid "About Text"
-msgstr "Sobre"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:74
-#, fuzzy
 msgid "Desklock Title"
-msgstr "Título do Display"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
@@ -4655,99 +4339,80 @@ msgid "Dialog Error"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
-#, fuzzy
 msgid "Exebuf Command"
-msgstr "Executar Comando"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
-#, fuzzy
 msgid "Splash Title"
-msgstr "Título do Display"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:79
-#, fuzzy
 msgid "Splash Text"
-msgstr "Título do Display"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:80
-#, fuzzy
 msgid "Splash Version"
-msgstr "Título do Display"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:83
-#, fuzzy
 msgid "Entry"
-msgstr "Reiniciar"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:84
-#, fuzzy
 msgid "Frame"
-msgstr "Taxa de Amostragem"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:85
-#, fuzzy
 msgid "Label"
-msgstr "Rótulos dos Ícones"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:86
-#, fuzzy
 msgid "Buttons"
-msgstr "Botão %i"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:87
-#, fuzzy
 msgid "Slider"
-msgstr "Tamanho"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
-#, fuzzy
 msgid "Radio Buttons"
-msgstr "Botão %i"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:89
-#, fuzzy
 msgid "Check Buttons"
-msgstr "Botão %i"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:90
-#, fuzzy
 msgid "Text List Item"
-msgstr "Menu da Lista do Cliente"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
-#, fuzzy
 msgid "List Item"
-msgstr "Menu da Lista do Cliente"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
-#, fuzzy
 msgid "Filemanager"
-msgstr "Gerenciador"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
-#, fuzzy
 msgid "Typebuf"
-msgstr "Tipo do Arquivo:"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
-#, fuzzy
 msgid "Desktop Icon"
-msgstr "Travar Área de Trabalho"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
-#, fuzzy
 msgid "Small Styled"
-msgstr "Normal"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
-#, fuzzy
 msgid "Normal Styled"
-msgstr "Normal"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
-#, fuzzy
 msgid "Large Styled"
-msgstr "Normal"
+msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
@@ -4762,23 +4427,21 @@ msgid "Really Big"
 msgstr ""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "%d pixels"
-msgstr "%2.0f pixels"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
-#, fuzzy
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
-msgstr "Ativar Classe da Fonte"
+msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4786,37 +4449,49 @@ msgstr ""
 msgid "Font Classes"
 msgstr "Classes da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Ativar Classe da Fonte"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Sugerindo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Recuos da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nome do Recuo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Ativar Recuos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4831,7 +4506,7 @@ msgstr "Temas dos Ícones"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema do ìcone"
 
@@ -4879,9 +4554,8 @@ msgid "Exported Environment Variables"
 msgstr "Exportar Variáveis de Ambiente"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
-#, fuzzy
 msgid "Select an Input Method Settings..."
-msgstr "Selecione uma Configuração do Método de Entrada..."
+msgstr ""
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
@@ -4904,19 +4578,17 @@ msgstr ""
 "erro de cópia."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Linguagem"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
-#, fuzzy
 msgid "Interaction Settings"
-msgstr "Configurações de Seleção"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
-#, fuzzy
 msgid "Thumbscroll"
-msgstr "Miniatura"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
@@ -4937,23 +4609,22 @@ msgid "Threshold for applying drag momentum"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f pixels/sec"
-msgstr "%5.0f pixel/seg"
+msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
 msgstr ""
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f sec"
-msgstr "%1.1f seg"
+msgstr ""
 
 #: src/modules/conf_interaction/e_mod_main.c:35
-#, fuzzy
 msgid "Interaction"
-msgstr "Rotação"
+msgstr ""
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
@@ -5030,21 +4701,18 @@ msgstr "Configurações do Menu"
 
 #: 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 "Configurações do Menu"
+msgstr ""
 
 #: 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 "Mostar Menu de Favoritos"
+msgstr ""
 
 #: 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 "Mostrar Todos os Menus dos Aplicativos"
+msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:111
 #: src/modules/conf_menus/e_int_config_menus.c:170
@@ -5085,7 +4753,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Margem do Cursor na Rolagem Automática"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Opções Diversas"
 
@@ -5238,15 +4906,13 @@ msgstr "Configurações do Cursor"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
-#, fuzzy
 msgid "Show Cursor"
-msgstr "Cursos do Mouse"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
-#, fuzzy
 msgid "Idle Cursor"
-msgstr "Cursos do Mouse"
+msgstr ""
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
@@ -5266,33 +4932,30 @@ msgstr "Tamanho do Cursor"
 msgid "Mouse Cursor"
 msgstr "Cursos do Mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
-#, fuzzy
 msgid "Mouse Settings"
-msgstr "Configurações dos Módulos"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
-#, fuzzy
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
-msgstr "Atalhos do Mouse"
+msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Aceleração do Mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Aceleração"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Limiar"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
-#, fuzzy
 msgid "Search Path Settings"
-msgstr "Configurações de Inicialização"
+msgstr ""
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
@@ -5303,7 +4966,7 @@ msgid "Images"
 msgstr "Imagens"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temas"
 
@@ -5352,9 +5015,8 @@ msgstr "%1.0f fps"
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
-#, fuzzy
 msgid "Application Priority"
-msgstr "Erro ao executar aplicativo"
+msgstr ""
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
@@ -5404,61 +5066,51 @@ msgstr "%1.0f coleções"
 msgid "Performance"
 msgstr "Performance"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
-msgstr "Seletor de Tema"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
-msgstr "Gadgets Disponíveis"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr "Selecione um Arquivo Edj"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr "Redimensionar"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
-#, fuzzy, c-format
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
-"Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
-"deletar isso?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
-#, fuzzy
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr "ApagarTecla"
+msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
 #: src/modules/conf_profiles/e_mod_main.c:22
-#, fuzzy
 msgid "Profiles"
-msgstr "Propriedades"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
-#, fuzzy
 msgid "Scaling Settings"
-msgstr "Ajustes de Rolagem"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
-#, fuzzy
 msgid "Relative"
-msgstr "Por cima"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
@@ -5466,9 +5118,9 @@ msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "%1.0f DPI"
-msgstr "%1.0f F"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
@@ -5480,9 +5132,8 @@ msgid "Policy"
 msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
-#, fuzzy
 msgid "Don't Scale"
-msgstr "Não Permitir"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
@@ -5500,29 +5151,25 @@ msgstr ""
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "%1.2f times"
-msgstr "%1.0f arquivos"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
-#, fuzzy
 msgid "Constraints"
-msgstr "Contêiner"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
-#, fuzzy
 msgid "Minimum"
-msgstr "Tamanho Mínimo"
+msgstr ""
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
-#, fuzzy
 msgid "Maximum"
-msgstr "Tamanho Máximo"
+msgstr ""
 
 #: src/modules/conf_scale/e_mod_main.c:35
-#, fuzzy
 msgid "Scaling"
-msgstr "Empilhamento"
+msgstr ""
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
@@ -5581,9 +5228,8 @@ msgstr "Bandejas Configuradas"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
-#, fuzzy
 msgid "Setup"
-msgstr "Inicializar"
+msgstr ""
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5611,28 +5257,25 @@ msgstr "Inicializar"
 msgid "Theme Selector"
 msgstr "Seletor de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr "Importar..."
+msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
-msgstr "Categorias"
+msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
-#, fuzzy
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
-msgstr "Apagar Tudo"
+msgstr ""
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
@@ -5658,9 +5301,8 @@ msgstr ""
 "cópia."
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
-#, fuzzy
 msgid "Exchange themes"
-msgstr "Temas dos Ícones"
+msgstr ""
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
@@ -5688,38 +5330,38 @@ msgid "Wallpaper Settings"
 msgstr "Configurações do Papel de Parede"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Usar Papel de Parede do Tema"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Figura..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradiente..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Aonde colocar o Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Todas Áreas de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Esta Área de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Esta Tela"
 
@@ -5740,14 +5382,14 @@ msgid "Fill Options"
 msgstr "Opções de Preenchimento"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5772,9 +5414,8 @@ 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:128
-#, fuzzy
 msgid "Wallpaper settings..."
-msgstr "Configurações do Papel de Parede"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5813,38 +5454,38 @@ msgstr "Usar arquivo original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Selecione uma Figura..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Erro ao Importar Figura"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment está impossibilitado de importar a figura<br>devido a erros de "
 "conversão."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Erro ao Importar Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5852,10 +5493,9 @@ 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:118
-#, fuzzy
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr "Papel de Parede do Tema"
+msgstr ""
 
 #: src/modules/conf_wallpaper/e_mod_main.c:29
 #: src/modules/conf_wallpaper/e_mod_main.c:31
@@ -5956,26 +5596,16 @@ msgid "Decelerate"
 msgstr "Desacelerar"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
-#, fuzzy
 msgid "Window Border"
-msgstr "Papel da Janela"
+msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
 msgstr ""
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:274
-#, fuzzy
 msgid "Prefer application provided icon"
-msgstr "Usar icone fornecido pelo aplicativo ao invés"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Janelas Internas"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Sempre lembrar das janelas internas"
+msgstr ""
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
@@ -6064,9 +5694,8 @@ msgstr "Foco da Janela"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
-#, fuzzy
 msgid "Window Geometry"
-msgstr "Geometria da Movimentação da Janela"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
@@ -6089,43 +5718,33 @@ msgid "Resistance to desktop gadgets:"
 msgstr "Resistência aos gadgets da área de trabalho:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
-#, fuzzy
 msgid "Keyboard move and resize"
-msgstr "Teclado & Mouse"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
-#, fuzzy
 msgid "Automatically accept changes after:"
-msgstr "Rolar conteúdo automaticamente"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
-#, fuzzy
 msgid "Move by:"
-msgstr "Mover"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
-#, fuzzy
 msgid "Resize by:"
-msgstr "Redimensionar"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
-#, fuzzy
 msgid "Window Maximize Policy"
-msgstr "Maximizar a Política"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expansão inteligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Expandir a janela"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Preencher espaço disponível"
 
@@ -6133,28 +5752,26 @@ msgstr "Preencher espaço disponível"
 msgid "Maximize Policy"
 msgstr "Maximizar a Política"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
-#, fuzzy
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr "Maximizar horizontalmente"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Permitir manipulação da janela"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automaticamente mover/redimensionar janelas ao esconder bandeja"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
-#, fuzzy
 msgid "Window Stacking"
-msgstr "Protegimento da Janela"
+msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
@@ -6186,61 +5803,59 @@ msgstr "Sobrepor quando começar a mover ou redimensionar"
 msgid "Raise when clicking to focus"
 msgstr "Sobrepor quando clicar para pegar foco"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
-#, fuzzy
 msgid "Window Remembers"
-msgstr "Lembrar Janela"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
-msgstr "Lembrar"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
-msgstr "Padrões"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr "Sem nome!!"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr "Classe"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr "Classe"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr "Título"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr "Título"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr "Papel"
+msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
-#, fuzzy
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr "<Nenhum>"
+msgstr ""
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
@@ -6315,29 +5930,24 @@ msgid "Cpufreq"
 msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:182
-#, fuzzy
 msgid "Fast (4 ticks)"
-msgstr "Rápido (0.5 seg)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:189
-#, fuzzy
 msgid "Medium (8 ticks)"
-msgstr "Médio (1 seg)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:196
-#, fuzzy
 msgid "Normal (32 ticks)"
-msgstr "Normal (2 seg)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:203
-#, fuzzy
 msgid "Slow (64 ticks)"
-msgstr "Devagar (5 seg)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:210
-#, fuzzy
 msgid "Very Slow (256 ticks)"
-msgstr "Muito Devagar (30 seg)"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -6364,9 +5974,8 @@ msgid "Powersaving policy"
 msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:280
-#, fuzzy
 msgid "Automatic powersaving"
-msgstr "Travamento Automático"
+msgstr ""
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -6421,9 +6030,8 @@ msgstr ""
 "módulo<br>utilitário setfreq."
 
 #: src/modules/dropshadow/e_mod_config.c:40
-#, fuzzy
 msgid "Dropshadow Settings"
-msgstr "Ajustes dos Diálogos de Configuração"
+msgstr ""
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6526,12 +6134,10 @@ msgid "Favorites"
 msgstr "Favoritos"
 
 #: src/modules/fileman/e_mod_main.c:334
-#, fuzzy
 msgid "Root"
-msgstr "Reiniciar"
+msgstr ""
 
 #: src/modules/fileman/e_mod_main.c:431
-#, fuzzy
 msgid ""
 "Fileman Module Settings data needed upgrading. Your old configuration<br>has "
 "been wiped and a new set of defaults initialized. This<br>will happen "
@@ -6541,17 +6147,8 @@ 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 ""
-"Dados de configuração precisam de atualização. Sua antiga "
-"configuração<br>será limpa e um novo conjunto de padrões inicializado. "
-"Isto<br>acontece regularmente durante o desenvolvimento, portanto não relate "
-"um<br>bug. Isto simplesmente acontece pois o Enlightenment precisa de dados "
-"novos de<br>configuração por padrão para funcionalidade de uso que sua "
-"contiguração<br>antiga simplesmente faltava. Este novo conjunto de padrões "
-"vai fixar<br>aquele adicionando este nele. Você pode reconfigurar as coisas "
-"agora ao seu<br>gosto. Desculpe por ?HICCUP? em sua configuração.<br>"
 
 #: src/modules/fileman/e_mod_main.c:444
-#, 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 "
@@ -6560,32 +6157,22 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"Sua configuração é mais NOVA que o Enlightenment. Isto é muito<br>estranho. "
-"Isto não pode ter acontecido a menos que você tenha desatualizado "
-"o<br>Enlightenment ou copiado a configuração de um lugar onde<br>uma versão "
-"mais nova do Enlightenment esteja rodando. Isso é ruim e<br>como precaução "
-"sua configuração será restaurada agora para<br>os padrões. Desculpe pela "
-"inconveniência.<br>"
 
 #: src/modules/fileman/e_mod_main.c:513
-#, fuzzy
 msgid "Fileman Settings Updated"
-msgstr "Configurações do Menu"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:95
-#, fuzzy
 msgid "Fileman Settings"
-msgstr "Configurações do Menu"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:227
-#, fuzzy
 msgid "Icon Size"
-msgstr "Tamanho da Fonte:"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:233
-#, fuzzy
 msgid "View"
-msgstr "Modo Básico"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
@@ -6596,9 +6183,8 @@ msgid "Sort Dirs First"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:243
-#, fuzzy
 msgid "Case Sensitive"
-msgstr "Tamanho Base"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6609,33 +6195,29 @@ msgid "Use Alternate Selection Modifiers"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:254
-#, fuzzy
 msgid "Show Icon Extension"
-msgstr "Mostrar Rótulo do Ícone"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:260
-#, fuzzy
 msgid "Show Desktop Icons"
-msgstr "Mostrar a Área de Trabalho"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:263
-#, fuzzy
 msgid "Show Toolbar"
-msgstr "Cor da Sombra"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:270
-#, fuzzy
 msgid "Show HAL icons on desktop"
-msgstr "Mostrar janelas de todas as áreas de trabalho"
+msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
@@ -6645,98 +6227,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:1525
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr "Adicionar Aplicação"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/modules/fileman/e_fwin.c:1893
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr "Aplicativos"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:1945
-#, fuzzy
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr "Executar Comando"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "ApagarTecla"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting files..."
-msgstr "Nome da Área de Trabalho"
+msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6744,14 +6323,13 @@ msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
-#, fuzzy
 msgid "(no information)"
-msgstr "Informação do Erro"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Arquivo:"
+msgstr ""
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
@@ -6763,85 +6341,72 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
-#, fuzzy, c-format
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
 msgid "Processing %d operation(s)"
-msgstr "Esconder duração"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
-#, fuzzy
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr "Gerenciador"
+msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:58
-#, fuzzy
 msgid "Gadgets Manager"
-msgstr "Gerenciador"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:147
-#, fuzzy
 msgid "Background Mode"
-msgstr "Papéis de Parede"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
-#, fuzzy
 msgid "Custom Image"
-msgstr "Customizado"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
-#, fuzzy
 msgid "Custom Color"
-msgstr "Customizado"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:160
-#, fuzzy
 msgid "Transparent"
-msgstr "Transiente"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:167
-#, fuzzy
 msgid "Animations"
-msgstr "Aplicativos"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:168
-#, fuzzy
 msgid "Background"
-msgstr "Papéis de Parede"
+msgstr ""
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
-#, fuzzy
 msgid "Gadgets"
-msgstr "Adicionar Gadget"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr "Taxa de Amostragem"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr "Sempre por Cima"
+msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
-#, fuzzy
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr "Adicionar Gadget"
+msgstr ""
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
-#, fuzzy
 msgid "Show/hide gadgets"
-msgstr "Não esconder Gadgets"
+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
@@ -6861,9 +6426,8 @@ msgid "Select a window"
 msgstr "Selecione uma janela"
 
 #: src/modules/ibar/e_mod_config.c:56
-#, fuzzy
 msgid "IBar Settings"
-msgstr "Configurações Básicas"
+msgstr ""
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
@@ -6873,7 +6437,7 @@ msgstr "Selecionada Fonte da Barra"
 msgid "Icon Labels"
 msgstr "Rótulos dos Ícones"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Mostrar Rótulo do Ícone"
 
@@ -6923,60 +6487,54 @@ msgid "Remove Icon"
 msgstr "Remover Ícone"
 
 #: src/modules/ibar/e_mod_main.c:812
-#, fuzzy
 msgid "Add An Icon"
-msgstr "Adicionar Aplicação"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:819
-#, fuzzy
 msgid "Create New Icon"
-msgstr "Criar Ícone"
+msgstr ""
 
 #: src/modules/ibar/e_mod_main.c:835
 msgid "Add Application"
 msgstr "Adicionar Aplicação"
 
-#: src/modules/ibox/e_mod_config.c:52
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr "Configurações da Caixa de Login "
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Nome do Display"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Título do Display"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Classe do Display"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Nome do Ícone do Display"
 
-#: src/modules/ibox/e_mod_config.c:125
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr "Exibir informação"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
-msgstr "MOstrar janelas de outras telas"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:160
-#, fuzzy
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
-msgstr "Mostrar janelas da zona corrente"
+msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Mostrar janelas de todas as áreas de trabalho"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Mostrar janelas da área de trabalho ativa"
 
@@ -6985,105 +6543,92 @@ msgid "IBox"
 msgstr "iBox"
 
 #: src/modules/pager/e_mod_config.c:72
-#, fuzzy
 msgid "Pager Settings"
-msgstr "Ajustes do Cache"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
-#, fuzzy
 msgid "Flip desktop on mouse wheel"
-msgstr "Virar área de trabalho com a rodinha do mouse"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
-#, fuzzy
 msgid "Show desktop names"
-msgstr "Nome da Área de Trabalho"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Configurações do Popup"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
-msgstr "Mostrar Popup ao mudar área de trabalho"
+msgstr ""
 
 #: src/modules/pager/e_mod_config.c:132
-#, fuzzy
 msgid "Show popup for urgent windows"
-msgstr "Mostrar Popup na janela urgente"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr "Selecione um Ícone"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Clique para setar"
 
-#: src/modules/pager/e_mod_config.c:174
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
-msgstr "Arraste e selecione botão"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr "Área de Trabalho Virtual"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
-msgstr "Resistência para Arrastar Janelas:"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr "Velocidade do Popup"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr "Velocidade do Popup"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:229
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr "Ajustes da Janela da Lista"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr "Mostrar Popup na janela urgente"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Arrastar Botão do Pager"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -7091,68 +6636,58 @@ msgstr ""
 "Por favor pressione um botão do mouse<br>Pressione <hilight>Escape</hilight> "
 "para abortar.<br>Or <hilight>Del</hilight> para resetar o botão."
 
-#: src/modules/pager/e_mod_config.c:343
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr "Ação"
+msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
-#, fuzzy
+#: src/modules/pager/e_mod_config.c:346
 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 ""
-"Você não pode usar o botão direito do mouse<br> porque ele já está em uso "
-"por um código<br>interno para menus de contexto."
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr "Virar Área de Trabalho a Direita"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr "Virar Área de Trabalho a Esquerda"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr "Virar Área de Trabalho Acima"
+msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
-#, fuzzy
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
-msgstr "Virar Área de Trabalho Abaixo"
+msgstr ""
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
 msgstr "Iniciar"
 
 #: src/modules/syscon/e_mod_main.c:34
-#, fuzzy
 msgid "System Control"
-msgstr "Sistema"
+msgstr ""
 
 #: src/modules/syscon/e_mod_main.c:55
 msgid "System Controls"
 msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:63
-#, fuzzy
 msgid "Temperature Settings"
-msgstr "Configurações Gerais"
+msgstr ""
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
@@ -7258,31 +6793,27 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
 #: src/modules/wizard/e_wizard.c:221
-#, fuzzy
 msgid "Next"
-msgstr "NetWM"
+msgstr ""
 
 #: src/modules/wizard/e_wizard.c:281
-#, fuzzy
 msgid "Welcome to Enlightenment"
-msgstr "Sobre Enlightenment"
+msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
-#, fuzzy
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr "Selecione um Ícone"
+msgstr ""
 
-#: src/modules/wizard/page_020.c:55
-#, fuzzy
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr "Propriedades"
+msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7290,129 +6821,108 @@ msgid ""
 msgstr ""
 
 #: src/modules/wizard/page_030.c:107
-#, fuzzy
 msgid "Select application menu"
-msgstr "Aplicativos Específicos"
+msgstr ""
 
 #: src/modules/wizard/page_030.c:124
-#, fuzzy
 msgid "System Default"
-msgstr "Usar Padrão"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:25
-#, fuzzy
 msgid "Launcher Bar"
-msgstr "Lançar"
+msgstr ""
 
 #: src/modules/wizard/page_040.c:27
-#, fuzzy
 msgid "Select applications"
-msgstr "Aplicativos Específicos"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:28
-#, fuzzy
 msgid "Desktop Files"
-msgstr "Nome da Área de Trabalho"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:32
-#, fuzzy
 msgid "No icons on desktop"
-msgstr "Mostrar janelas de todas as áreas de trabalho"
+msgstr ""
 
 #: src/modules/wizard/page_050.c:35
-#, fuzzy
 msgid "Enable desktop icons"
-msgstr "Mostrar a Área de Trabalho"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:28
-#, fuzzy
 msgid "Focus mode"
-msgstr "Foco"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:32
-#, fuzzy
 msgid "Click to focus windows"
-msgstr "Clique para foco"
+msgstr ""
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
-#, fuzzy
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr "Selecione um Ícone"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:62
-#, fuzzy
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
-msgstr "Lançar"
+msgstr ""
 
-#: src/modules/wizard/page_080.c:64
-#, fuzzy
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr "Aplicativos Específicos"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:165
-#, fuzzy
 msgid "Capture"
-msgstr "Cpufreq"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:289
-#, fuzzy
 msgid "Output"
-msgstr "Dados de Saída"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:363
-#, fuzzy
 msgid "Cards"
-msgstr "Classe"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
-#, fuzzy
 msgid "Channels"
-msgstr "Cancelar"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:390
 msgid "Card:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:394
-#, fuzzy
 msgid "Channel:"
-msgstr "Cancelar"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:398
-#, fuzzy
 msgid "Type:"
-msgstr "Tipo do Arquivo:"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:407
-#, fuzzy
 msgid "Right:"
-msgstr "Claro"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
 msgstr ""
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
-#, fuzzy
 msgid "Lock Sliders"
-msgstr "Travar Tela"
+msgstr ""
 
 #: src/modules/mixer/app_mixer.c:419
-#, fuzzy
 msgid "Edit"
-msgstr "Sair"
+msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
@@ -7423,9 +6933,8 @@ msgid "Sound Cards"
 msgstr ""
 
 #: src/modules/mixer/conf_gadget.c:377
-#, fuzzy
 msgid "Mixer Settings"
-msgstr "Configurações de Tamanho"
+msgstr ""
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
@@ -7436,19 +6945,16 @@ msgid "Launch mixer..."
 msgstr ""
 
 #: src/modules/mixer/conf_module.c:187
-#, fuzzy
 msgid "Mixer Module Settings"
-msgstr "Configurações dos Módulos"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:123
-#, fuzzy
 msgid "Mixer Settings Updated"
-msgstr "Configuração Atualizada"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:602
-#, fuzzy
 msgid "Controls"
-msgstr "Sistema"
+msgstr ""
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
@@ -7461,65 +6967,74 @@ msgid "Connection Manager"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:731
-#, fuzzy
 msgid "Network Connection Settings"
-msgstr "Configurações de Seleção"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:737
-#, fuzzy
 msgid "Network Device"
-msgstr "Dispositivo Removível"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:742
-#, fuzzy
 msgid "Wifi"
-msgstr "Dentro de"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
 msgstr ""
 
 #: src/modules/connman/e_mod_main.c:748
-#, fuzzy
 msgid "Specific Device"
-msgstr "Aplicativos Específicos"
+msgstr ""
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
-#, fuzzy
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr "Sistema"
-
-#, fuzzy
-#~ msgid "idle"
-#~ msgstr "Ladrilho"
-
-#, fuzzy
-#~ msgid "Add File"
-#~ msgstr "Adicionar Tecla"
-
-#, fuzzy
-#~ msgid "Add Gradient"
-#~ msgstr "Adicionar Gadget"
-
-#, fuzzy
-#~ msgid "Add Online"
-#~ msgstr "Adicionar Ligação"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Wallpaper 2"
-#~ msgstr "Papel de Parede"
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Você está tentando pedir ao Enlightenment para lembrar de "
+#~ "aplicar<br>propriedades (como tamanho, localização, estilo da borda, etc) "
+#~ "para<br>uma janela quie<hilight>não tem propriedades únicas</hilight>."
+#~ "<br><br>Parece que isto compartilha as propriedades de Nome/Classe, "
+#~ "Transição, Papel, etc.,<br>com mais do que 1 outra janela na tela e "
+#~ "lembrando<br>propriedades para esta janela vai aplicar para todas as "
+#~ "outras janelas<br>que combinam com estas propriedades.<br><br> Você pode "
+#~ "desejar ativar a opção <hilight>Combinar somente uma janela</hilight> se "
+#~ "você somente pretende que uma instância desta janela seja modificada, "
+#~ "com<br>as instâncias adicionais não sendo modificadas.<br><br>Isto é "
+#~ "apenas uma advertência no caso de você não pretenda que isso aconteça."
+#~ "<br>Se você quer, simplesmente pressione os botões <hilight>Aplicar</"
+#~ "hilight> ou <hilight>OK</hilight><br>e suas configurações serão aceitas. "
+#~ "Pressione <hilight>Cancelar</hilight> se você<br>não está seguro e nada "
+#~ "será afetado."
+
+#~ msgid "Window name and class"
+#~ msgstr "Nome da janela e classe"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar Áreas de Trabalho Virtuais"
@@ -7533,13 +7048,18 @@ msgstr "Sistema"
 #~ msgid "Configure Shelf Contents"
 #~ msgstr "Configurar Conteúdos da Bandeja"
 
-#, fuzzy
-#~ msgid "Configure Toolbar Contents"
-#~ msgstr "Configurar Conteúdos da Bandeja"
-
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "Internal Windows"
+#~ msgstr "Janelas Internas"
+
+#~ msgid "Expand the window"
+#~ msgstr "Expandir a janela"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Permitir manipulação da janela"
+
 #~ msgid "Flip desktops when mouse at screen edge"
 #~ msgstr "Virar as áreas de trabalho quando o mouse estiver na beira da tela"
 
@@ -7549,20 +7069,12 @@ msgstr "Sistema"
 #~ msgid "Time the mouse is at the edge before flipping:"
 #~ msgstr "Tempo em que o mouse fica na beira antes de virar:"
 
-#, fuzzy
-#~ msgid "Configure Heading"
-#~ msgstr "Configuração"
-
 #~ msgid "Defined Command"
 #~ msgstr "Comando Definido"
 
 #~ msgid "Exit Immediately"
 #~ msgstr "Sair Imediatamente"
 
-#, fuzzy
-#~ msgid "Shut Down Immediately"
-#~ msgstr "Sair Imediatamente"
-
 #~ msgid "Shut Down"
 #~ msgstr "Desligar"
 
@@ -7593,22 +7105,6 @@ msgstr "Sistema"
 #~ msgid "Advanced Settings"
 #~ msgstr "Configurações Avançadas"
 
-#, fuzzy
-#~ msgid "%1.0f percent"
-#~ msgstr "%1.0f segundos"
-
-#, fuzzy
-#~ msgid ""
-#~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
-#~ "this profile?"
-#~ msgstr ""
-#~ "Vorê requisitou apagar \"%s\".<br><br>Você tem certeza que deseja deletar "
-#~ "esta bandeja?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete this profile?"
-#~ msgstr "Você tem certeza que deseja apagar esta bandeja?"
-
 #~ msgid "Lock Screen"
 #~ msgstr "Travar Tela"
 
@@ -7624,10 +7120,6 @@ msgstr "Sistema"
 #~ msgid "Configuration"
 #~ msgstr "Configuração"
 
-#, fuzzy
-#~ msgid "Toolbar Configuration"
-#~ msgstr "Configuração do iBar"
-
 #~ msgid "Shelf Configuration"
 #~ msgstr "Configuração da Bandeja"
 
@@ -7637,10 +7129,6 @@ msgstr "Sistema"
 #~ msgid "Configuration Panel"
 #~ msgstr "Painel de Configuração"
 
-#, fuzzy
-#~ msgid "Default Configuration Dialogs Mode"
-#~ msgstr "Configuração de Janelas de Diálogo"
-
 #~ msgid "Input Method Configuration"
 #~ msgstr "Configuração do Método de Entrada"
 
@@ -7653,10 +7141,6 @@ msgstr "Sistema"
 #~ msgid "Search Path Configuration"
 #~ msgstr "Configuração do Caminho de Pesquisa"
 
-#, fuzzy
-#~ msgid "Fileman Configuration Updated"
-#~ msgstr "Configuração Atualizada"
-
 #~ msgid "IBar Configuration"
 #~ msgstr "Configuração do iBar"
 
@@ -7672,14 +7156,6 @@ msgstr "Sistema"
 #~ msgid "Temperature Configuration"
 #~ msgstr "Configuração da Temperatura"
 
-#, fuzzy
-#~ msgid "Mixer Configuration"
-#~ msgstr "Configuração do Pager"
-
-#, fuzzy
-#~ msgid "Mixer Module Configuration"
-#~ msgstr "Configuração da Bandeja"
-
 #~ msgid "Application Menus"
 #~ msgstr "Menus de Aplicativo"
 
@@ -7740,9 +7216,6 @@ msgstr "Sistema"
 #~ msgid "Enlightenment Starting. Please wait."
 #~ msgstr "Enlightenment Iniciando. por favor aguarde."
 
-#~ msgid "Window Frame"
-#~ msgstr "Amostra da Janela"
-
 #~ msgid "Move Down"
 #~ msgstr "Mover para Baixo"
 
@@ -7750,7 +7223,7 @@ msgstr "Sistema"
 #~ msgstr "Comando do Terminal"
 
 #~ msgid "Enlightenment IBar Module"
-#~ msgstr "Módulo iBar do Enlightenment "
+#~ msgstr "Módulo iBar do Enlightenment"
 
 #~ msgid ""
 #~ "This is the IBar Application Launcher bar module for Enlightenment.<br>It "
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index e5f6aba..a243e5b 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 113cc92..cb9bfa7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-07-08 17:49+0000\n"
 "Last-Translator: Rodrigo -MDK- Oliveira <Unknown>\n"
 "Language-Team: None. But contact-me on <mdkcore at gmail.com>\n"
@@ -19,28 +19,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Sobre Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Fechar"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -66,46 +66,46 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Você tem certeza que deseja matar esta janela?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Sim"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Não"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Você requisitou sair do Enlightenment.<br><br>Você tem certeza que deseja "
 "sair?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Você tem certeza que deseja deslogar-se?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Você está perto de deslogar.<br><br>Você tem certeza que deseja isto?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Você tem certeza que deseja desligar?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -113,11 +113,11 @@ msgstr ""
 "Você requisitiu desligar o seu Computador.<br><br>Você tem certeza que "
 "deseja desligá-lo?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Você tem certeza que deseja reiniciar?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -125,7 +125,7 @@ msgstr ""
 "Você requisitou reiniciar o seu Computador.<br><br>Você tem certeza que "
 "deseja reiniciá-lo?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -133,11 +133,11 @@ msgstr ""
 "Você requisitou suspender o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Você tem certeza que deseja hibernar?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -145,494 +145,494 @@ msgstr ""
 "Você requisitou hibernar o seu Computador.<br><br>Você tem certeza que "
 "deseja suspende-lo ao disco?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Janela : Ações"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Mover"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu da Janela"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Por cima"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Por baixo"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Matar"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Janela : Estado"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Alternar Modo Viscoso"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Alternar Modo de Iconificação"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Alternar Modo Tela Cheia"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximizar Verticalmente"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximizar Horizontalmente"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximizar em Tela Cheia"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Modo de Maximização \"Inteligente\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Modo de Maximização \"Expandir\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Modo de Maximização \"Preencher\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Alternar Modo de Sombra para Cima"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Alternar Modo de Sombra para Baixo"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Alternar Modo de Sombra para Esquerda"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Alternar Modo de Sobra para Direita"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Alternar Modo de Sombra"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Alernar Estado Sem Borda"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Alternar Estado Rreso"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Virar Área de Trabalho a Esquerda"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Virar Área de Trabalho a Direita"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Virar Área de Trabalho Acima"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Virar Área de Trabalho Abaixo"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Virar Área de Trabalho Por..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Mostrar a Área de Trabalho"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Mostrar a estante"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Virar Área de Trabalho Para..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Virar Área de Trabalho Linearmente..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Mudar Para Área de Trabalho 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Mudar Para Área de Trabalho 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Mudar Para Área de Trabalho 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Mudar Para Área de Trabalho 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Mudar Para Área de Trabalho 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Mudar Para Área de Trabalho 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Mudar Para Área de Trabalho 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Mudar Para Área de Trabalho 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Mudar Para Área de Trabalho 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Mudar Para Área de Trabalho 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Mudar Para Área de Trabalho 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Mudar Para Área de Trabalho 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Mudar Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Ir ao Desktop 0 (todas as telas)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Ir ao Desktop 1 (todas as telas)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Ir ao Desktop 2 (todas as telas)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Ir ao Desktop 3 (todas as telas)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Ir ao Desktop 4 (todas as telas)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Ir ao Desktop 5 (todas as telas)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Ir ao Desktop 6 (todas as telas)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Ir ao Desktop 7 (todas as telas)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Ir ao Desktop 8 (todas as telas)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Ir ao Desktop 9 (todas as telas)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Ir ao Desktop 10 (todas as telas)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Ir ao Desktop 11 (todas as telas)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Ir ao Desktop... (todas as telas)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Tela"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Enviar Mouse Para Tela 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Enviar Mouse Para Tela 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Enviar Mouse Para Tela..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Enviar Mouse Para Frente 1 Tela"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Enviar Mouse Para Trás 1 Tela"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar Mouse Para Frente/Para Trás Pelas Telas..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Janela : Movimentação"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Para a Próxima Área de Trabalho"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Para a Área de Trabalho Anterior"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Por Área de Trabalho #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Para Área de Trabalho..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Mostar Menu Principal"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Mostar Menu de Favoritos"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Mostrar Todos os Menus dos Aplicativos"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Mostrar Lista de Clientes"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Mostrar Menu"
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Lançar"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Comando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplicativo"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Sair"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Sair agora"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Modo"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Alternar modo de apresentação"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Alternar modo offline"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistema"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Deslogar-se"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "DEsligar agora"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Desligar"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Suspender"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Hibernar"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Travar"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Limpar Janelas"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Colocar Como Papel de Parede"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Varredura nos arquivos da Área de Trabalho pronta"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Varredura por arquivo na Área de Trabalho"
 
@@ -640,41 +640,40 @@ msgstr "Varredura por arquivo na Área de Trabalho"
 msgid "Color Selector"
 msgstr "Seletor de Cores"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -685,7 +684,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -694,11 +693,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr ""
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -706,7 +705,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -716,7 +715,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -725,7 +724,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -734,7 +733,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -742,11 +741,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -754,12 +753,12 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Básico"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -767,7 +766,7 @@ msgstr "Aplicar"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Módulos"
 
@@ -776,27 +775,27 @@ msgstr "Módulos"
 msgid "Extensions"
 msgstr "Extensões"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Contêiner %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Erro - sem suporte ao PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "PAM não tem suporte gerado no Enlightenment, portanto<br>travamento da área "
 "de trabalho está desativado."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Falha ao Travar"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -804,15 +803,15 @@ msgstr ""
 "Travar a área de trabalho falhou porque alguma aplicação<br>está prendendo o "
 "teclado ou o mouse ou ambos<br>e sua garra é impossível de ser quebrada."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Por favor entre com sua senha de destravamento"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Erro no Sistema de Autenticação"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -823,22 +822,22 @@ msgstr ""
 "código de erro foi <hilight>%i</hilight>.<br>Isso é ruim e não podia ter "
 "acontecido. Por favor relate este bug."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Ativar modo de apresentação?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Não, e pare de perguntar"
 
@@ -865,7 +864,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor de Entrada da Área de Trabalho"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -910,7 +909,7 @@ msgstr "Categorias"
 msgid "Mime Types"
 msgstr "Tipos Mime"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Opções"
 
@@ -942,23 +941,23 @@ msgstr "Selecione um Ícone"
 msgid "Select an Executable"
 msgstr "Selecione um executável"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Colar"
 
@@ -966,13 +965,13 @@ msgstr "Colar"
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Erro ao Rodar"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
@@ -981,11 +980,11 @@ msgstr ""
 "Enlightenment está impossibilitado de bifurcar um processo filho:<br><br>%"
 "s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Erro ao executar aplicativo"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -994,308 +993,308 @@ 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Erro na Execução do Aplicativo"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s parou de rodar inesperadamente."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, 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:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s foi interrompido por um Sinal de Abandono."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s foi interrompido por um Sinal de Aborto."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s foi interrompido por um Pipe Quebrado."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, 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:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s foi interrompido por um Erro do Bus."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 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:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Logs de Erro"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Não ha mensagem de erro."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Salvar Esta Mensagem"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, 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:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informação do Erro"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informação do Sinal de Erro"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Dados de Saída"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Não ha saída."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Caminho não existente"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s não existe."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Arquivos"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Link"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Interromper"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr ""
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Modo de Visão"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Atualizar Visão"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Mostar Arquivos Ocultos"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Lembrar Ordem"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Sortear Agora"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Novo Diretório"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Renomear"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr ""
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Usar padrão"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Ícones Customizados"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr ""
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Definir plano de fundo"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr ""
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Criar um Diretório novo"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Nome do Novo Diretório:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Renomear %s para:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Renomear Arquivo"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Tentar novamente"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Erro"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Não a todos"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Sim a todos"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Alerta"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Arquivo já existe.  Sobrescrever?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorar Isso"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorar todos"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Ocorreu um erro ao realizar uma operação.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Confirmar Apagar"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1308,144 +1307,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Propriedades do Arquivo"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Última Modificação:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Tipo do Arquivo:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Permissões"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Outros podem ler"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Outros podem escrever"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Dono pode ler"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Dono pode escrever"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Prever"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Padrão"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Miniatura"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Customizado"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Usar este ícone para arquivos deste tipo"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Informação de Ligação"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Selecione uma Imagem"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Volume Desconhecido"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Remover este gadget"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Plano"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Inserido"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Aparência"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Rolar conteúdo automaticamente"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Capaz de ser redimensionado"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Iniciar mover/redimensionar este gadget"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Remover este gadget"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Parar mover/redimensionar este gadget"
 
@@ -1457,7 +1461,7 @@ msgstr ""
 "Uma instância prévia do Enlightenment está ativa\n"
 "nesta tela ainda. Abortando inicialização.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Travas de Janela"
 
@@ -1492,21 +1496,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Empilhamento"
 
@@ -1515,12 +1519,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Estado protegido"
 
@@ -1529,7 +1533,7 @@ msgid "Maximized state"
 msgstr "Estado maximizado"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Estado tela cheia"
 
@@ -1537,7 +1541,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Estilo da borda"
 
@@ -1585,115 +1589,116 @@ msgstr "Desprender da Área de Trabalho"
 msgid "More..."
 msgstr "Mais..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Iconificar"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximizar verticalmente"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximizar horizontalmente"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Desmaximizar"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Atalho de Teclado"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Borda"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Omitir"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Estado"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Lembrar"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Propriedades da Janela"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Sempre por Cima"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Sempre por Baixo"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Selecionar Estilo de Borda"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Usar Preferências Padrões de Ícone do E17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Usar Ícone Fornecido pelo Aplicativo "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Usar Ícone Definido pelo Usuário"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Protegido"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Viscoso"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Tela Cheia"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Lista da Janela"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Barra de tarefas"
 
@@ -1709,7 +1714,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Propriedades ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Título"
 
@@ -1801,11 +1806,11 @@ msgstr "Propriedades do NetWM"
 msgid "Modal"
 msgstr "Modal"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Pular Barra de Tarefas"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Pular Pager"
 
@@ -1813,15 +1818,15 @@ msgstr "Pular Pager"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Lembrar Janela"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 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:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1846,11 +1851,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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Nenhuma combinação de propriedades designada"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1862,116 +1867,105 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Você está tentando pedir ao Enlightenment para lembrar de "
-"aplicar<br>propriedades (como tamanho, localização, estilo da borda, etc) "
-"para<br>uma janela quie<hilight>não tem propriedades únicas</hilight>."
-"<br><br>Parece que isto compartilha as propriedades de Nome/Classe, "
-"Transição, Papel, etc.,<br>com mais do que 1 outra janela na tela e "
-"lembrando<br>propriedades para esta janela vai aplicar para todas as outras "
-"janelas<br>que combinam com estas propriedades.<br><br> Você pode desejar "
-"ativar a opção <hilight>Combinar somente uma janela</hilight> se você "
-"somente pretende que uma instância desta janela seja modificada, com<br>as "
-"instâncias adicionais não sendo modificadas.<br><br>Isto é apenas uma "
-"advertência no caso de você não pretenda que isso aconteça.<br>Se você quer, "
-"simplesmente pressione os botões <hilight>Aplicar</hilight> ou <hilight>OK</"
-"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:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nada"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Tamanho e Posição"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Travas"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Tamanho, Posição e Travas"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Qualquer coisa"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Lembrar usando"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Nome da janela e classe"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Menu da Janela"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Classe da Janela"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Papel da Janela"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tipo da Janela"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Transiente"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Propriedades para lembrar"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Preferência de Ícone"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Área de Trabalho Virtual"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Tela Atual"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Pular Lista da Janela"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Erro ao executar aplicativo"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Coincidir somente uma janela"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Iniciar este programa no login"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Mudar Propriedades do Ícone"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Iniciar este programa no login"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Configurações"
@@ -1990,24 +1984,24 @@ msgstr "Prateleira"
 msgid "Module Settings"
 msgstr "Configurações dos Módulos"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Gadgets Disponíveis"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Carregar Módulo"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Módulos Carregados"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Descarregar Módulo"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2041,8 +2035,8 @@ msgstr "Remover Gadget"
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Esquema"
 
@@ -2069,12 +2063,12 @@ msgid "Favorite Applications"
 msgstr "Aplicativos Favoritos"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplicativos"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2083,7 +2077,7 @@ msgstr "Aplicativos"
 msgid "Windows"
 msgstr "Janelas"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Janelas Perdidas"
 
@@ -2119,129 +2113,128 @@ msgstr "(Sem Aplicativos)"
 msgid "Set Virtual Desktops"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Sem Janelas)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Sem nome!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Sem Bandejas)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Bandeja #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Adicionar Uma Bandeja"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Apagar Uma Bandeja"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Configurações da Bandeja"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Minúsculo"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Pequeno"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Médio"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Grande"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Gigante"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Sobre Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Abaixo das Janelas"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Abaixo de Qualquer Coisa"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Encolher ao Tamanho do Conteúdo"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixels"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Estilos"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Esconder Automaticamente"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Esconder automaticamente a bandeja"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Mostrar com o mouse em"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Mostrar com o clique do mouse"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Timeout para esconder"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f segundos"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Esconder duração"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Mostrar em todas as Áreas de Trabalho"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Mostrar numa Área de Trabalho específica"
 
@@ -2461,7 +2454,7 @@ msgstr "Iniciando Suporte Internacional"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment não pode ativar seu sistema de internacionalização."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2469,11 +2462,11 @@ msgstr ""
 "Enlightenment não pode ativar a tela de inicialização.\n"
 "Talvez você esteja sem memória?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Testando Suporte de Formato"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2482,7 +2475,7 @@ msgstr ""
 "favor cheque\n"
 "se Evas tem suporte a engine do Software Buffer.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2491,7 +2484,7 @@ msgstr ""
 "o Evas tem\n"
 "suporte ao carregamento de PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2500,7 +2493,7 @@ msgstr ""
 "se o Evas tem\n"
 "suporte ao carregamento de JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2509,18 +2502,18 @@ msgstr ""
 "o Evas tem\n"
 "suporte ao carregamento de EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Configurar Telas"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2529,195 +2522,195 @@ msgstr ""
 "em seu sistema.\n"
 "Talvez outro gerenciador de janela esteja rodando?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Configurar Proteção de Tela"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment não pode congigurar a proteção de tela do X."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Configurar Trava de Área"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de travamento da área de trabalho."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Ativando Caminhos"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Configurar Controles do Sistema"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Comandos do Sistema.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Configurar Ações"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment não pode ativar seu sistema de ações."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Configurar Sistema de Execução"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment não pode ativar seu sistema de execução."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Configurar Lembraças"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment não pode instalar as configurações de lembrança."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Configurar FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment não pode inicializar o gerenciador de Arquivo.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Configurar Sistema de Mensagem"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment não pode ativar seu sistema de mensagem."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Configurar DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment não pode ativar seu sistema dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de manipulação da garra de entrada."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Configurar Módulos"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment não pode ativar seu sistema de módulo."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Configurar Lembraças"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment não pode instalar as configurações de lembrança."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Configurar Classes de Cor"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment não pode ativar seu sistema de casse de cor."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment não pode ativar seu sistema de controle de gadgets."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Configurar DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment não pode configurar as configurações DPMS"
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Configurar modos de economia de energia"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Configurar Papel de Parede"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 "Enlightenment não pode ativar seu sistema de fundo da área de trabalho."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Configurar Mouse"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Configurar Uniões"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment não pode ativar seu sistema de ligações."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Configurar popups"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment não pode ativar seu sistema de popup."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment não pode ativar seu sistema de bandeja."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Configurar Miniaturizador"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment não pode inicializar o sistema de Miniaturização.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Configurar Disposição de Arquivo"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 "Enlightenment não pode configurar sua disposição do sistema de arquivos."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Carregar Módulos"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2730,11 +2723,11 @@ msgstr ""
 "diálogo de configuração de módulos pode permitir que você selecione<br>seus "
 "módulos novamente."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment deixou de funcionar cedo ao iniciar e foi reiniciado"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2747,15 +2740,15 @@ msgstr ""
 "<br><br>A janela de diálogo de configuração de módulos pode permitir que "
 "você selecione seus<br>módulos novamente."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Configurar prateleiras"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Quase Pronto"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2764,11 +2757,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Erro carregando Módulo"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2777,11 +2770,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:150
+#: src/bin/e_module.c:159
 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:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2792,12 +2785,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Módulo %s do Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Você vai querer descarregar este módulo?<br>"
 
@@ -2808,11 +2801,11 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Você tem certeza que deseja apagar esta bandeja?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2820,19 +2813,19 @@ msgstr ""
 "Você requisitou apagar esta bandeja.<br><br>Você tem certeza que deseja "
 "deletar isso?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Parar Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Começar a Movimentar/Redimensionar Items"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr ""
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Apagar esta Bandeja"
 
@@ -2849,11 +2842,11 @@ msgstr "Verificando Permissões do Sistema"
 msgid "System Check Done"
 msgstr "Verificação do Sistema Pronta"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problemas no logout"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2863,109 +2856,109 @@ msgstr ""
 "<br>Você deseja terminar o logout<br>de qualquer maneira sem fechar "
 "estes<br>aplicativos antes?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Logout agora"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Aguardar mais"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Cancelar logout"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Logout em progresso"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment está ocupado com outra requisição"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "HIC! Isto não parece ser legal"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Suspendendo"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernando"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2981,88 +2974,88 @@ msgstr "Definir como Tema..."
 msgid "Set Toolbar Contents"
 msgstr ""
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Não pode sair - janelas imortais."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr "Algumas janelas"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "No Futuro"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "No último Minuto"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Anos atrás"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Meses atrás"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Semanas atrás"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Dias atrás"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Horas atrás"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Minutos atrás"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3082,51 +3075,51 @@ msgstr "Para cima"
 msgid "Down"
 msgstr "Para baixo"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Adicionar a Favoritos"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Subir um Diretório"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Permissões:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modificado:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Você"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Protegido"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Somente Leitura"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Leitura-Gravação"
 
@@ -3142,57 +3135,57 @@ msgstr "Configurações Básicas"
 msgid "Show alert when battery is low"
 msgstr "Mostrar alerta quando a bateria estiver baixa"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3200,12 +3193,12 @@ msgstr ""
 msgid "Internal"
 msgstr "Interno"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3213,24 +3206,24 @@ msgstr ""
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Medidor de Bateria"
 
@@ -3238,20 +3231,20 @@ msgstr "Medidor de Bateria"
 msgid "Clock"
 msgstr "Relógio"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr ""
 
@@ -3277,7 +3270,7 @@ msgid "Restart Applications"
 msgstr "Reiniciar Aplicativos"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Todos Aplicativos"
 
@@ -3299,12 +3292,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menus"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Estilo de Borda Padrão"
 
@@ -3312,14 +3305,14 @@ msgstr "Estilo de Borda Padrão"
 msgid "Window Border Selection"
 msgstr "Seleção da Borda da Janela"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Lembrar esta Borda desta janela na próxima vez que ela aparecer."
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3345,7 +3338,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3613,9 +3606,9 @@ msgid "Desktop Name"
 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:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Nome:"
 
@@ -3681,10 +3674,10 @@ msgstr "%1.0f minutos"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Pessoal"
@@ -3716,8 +3709,8 @@ msgstr "Mostrar na zona da tela #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3838,46 +3831,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Áreas de Trabalho Virtuais"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Configurações dos Diálogos"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Desativar Diálogos de Confirmação"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Modo Básico"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Modo Avançado"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Modo de Diálogo Padrão"
 
@@ -3933,31 +3931,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr "Configurações da Resolução da Tela"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Restaurar ao logar-se"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotação"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Espelhamento"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Características Perdidas"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3966,11 +3964,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Nenhuma Taxa de Atualização Encontrada"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4030,7 +4028,7 @@ msgid "Power Management"
 msgstr "Gerenciamento de Energia"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4040,102 +4038,107 @@ msgstr "<Nenhum>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Apagar Tudo"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Restaurar Ligações Padrões"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Parâmetros da Ação"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4430,18 +4433,17 @@ msgstr "Realmente Grande"
 msgid "%d pixels"
 msgstr "%d pixels"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Ativar Classes de Fonte Customizadas"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Pré-visualização de texto básica: 123: 我的天空!"
 
@@ -4449,38 +4451,53 @@ msgstr "Pré-visualização de texto básica: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Classes da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Ativar Classe da Fonte"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Fontes"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Estilos"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Pré-visualização de Texto Avançada.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Sugerindo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automático"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Recuos da Fonte"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Nome do Recuo"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Ativar Recuos"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Pré-visualização de Texto Avançada.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "Recuos da Fonte"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4494,7 +4511,7 @@ msgstr "Temas dos Ícones"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Tema do ìcone"
 
@@ -4566,7 +4583,7 @@ msgstr ""
 "erro de cópia."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Linguagem"
 
@@ -4741,7 +4758,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Margem do Cursor na Rolagem Automática"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Opções Diversas"
 
@@ -4920,24 +4937,24 @@ msgstr "Tamanho do Cursor"
 msgid "Mouse Cursor"
 msgstr "Cursos do Mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Aceleração do Mouse"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Aceleração"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Limiar"
 
@@ -4954,7 +4971,7 @@ msgid "Images"
 msgstr "Imagens"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temas"
 
@@ -5054,33 +5071,33 @@ msgstr "%1.0f coleções"
 msgid "Performance"
 msgstr "Performance"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Seletor de Perfil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Perfis Disponíveis"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Adicionar Perfil Novo"
 
@@ -5245,23 +5262,23 @@ msgstr "Inicializar"
 msgid "Theme Selector"
 msgstr "Seletor de Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Categorias de Temas"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Atribuir"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Limpar Tudo"
 
@@ -5318,38 +5335,38 @@ msgid "Wallpaper Settings"
 msgstr "Configurações do Papel de Parede"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Usar Papel de Parede do Tema"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Figura..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradiente..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Aonde colocar o Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Todas Áreas de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Esta Área de Trabalho"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Esta Tela"
 
@@ -5370,14 +5387,14 @@ msgid "Fill Options"
 msgstr "Opções de Preenchimento"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontal"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5442,38 +5459,38 @@ msgstr "Usar arquivo original"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Selecione uma Figura..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Erro ao Importar Figura"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment está impossibilitado de importar a figura<br>devido a erros de "
 "conversão."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Erro ao Importar Papel de Parede"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5481,7 +5498,7 @@ 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5595,14 +5612,6 @@ msgstr "Preferir ícone definido pelo usuário"
 msgid "Prefer application provided icon"
 msgstr "Preferir icone fornecido pelo aplicativo"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Janelas Internas"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Sempre lembrar das janelas internas"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Configurações de Foco"
@@ -5735,17 +5744,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expansão inteligente"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Expandir a janela"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Preencher espaço disponível"
 
@@ -5753,19 +5757,19 @@ msgstr "Preencher espaço disponível"
 msgid "Maximize Policy"
 msgstr "Maximizar a Política"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Permitir manipulação da janela"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Automaticamente mover/redimensionar janelas ao esconder bandeja"
 
@@ -5804,49 +5808,59 @@ msgstr "Sobrepor quando começar a mover ou redimensionar"
 msgid "Raise when clicking to focus"
 msgstr "Sobrepor quando clicar para pegar foco"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Sempre lembrar das janelas internas"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "Sempre lembrar das janelas internas"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6204,7 +6218,7 @@ msgid "Show Toolbar"
 msgstr "Mostrar Barra de Ferramentas"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6220,95 +6234,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Ir para Diretório Acima"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Abrir"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Abrir com..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Aplicativos Específicos"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Comando Customizado"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6334,16 +6348,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6381,19 +6395,19 @@ msgstr ""
 msgid "Gadgets"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6430,7 +6444,7 @@ msgstr "Selecionada Fonte da Barra"
 msgid "Icon Labels"
 msgstr "Rótulos dos Ícones"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Mostrar Rótulo do Ícone"
 
@@ -6491,43 +6505,43 @@ msgstr "Criar Ícone Novo"
 msgid "Add Application"
 msgstr "Adicionar Aplicação"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Nome do Display"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Título do Display"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Classe do Display"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Nome do Ícone do Display"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Mostrar janelas de todas as telas"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Mostrar janelas da zona corrente"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Mostrar janelas de todas as áreas de trabalho"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Mostrar janelas da área de trabalho ativa"
 
@@ -6547,11 +6561,11 @@ msgstr "Virar área de trabalho com a roda do mouse"
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6559,69 +6573,69 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Botão Selecione e Deslize"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Clique para setar"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Resistência ao arrastar"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f segundos"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Arrastar Botão do Pager"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6629,40 +6643,40 @@ msgstr ""
 "Por favor pressione um botão do mouse<br>Pressione <hilight>Escape</hilight> "
 "para abortar.<br>Or <hilight>Del</hilight> para resetar o botão."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Botão %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6786,7 +6800,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatura"
 
@@ -6798,15 +6812,15 @@ msgstr "Próximo"
 msgid "Welcome to Enlightenment"
 msgstr ""
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr ""
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr ""
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6853,15 +6867,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6983,18 +6997,61 @@ msgstr ""
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Você está tentando pedir ao Enlightenment para lembrar de "
+#~ "aplicar<br>propriedades (como tamanho, localização, estilo da borda, etc) "
+#~ "para<br>uma janela quie<hilight>não tem propriedades únicas</hilight>."
+#~ "<br><br>Parece que isto compartilha as propriedades de Nome/Classe, "
+#~ "Transição, Papel, etc.,<br>com mais do que 1 outra janela na tela e "
+#~ "lembrando<br>propriedades para esta janela vai aplicar para todas as "
+#~ "outras janelas<br>que combinam com estas propriedades.<br><br> Você pode "
+#~ "desejar ativar a opção <hilight>Combinar somente uma janela</hilight> se "
+#~ "você somente pretende que uma instância desta janela seja modificada, "
+#~ "com<br>as instâncias adicionais não sendo modificadas.<br><br>Isto é "
+#~ "apenas uma advertência no caso de você não pretenda que isso aconteça."
+#~ "<br>Se você quer, simplesmente pressione os botões <hilight>Aplicar</"
+#~ "hilight> ou <hilight>OK</hilight><br>e suas configurações serão aceitas. "
+#~ "Pressione <hilight>Cancelar</hilight> se você<br>não está seguro e nada "
+#~ "será afetado."
+
+#~ msgid "Window name and class"
+#~ msgstr "Nome da janela e classe"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Janelas Internas"
+
+#~ msgid "Expand the window"
+#~ msgstr "Expandir a janela"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Permitir manipulação da janela"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Configurar Áreas de Trabalho Virtuais"
 
diff --git a/po/ro.gmo b/po/ro.gmo
new file mode 100644
index 0000000..553f86c
Binary files /dev/null and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 0000000..9b931d4
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,6823 @@
+# Romanian translation for enlightenment
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the enlightenment package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enlightenment\n"
+"Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-09-17 10:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: Romanian <ro at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: src/bin/e_about.c:17
+msgid "About Enlightenment"
+msgstr ""
+
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
+#: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
+#: src/modules/conf/e_conf.c:180
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
+#: src/modules/conf_theme/e_int_config_theme_web.c:130
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
+#: src/modules/mixer/app_mixer.c:531
+msgid "Close"
+msgstr ""
+
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
+msgid "Enlightenment"
+msgstr ""
+
+#: src/bin/e_about.c:26
+msgid ""
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
+"hope you enjoy using this software as much as we enjoyed writing it."
+"<br><br>This software is provided as-is with no explicit or implied "
+"warranty. This software is governed by licensing conditions, so please see "
+"the COPYING and COPYING-PLAIN licence files installed on your system."
+"<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> and it "
+"is not stable. Many features are incomplete or even non-existant yet and may "
+"have many bugs. You have been <hilight>WARNED!</hilight>"
+msgstr ""
+
+#: src/bin/e_about.c:50
+msgid "<title>The Team</title>"
+msgstr ""
+
+#: src/bin/e_actions.c:345
+#, c-format
+msgid ""
+"You are about to kill %s.<br><br>Please keep in mind that all data of this "
+"window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
+"you want to kill this window?"
+msgstr ""
+
+#: src/bin/e_actions.c:357
+msgid "Are you sure you want to kill this window?"
+msgstr ""
+
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
+msgid "Yes"
+msgstr ""
+
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
+msgid "No"
+msgstr ""
+
+#: src/bin/e_actions.c:1762
+msgid "Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1764
+msgid ""
+"You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
+msgstr ""
+
+#: src/bin/e_actions.c:1860
+msgid "Are you sure you want to log out?"
+msgstr ""
+
+#: src/bin/e_actions.c:1862
+msgid "You are about to log out.<br><br>Are you sure you want to do this?"
+msgstr ""
+
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
+msgid "Are you sure you want to turn off?"
+msgstr ""
+
+#: src/bin/e_actions.c:1926
+msgid ""
+"You requested to turn off your Computer.<br><br>Are you sure you want to "
+"shut down?"
+msgstr ""
+
+#: src/bin/e_actions.c:1988
+msgid "Are you sure you want to reboot?"
+msgstr ""
+
+#: src/bin/e_actions.c:1990
+msgid ""
+"You requested to reboot your Computer.<br><br>Are you sure you want to "
+"restart it?"
+msgstr ""
+
+#: src/bin/e_actions.c:2054
+msgid ""
+"You requested to suspend your Computer.<br><br>Are you sure you want to "
+"suspend?"
+msgstr ""
+
+#: src/bin/e_actions.c:2116
+msgid "Are you sure you want to hibernate?"
+msgstr ""
+
+#: src/bin/e_actions.c:2118
+msgid ""
+"You requested to hibernate your Computer.<br><br>Are you sure you want to "
+"suspend to disk?"
+msgstr ""
+
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
+msgid "Window : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
+msgid "Move"
+msgstr ""
+
+#: src/bin/e_actions.c:2518
+msgid "Resize"
+msgstr ""
+
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
+msgid "Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2529
+msgid "Window Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
+msgid "Raise"
+msgstr ""
+
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
+msgid "Lower"
+msgstr ""
+
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
+msgid "Kill"
+msgstr ""
+
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
+msgid "Window : State"
+msgstr ""
+
+#: src/bin/e_actions.c:2557
+msgid "Sticky Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2564
+msgid "Iconic Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2571
+msgid "Fullscreen Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
+msgid "Maximize"
+msgstr ""
+
+#: src/bin/e_actions.c:2580
+msgid "Maximize Vertically"
+msgstr ""
+
+#: src/bin/e_actions.c:2583
+msgid "Maximize Horizontally"
+msgstr ""
+
+#: src/bin/e_actions.c:2586
+msgid "Maximize Fullscreen"
+msgstr ""
+
+#: src/bin/e_actions.c:2588
+msgid "Maximize Mode \"Smart\""
+msgstr ""
+
+#: src/bin/e_actions.c:2590
+msgid "Maximize Mode \"Expand\""
+msgstr ""
+
+#: src/bin/e_actions.c:2592
+msgid "Maximize Mode \"Fill\""
+msgstr ""
+
+#: src/bin/e_actions.c:2599
+msgid "Shade Up Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2601
+msgid "Shade Down Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2603
+msgid "Shade Left Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2605
+msgid "Shade Right Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2607
+msgid "Shade Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2614
+msgid "Toggle Borderless State"
+msgstr ""
+
+#: src/bin/e_actions.c:2619
+msgid "Toggle Pinned State"
+msgstr ""
+
+#: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
+#: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:103
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
+msgid "Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2624
+msgid "Flip Desktop Left"
+msgstr ""
+
+#: src/bin/e_actions.c:2626
+msgid "Flip Desktop Right"
+msgstr ""
+
+#: src/bin/e_actions.c:2628
+msgid "Flip Desktop Up"
+msgstr ""
+
+#: src/bin/e_actions.c:2630
+msgid "Flip Desktop Down"
+msgstr ""
+
+#: src/bin/e_actions.c:2632
+msgid "Flip Desktop By..."
+msgstr ""
+
+#: src/bin/e_actions.c:2638
+msgid "Show The Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2644
+msgid "Show The Shelf"
+msgstr ""
+
+#: src/bin/e_actions.c:2649
+msgid "Flip Desktop To..."
+msgstr ""
+
+#: src/bin/e_actions.c:2655
+msgid "Flip Desktop Linearly..."
+msgstr ""
+
+#: src/bin/e_actions.c:2661
+msgid "Switch To Desktop 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2663
+msgid "Switch To Desktop 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2665
+msgid "Switch To Desktop 2"
+msgstr ""
+
+#: src/bin/e_actions.c:2667
+msgid "Switch To Desktop 3"
+msgstr ""
+
+#: src/bin/e_actions.c:2669
+msgid "Switch To Desktop 4"
+msgstr ""
+
+#: src/bin/e_actions.c:2671
+msgid "Switch To Desktop 5"
+msgstr ""
+
+#: src/bin/e_actions.c:2673
+msgid "Switch To Desktop 6"
+msgstr ""
+
+#: src/bin/e_actions.c:2675
+msgid "Switch To Desktop 7"
+msgstr ""
+
+#: src/bin/e_actions.c:2677
+msgid "Switch To Desktop 8"
+msgstr ""
+
+#: src/bin/e_actions.c:2679
+msgid "Switch To Desktop 9"
+msgstr ""
+
+#: src/bin/e_actions.c:2681
+msgid "Switch To Desktop 10"
+msgstr ""
+
+#: src/bin/e_actions.c:2683
+msgid "Switch To Desktop 11"
+msgstr ""
+
+#: src/bin/e_actions.c:2685
+msgid "Switch To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2691
+msgid "Flip Desktop Left (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2693
+msgid "Flip Desktop Right (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2695
+msgid "Flip Desktop Up (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2697
+msgid "Flip Desktop Down (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2699
+msgid "Flip Desktop By... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2705
+msgid "Flip Desktop To... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2711
+msgid "Flip Desktop Linearly... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2717
+msgid "Flip Desktop In Direction..."
+msgstr ""
+
+#: src/bin/e_actions.c:2722
+msgid "Switch To Desktop 0 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2724
+msgid "Switch To Desktop 1 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2726
+msgid "Switch To Desktop 2 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2728
+msgid "Switch To Desktop 3 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2730
+msgid "Switch To Desktop 4 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2732
+msgid "Switch To Desktop 5 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2734
+msgid "Switch To Desktop 6 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2736
+msgid "Switch To Desktop 7 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2738
+msgid "Switch To Desktop 8 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2740
+msgid "Switch To Desktop 9 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2742
+msgid "Switch To Desktop 10 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2744
+msgid "Switch To Desktop 11 (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2746
+msgid "Switch To Desktop... (All Screens)"
+msgstr ""
+
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
+#: 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
+#: src/modules/conf_dpms/e_mod_main.c:34
+#: src/modules/conf_screensaver/e_mod_main.c:34
+#: src/modules/ibox/e_mod_config.c:134
+msgid "Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2753
+msgid "Send Mouse To Screen 0"
+msgstr ""
+
+#: src/bin/e_actions.c:2755
+msgid "Send Mouse To Screen 1"
+msgstr ""
+
+#: src/bin/e_actions.c:2757
+msgid "Send Mouse To Screen..."
+msgstr ""
+
+#: src/bin/e_actions.c:2762
+msgid "Send Mouse Forward 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2764
+msgid "Send Mouse Back 1 Screen"
+msgstr ""
+
+#: src/bin/e_actions.c:2766
+msgid "Send Mouse Forward/Back Screens..."
+msgstr ""
+
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
+msgid "Window : Moving"
+msgstr ""
+
+#: src/bin/e_actions.c:2804
+msgid "To Next Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2806
+msgid "To Previous Desktop"
+msgstr ""
+
+#: src/bin/e_actions.c:2808
+msgid "By Desktop #..."
+msgstr ""
+
+#: src/bin/e_actions.c:2814
+msgid "To Desktop..."
+msgstr ""
+
+#: src/bin/e_actions.c:2820
+msgid "Show Main Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2822
+msgid "Show Favorites Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2824
+msgid "Show All Applications Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2826
+msgid "Show Clients Menu"
+msgstr ""
+
+#: src/bin/e_actions.c:2828
+msgid "Show Menu..."
+msgstr ""
+
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+msgid "Launch"
+msgstr ""
+
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
+msgid "Command"
+msgstr ""
+
+#: src/bin/e_actions.c:2840
+msgid "Application"
+msgstr ""
+
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
+msgid "Restart"
+msgstr ""
+
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
+msgid "Exit"
+msgstr ""
+
+#: src/bin/e_actions.c:2852
+msgid "Exit Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
+msgid "Enlightenment : Mode"
+msgstr ""
+
+#: src/bin/e_actions.c:2857
+msgid "Presentation Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2862
+msgid "Offline Mode Toggle"
+msgstr ""
+
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
+#: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
+#: src/modules/conf_desklock/e_int_config_desklock.c:301
+#: src/modules/conf_imc/e_int_config_imc.c:827
+#: src/modules/conf_startup/e_int_config_startup.c:267
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
+#: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
+#: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
+#: src/modules/syscon/e_mod_main.c:122
+msgid "System"
+msgstr ""
+
+#: src/bin/e_actions.c:2866
+msgid "Log Out"
+msgstr ""
+
+#: src/bin/e_actions.c:2870
+msgid "Power Off Now"
+msgstr ""
+
+#: src/bin/e_actions.c:2874
+msgid "Power Off"
+msgstr ""
+
+#: src/bin/e_actions.c:2878
+msgid "Reboot"
+msgstr ""
+
+#: src/bin/e_actions.c:2882
+msgid "Suspend"
+msgstr ""
+
+#: src/bin/e_actions.c:2886
+msgid "Hibernate"
+msgstr ""
+
+#: src/bin/e_actions.c:2894
+msgid "Lock"
+msgstr ""
+
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
+msgid "Cleanup Windows"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Generic : Actions"
+msgstr ""
+
+#: src/bin/e_actions.c:2904
+msgid "Delayed Action"
+msgstr ""
+
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
+msgid "Set As Background"
+msgstr ""
+
+#: src/bin/e_border.c:4922
+msgid "Desktop files scan done"
+msgstr ""
+
+#: src/bin/e_border.c:4935
+msgid "Desktop file scan"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:29
+msgid "Color Selector"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/modules/conf_dpms/e_int_config_dpms.c:85
+#: src/modules/conf_imc/e_int_config_imc_import.c:112
+#: src/modules/conf_mime/e_int_config_mime_edit.c:283
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
+#: src/modules/conf_theme/e_int_config_theme_import.c:113
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
+#: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
+#: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
+msgid "OK"
+msgstr ""
+
+#: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/modules/conf_mime/e_int_config_mime_edit.c:284
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_theme/e_int_config_theme_import.c:117
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
+#: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
+msgid "Cancel"
+msgstr ""
+
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
+msgid ""
+"Settings data needed upgrading. Your old settings have<br>been wiped and a "
+"new set of defaults initialized. This<br>will happen regularly during "
+"development, so don't report a<br>bug. This simply means Enlightenment needs "
+"new settings<br>data by default for usable functionality that your "
+"old<br>settings simply lack. This new set of defaults will fix<br>that by "
+"adding it in. You can re-configure things now to your<br>liking. Sorry for "
+"the hiccup in your settings.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:777
+msgid ""
+"Your settings are NEWER than Enlightenment. This is very<br>strange. This "
+"should not happen unless you downgraded<br>Enlightenment or copied the "
+"settings from a place where<br>a newer version of Enlightenment was running. "
+"This is bad and<br>as a precaution your settings have been now restored "
+"to<br>defaults. Sorry for the inconvenience.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1740
+msgid "Settings Upgraded"
+msgstr ""
+
+#: src/bin/e_config.c:1763
+#, c-format
+msgid ""
+"An error occured while saving Enlightenment's<br>settings 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 ""
+
+#: src/bin/e_config.c:1774
+#, c-format
+msgid ""
+"Enlightenment's settings files are too big<br>for the file system they are "
+"being saved to.<br>This error is very strange as the files should<br>be "
+"extremely small. Please check the settings<br>for your home directory."
+"<br><br>The file where the error occured was:<br>%s<br><br>This file has "
+"been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1787
+#, c-format
+msgid ""
+"An output error occured when writing the settings<br>files for "
+"Enlightenment. Your disk is having troubles<br>and possibly needs "
+"replacement.<br><br>The file where the error occured was:<br>%s<br><br>This "
+"file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1798
+#, c-format
+msgid ""
+"Enlightenment cannot write its settings file<br>because it ran out of space "
+"to write the file.<br>You have either run out of disk space or have<br>gone "
+"over your quota limit.<br><br>The file where the error occured was:<br>%"
+"s<br><br>This file has been deleted to avoid corrupt data.<br>"
+msgstr ""
+
+#: src/bin/e_config.c:1810
+#, c-format
+msgid ""
+"Enlightenment unexpectedly had the settings 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 ""
+
+#: src/bin/e_config.c:1835
+msgid "Enlightenment Settings Write Problems"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
+#: src/modules/conf_engine/e_mod_main.c:34
+#: src/modules/conf_exebuf/e_mod_main.c:34
+#: src/modules/conf_paths/e_mod_main.c:34
+#: src/modules/conf_performance/e_mod_main.c:34
+msgid "Advanced"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:237
+msgid "Basic"
+msgstr ""
+
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
+msgid "Apply"
+msgstr ""
+
+#: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
+#: src/modules/conf_colors/e_int_config_color_classes.c:86
+#: src/modules/conf_fonts/e_int_config_fonts.c:99
+#: src/modules/conf_paths/e_int_config_paths.c:83
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
+msgid "Modules"
+msgstr ""
+
+#: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
+#: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
+msgid "Extensions"
+msgstr ""
+
+#: src/bin/e_container.c:113
+#, c-format
+msgid "Container %d"
+msgstr ""
+
+#: src/bin/e_desklock.c:175
+msgid "Error - no PAM support"
+msgstr ""
+
+#: src/bin/e_desklock.c:176
+msgid ""
+"No PAM support was built into Enlightenment, so<br>desk locking is disabled."
+msgstr ""
+
+#: src/bin/e_desklock.c:240
+msgid "Lock Failed"
+msgstr ""
+
+#: src/bin/e_desklock.c:241
+msgid ""
+"Locking the desktop failed because some application<br>has grabbed either "
+"the keyboard or the mouse or both<br>and their grab is unable to be broken."
+msgstr ""
+
+#: src/bin/e_desklock.c:325
+msgid "Please enter your unlock password"
+msgstr ""
+
+#: src/bin/e_desklock.c:689
+msgid "Authentication System Error"
+msgstr ""
+
+#: src/bin/e_desklock.c:690
+#, c-format
+msgid ""
+"Authentication via PAM had errors setting up the<br>authentication session. "
+"The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
+"happening. Please report this bug."
+msgstr ""
+
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
+msgid "Activate Presentation Mode?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1020
+msgid ""
+"You unlocked desktop too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
+msgid "No, but increase timeout"
+msgstr ""
+
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
+msgid "No, and stop asking"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:158
+msgid "Incomplete Window Properties"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:159
+msgid ""
+"The window you are creating an icon for<br>does not contain window name and "
+"class<br>properties, so the needed properties for<br>the icon so that it "
+"will be used for this<br>window cannot be guessed. You will need to<br>use "
+"the window title instead. This will only<br>work if the window title is the "
+"same at<br>the time the window starts up, and does not<br>change."
+msgstr ""
+
+#: src/bin/e_eap_editor.c:215
+msgid "Desktop Entry Editor"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
+#: src/modules/conf_fonts/e_int_config_fonts.c:96
+#: src/modules/conf_mime/e_int_config_mime_edit.c:145
+msgid "Icon"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:472
+#: src/modules/conf_mime/e_int_config_mime_edit.c:136
+msgid "Basic Info"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:473 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:911
+msgid "Name"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:479
+msgid "Executable"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:487
+msgid "Comment"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:512
+msgid "General"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:515
+msgid "Generic Name"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:520
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:105
+msgid "Window Class"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
+msgid "Categories"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:528
+msgid "Mime Types"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
+msgid "Options"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:535
+msgid "Startup Notify"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:537
+msgid "Run in Terminal"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:539
+msgid "Show in Menus"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:543
+msgid "Desktop file"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:544
+msgid "Filename"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:573
+msgid "Select an Icon"
+msgstr ""
+
+#: src/bin/e_eap_editor.c:642
+msgid "Select an Executable"
+msgstr ""
+
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
+#: src/modules/conf_applications/e_int_config_apps.c:269
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
+#: src/modules/conf_shelves/e_int_config_shelf.c:81
+#: src/modules/ibar/e_mod_config.c:112
+msgid "Delete"
+msgstr ""
+
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
+msgid "Cut"
+msgstr ""
+
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
+msgid "Copy"
+msgstr ""
+
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
+msgid "Paste"
+msgstr ""
+
+#: src/bin/e_entry.c:529
+msgid "Select All"
+msgstr ""
+
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
+#: src/modules/conf_imc/e_int_config_imc.c:278
+#: src/modules/conf_imc/e_int_config_imc.c:518
+msgid "Run Error"
+msgstr ""
+
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
+#: src/modules/conf_imc/e_int_config_imc.c:279
+#: src/modules/conf_imc/e_int_config_imc.c:519
+#, c-format
+msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
+msgstr ""
+
+#: src/bin/e_exec.c:356
+msgid "Application run error"
+msgstr ""
+
+#: src/bin/e_exec.c:358
+#, 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:454
+msgid "Application Execution Error"
+msgstr ""
+
+#: src/bin/e_exec.c:466
+#, c-format
+msgid "%s stopped running unexpectedly."
+msgstr ""
+
+#: src/bin/e_exec.c:472
+#, c-format
+msgid "An exit code of %i was returned from %s."
+msgstr ""
+
+#: src/bin/e_exec.c:480
+#, c-format
+msgid "%s was interrupted by an Interrupt Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:483
+#, c-format
+msgid "%s was interrupted by a Quit Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:487
+#, c-format
+msgid "%s was interrupted by an Abort Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:490
+#, c-format
+msgid "%s was interrupted by a Floating Point Error."
+msgstr ""
+
+#: src/bin/e_exec.c:494
+#, c-format
+msgid "%s was interrupted by an Uninterruptable Kill Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:498
+#, c-format
+msgid "%s was interrupted by a Segmentation Fault."
+msgstr ""
+
+#: src/bin/e_exec.c:502
+#, c-format
+msgid "%s was interrupted by a Broken Pipe."
+msgstr ""
+
+#: src/bin/e_exec.c:505
+#, c-format
+msgid "%s was interrupted by a Termination Signal."
+msgstr ""
+
+#: src/bin/e_exec.c:509
+#, c-format
+msgid "%s was interrupted by a Bus Error."
+msgstr ""
+
+#: src/bin/e_exec.c:512
+#, c-format
+msgid "%s was interrupted by the signal number %i."
+msgstr ""
+
+#: src/bin/e_exec.c:568
+msgid ""
+"***The remaining output has been truncated. Save the output to view.***\n"
+msgstr ""
+
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
+msgid "Error Logs"
+msgstr ""
+
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
+msgid "There was no error message."
+msgstr ""
+
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
+msgid "Save This Message"
+msgstr ""
+
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
+#, c-format
+msgid "This error log will be saved as %s/%s.log"
+msgstr ""
+
+#: src/bin/e_exec.c:670
+msgid "Error Information"
+msgstr ""
+
+#: src/bin/e_exec.c:678
+msgid "Error Signal Information"
+msgstr ""
+
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
+msgid "Output Data"
+msgstr ""
+
+#: src/bin/e_exec.c:696
+msgid "There was no output."
+msgstr ""
+
+#: src/bin/e_fm.c:945
+msgid "Nonexistent path"
+msgstr ""
+
+#: src/bin/e_fm.c:949
+#, c-format
+msgid "%s doesn't exist."
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Mount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3017
+msgid "Can't mount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Unmount Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3033
+msgid "Can't unmount device"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Eject Error"
+msgstr ""
+
+#: src/bin/e_fm.c:3048
+msgid "Can't eject device"
+msgstr ""
+
+#: src/bin/e_fm.c:3685
+#, c-format
+msgid "%i Files"
+msgstr ""
+
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
+msgid "Link"
+msgstr ""
+
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
+msgid "Abort"
+msgstr ""
+
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
+msgid "Inherit parent settings"
+msgstr ""
+
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
+#: src/modules/fileman/e_mod_config.c:208
+msgid "View Mode"
+msgstr ""
+
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
+msgid "Refresh View"
+msgstr ""
+
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
+msgid "Show Hidden Files"
+msgstr ""
+
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
+msgid "Remember Ordering"
+msgstr ""
+
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
+msgid "Sort Now"
+msgstr ""
+
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
+#: src/modules/conf_paths/e_int_config_paths.c:208
+msgid "New Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8051
+msgid "Rename"
+msgstr ""
+
+#: src/bin/e_fm.c:8070
+msgid "Unmount"
+msgstr ""
+
+#: src/bin/e_fm.c:8075
+msgid "Mount"
+msgstr ""
+
+#: src/bin/e_fm.c:8080
+msgid "Eject"
+msgstr ""
+
+#: src/bin/e_fm.c:8090
+msgid "Properties"
+msgstr ""
+
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
+msgid "Use default"
+msgstr ""
+
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
+msgid "Grid Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
+msgid "Custom Icons"
+msgstr ""
+
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
+msgid "List"
+msgstr ""
+
+#: src/bin/e_fm.c:8392
+#, c-format
+msgid "Icon Size (%d)"
+msgstr ""
+
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
+msgid "Set background..."
+msgstr ""
+
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
+msgid "Set overlay..."
+msgstr ""
+
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
+msgid "Clear"
+msgstr ""
+
+#: src/bin/e_fm.c:8766
+msgid "Create a new Directory"
+msgstr ""
+
+#: src/bin/e_fm.c:8767
+msgid "New Directory Name:"
+msgstr ""
+
+#: src/bin/e_fm.c:8821
+#, c-format
+msgid "Rename %s to:"
+msgstr ""
+
+#: src/bin/e_fm.c:8823
+msgid "Rename File"
+msgstr ""
+
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
+msgid "Retry"
+msgstr ""
+
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
+msgid "Error"
+msgstr ""
+
+#: src/bin/e_fm.c:8970
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9022
+msgid "No to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9024
+msgid "Yes to all"
+msgstr ""
+
+#: src/bin/e_fm.c:9027
+msgid "Warning"
+msgstr ""
+
+#: src/bin/e_fm.c:9030
+#, c-format
+msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
+msgstr ""
+
+#: src/bin/e_fm.c:9103
+msgid "Ignore this"
+msgstr ""
+
+#: src/bin/e_fm.c:9104
+msgid "Ignore all"
+msgstr ""
+
+#: src/bin/e_fm.c:9109
+#, c-format
+msgid "An error occured while performing an operation.<br>%s"
+msgstr ""
+
+#: src/bin/e_fm.c:9255
+msgid "Confirm Delete"
+msgstr ""
+
+#: src/bin/e_fm.c:9260
+#, c-format
+msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm.c:9266
+#, c-format
+msgid ""
+"Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
+"hilight> ?"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:108
+msgid "File Properties"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:337
+msgid "File:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
+msgid "Size:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:351
+msgid "Last Modified:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:358
+msgid "File Type:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:365
+msgid "Permissions"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
+msgid "Owner:"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:372
+msgid "Others can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:374
+msgid "Others can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:376
+msgid "Owner can read"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:378
+msgid "Owner can write"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
+#: src/modules/conf_transitions/e_int_config_transitions.c:167
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
+msgid "Preview"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:431
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:218
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:231
+msgid "Default"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:434
+msgid "Thumbnail"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:437
+#: src/modules/conf_desklock/e_int_config_desklock.c:425
+msgid "Custom"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:447
+msgid "Use this icon for all files of this type"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:455
+msgid "Link Information"
+msgstr ""
+
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
+msgid "Select an Image"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:183
+#, c-format
+msgid "%llu TiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:185
+#, c-format
+msgid "%llu GiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:187
+#, c-format
+msgid "%llu MiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:189
+#, c-format
+msgid "%llu KiB"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:191
+#, c-format
+msgid "%llu B"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:222
+#, c-format
+msgid "Unknown Volume"
+msgstr ""
+
+#: src/bin/e_fm_hal.c:320
+msgid "Removable Device"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
+msgid "Plain"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
+msgid "Inset"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
+msgid "Appearance"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1385
+msgid "Automatically scroll contents"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1392
+msgid "Able to be resized"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
+msgid "Begin move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
+msgid "Remove this gadget"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1891
+msgid "Stop move/resize this gadget"
+msgstr ""
+
+#: src/bin/e_hints.c:151
+msgid ""
+"A previous instance of Enlightenment is still active\n"
+"on this screen. Aborting startup.\n"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
+msgid "Window Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:285
+msgid "Generic Locks"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:286
+msgid "Lock the Window so it does only what I tell it to"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:288
+msgid "Protect this window from me accidentally changing it"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:290
+msgid ""
+"Protect this window from being accidentally closed because it is important"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:292
+msgid "Do not allow the border to change on this window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:295
+msgid "Remember these Locks for this window next time it appears"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:308
+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:702
+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:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
+#: src/modules/conf_fonts/e_int_config_fonts.c:637
+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:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
+msgid "Stacking"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
+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:720
+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:726
+msgid "Shaded state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
+msgid "Maximized state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
+#: src/bin/e_int_border_remember.c:729
+msgid "Fullscreen state"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:327
+msgid "Lock me from changing:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
+msgid "Border style"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:348
+msgid "Stop me from:"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:349
+msgid "Closing the window"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:351
+msgid "Exiting my login with this window open"
+msgstr ""
+
+#: src/bin/e_int_border_locks.c:355
+msgid "Remember these Locks"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:73
+msgid "Edit Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:78
+msgid "Add Application..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:89
+msgid "Create Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:99
+msgid "Send to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:111
+msgid "Pin to Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:122
+msgid "Unpin from Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:131
+msgid "More..."
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:171
+msgid "Iconify"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:368
+msgid "Maximize vertically"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:379
+msgid "Maximize horizontally"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:390
+msgid "Unmaximize"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:491
+msgid "Keyboard Shortcut"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:497
+msgid "To Favorites Menu"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:502
+msgid "To Launcher"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
+msgid "Border"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:533
+msgid "Skip"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
+#: src/modules/conf_colors/e_int_config_color_classes.c:514
+msgid "State"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
+msgid "Remember"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
+msgid "Window Properties"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:814
+msgid "Always On Top"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:825
+#: 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:260
+msgid "Normal"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:836
+msgid "Always Below"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:928
+msgid "Select Border Style"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:940
+msgid "Use E17 Default Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:949
+msgid "Use Application Provided Icon "
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:957
+msgid "Use User Defined Icon"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
+msgid "Shaded"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
+msgid "Sticky"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
+msgid "Fullscreen"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
+msgid "Window List"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_border_menu.c:1092
+msgid "Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:363
+msgid "NetWM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:370
+msgid "ICCCM"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:418
+msgid "ICCCM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
+msgid "Title"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:421
+msgid "Class"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
+msgid "Icon Name"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:423
+msgid "Machine"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:424
+msgid "Role"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:426
+msgid "Minimum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:427
+msgid "Maximum Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:428
+msgid "Base Size"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:429
+msgid "Resize Steps"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:431
+msgid "Aspect Ratio"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:432
+msgid "Initial State"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:434
+msgid "Window ID"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:435
+msgid "Window Group"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:436
+msgid "Transient For"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:437
+msgid "Client Leader"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:438
+msgid "Gravity"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:441
+msgid "Take Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:442
+msgid "Accepts Focus"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:443
+msgid "Urgent"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:444
+msgid "Request Delete"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:445
+msgid "Request Position"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:466
+msgid "NetWM Properties"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:471
+msgid "Modal"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
+msgid "Skip Taskbar"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
+msgid "Skip Pager"
+msgstr ""
+
+#: src/bin/e_int_border_prop.c:476
+msgid "Hidden"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:85
+msgid "Window Remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:307
+msgid "Window properties are not a unique match"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:310
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window that <hilight>does not "
+"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
+"Transience, Role etc. properties<br>with more than 1 other window on the "
+"screen and remembering<br>properties for this window will apply to all other "
+"windows<br>that match these properties.<br><br>This is just a warning in "
+"case you did not intend this to happen.<br>If you did, simply press "
+"<hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>and your "
+"settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
+"sure and nothing will be affected."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:515
+msgid "No match properties set"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:518
+msgid ""
+"You are trying to ask Enlightenment to remember to apply<br>properties (such "
+"as size, location, border style etc.) to<br>a window <hilight>without "
+"specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
+"way of remembering this window."
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:614
+msgid "Nothing"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:616
+msgid "Size and Position"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
+msgid "Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:620
+msgid "Size, Position and Locks"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:622
+msgid "Everything"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:635
+msgid "Remember using"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
+msgid "Window Role"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:686
+msgid "Window type"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
+msgid "Transience"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:701
+msgid "Properties to remember"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:717
+msgid "Icon Preference"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:723
+msgid "Virtual Desktop"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:732
+msgid "Current Screen"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:735
+msgid "Skip Window List"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
+#: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
+#: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
+#: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
+#: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
+#: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
+#: src/modules/connman/e_mod_main.c:1077
+msgid "Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:43 src/modules/fileman/e_mod_main.c:51
+#: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
+#: src/modules/wizard/page_050.c:26
+msgid "File Manager"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:44
+msgid "Shelf"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:120
+msgid "Module Settings"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:180
+msgid "Available Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:187
+msgid "Load Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:194
+msgid "Loaded Modules"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:201
+msgid "Unload Module"
+msgstr ""
+
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
+#: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
+#: src/bin/e_int_gadcon_config.c:205
+msgid "Description: Unavailable"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:36
+msgid "Shelf Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:42
+msgid "Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
+msgid "Available Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
+msgid "Add Gadget"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:133
+msgid "Selected Gadgets"
+msgstr ""
+
+#: src/bin/e_int_gadcon_config.c:140
+msgid "Remove Gadget"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
+msgid "Toolbar Settings"
+msgstr ""
+
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
+msgid "Layout"
+msgstr ""
+
+#: src/bin/e_intl.c:361
+msgid "Input Method Error"
+msgstr ""
+
+#: src/bin/e_intl.c:362
+msgid ""
+"Error starting the input method executable<br><br>please make sure that your "
+"input<br>method configuration is correct and<br>that your "
+"configuration's<br>executable is in your PATH<br>"
+msgstr ""
+
+#: src/bin/e_int_menus.c:89
+msgid "Main"
+msgstr ""
+
+#: src/bin/e_int_menus.c:106
+msgid "Favorite Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:117
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
+msgid "Applications"
+msgstr ""
+
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
+#: 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 ""
+
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
+msgid "Lost Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:170
+msgid "About"
+msgstr ""
+
+#: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
+#: src/modules/conf_theme/e_mod_main.c:40
+#: src/modules/conf_theme/e_mod_main.c:84
+msgid "Theme"
+msgstr ""
+
+#: src/bin/e_int_menus.c:262
+msgid "Virtual"
+msgstr ""
+
+#: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
+#: src/modules/conf_shelves/e_mod_main.c:41
+#: src/modules/conf_shelves/e_mod_main.c:85
+msgid "Shelves"
+msgstr ""
+
+#: src/bin/e_int_menus.c:278
+msgid "Show/Hide All Windows"
+msgstr ""
+
+#: src/bin/e_int_menus.c:575
+msgid "(No Applications)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:709
+msgid "Set Virtual Desktops"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
+msgid "(No Windows)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
+msgid "No name!!"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1362
+msgid "(No Shelves)"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
+#: src/modules/conf_shelves/e_int_config_shelf.c:132
+msgid "Shelf #"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1427
+msgid "Add A Shelf"
+msgstr ""
+
+#: src/bin/e_int_menus.c:1434
+msgid "Delete A Shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
+#: src/modules/conf_shelves/e_int_config_shelf.c:43
+msgid "Shelf Settings"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:601
+#: src/modules/conf_fonts/e_int_config_fonts.c:253
+msgid "Tiny"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:603
+#: src/modules/conf_fonts/e_int_config_fonts.c:100
+#: src/modules/conf_fonts/e_int_config_fonts.c:259
+msgid "Small"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
+msgid "Medium"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:607
+#: src/modules/conf_fonts/e_int_config_fonts.c:102
+msgid "Large"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:609
+#: src/modules/conf_fonts/e_int_config_fonts.c:283
+msgid "Huge"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
+msgid "Set Contents..."
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:641
+msgid "Above Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:643
+msgid "Below Windows"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:645
+msgid "Below Everything"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:647
+msgid "Allow windows to overlap the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:694
+msgid "Shrink to Content Size"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:705
+#, c-format
+msgid "%3.0f pixels"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:710
+msgid "Styles"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:750
+msgid "Auto Hide"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:751
+msgid "Auto-hide the shelf"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:755
+msgid "Show on mouse in"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:759
+msgid "Show on mouse click"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:763
+msgid "Hide timeout"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
+#, c-format
+msgid "%.1f seconds"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:772
+msgid "Hide duration"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:788
+msgid "Show on all Desktops"
+msgstr ""
+
+#: src/bin/e_int_shelf_config.c:790
+msgid "Show on specified Desktops"
+msgstr ""
+
+#: src/bin/e_ipc.c:47
+#, c-format
+msgid ""
+"Possible IPC Hack Attempt. The IPC socket\n"
+"directory already exists BUT has permissions\n"
+"that are too leanient (must only be readable\n"
+"and writable by the owner, and nobody else)\n"
+"or is not owned by you. Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_ipc.c:57
+#, c-format
+msgid ""
+"The IPC socket directory cannot be created or\n"
+"examined.\n"
+"Please check:\n"
+"%s/enlightenment-%s\n"
+msgstr ""
+
+#: src/bin/e_main.c:323
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
+msgstr ""
+
+#: src/bin/e_main.c:385
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:411
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:424
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:430
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:442
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:450
+msgid ""
+"Enlightenment cannot initialize its emergency alert system.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+
+#: src/bin/e_main.c:473
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:481
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:490
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:509
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:515
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software X11\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software X11 rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:522
+msgid ""
+"Enlightenment found ecore_evas doesn't support the Software Buffer\n"
+"rendering in Evas. Please check your installation of Evas and\n"
+"Ecore and check they support the Software Buffer rendering engine."
+msgstr ""
+
+#: src/bin/e_main.c:538 src/bin/e_main.c:545
+msgid ""
+"Enlightenment cannot initialize the FDO desktop system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:559
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+
+#: src/bin/e_main.c:569
+msgid "Enlightenment cannot set up its file registry system."
+msgstr ""
+
+#: src/bin/e_main.c:578
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:592
+msgid "Enlightenment cannot set up its scale system."
+msgstr ""
+
+#: src/bin/e_main.c:600
+msgid "Enlightenment cannot set up the pointer system."
+msgstr ""
+
+#: src/bin/e_main.c:609
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:627
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:638
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:643
+msgid "Starting International Support"
+msgstr ""
+
+#: src/bin/e_main.c:648
+msgid "Enlightenment cannot set up its intl system."
+msgstr ""
+
+#: src/bin/e_main.c:664
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:676
+msgid "Testing Format Support"
+msgstr ""
+
+#: src/bin/e_main.c:687
+msgid ""
+"Enlightenment found Evas can't create a buffer canvas. Please check\n"
+"Evas has Software Buffer engine support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:698
+msgid ""
+"Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:707
+msgid ""
+"Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:716
+msgid ""
+"Enlightenment found Evas can't load EET files. Check Evas has EET\n"
+"loader support.\n"
+msgstr ""
+
+#: src/bin/e_main.c:727
+msgid ""
+"Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
+"fontconfig\n"
+"support and system fontconfig defines a 'Sans' font.\n"
+msgstr ""
+
+#: src/bin/e_main.c:737
+msgid "Setup Screens"
+msgstr ""
+
+#: src/bin/e_main.c:742
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+
+#: src/bin/e_main.c:748
+msgid "Setup Screensaver"
+msgstr ""
+
+#: src/bin/e_main.c:753
+msgid "Enlightenment cannot configure the X screensaver."
+msgstr ""
+
+#: src/bin/e_main.c:757
+msgid "Setup Desklock"
+msgstr ""
+
+#: src/bin/e_main.c:762
+msgid "Enlightenment cannot set up its desk locking system."
+msgstr ""
+
+#: src/bin/e_main.c:775
+msgid "Setting up Paths"
+msgstr ""
+
+#: src/bin/e_main.c:792
+msgid "Setup System Controls"
+msgstr ""
+
+#: src/bin/e_main.c:797
+msgid "Enlightenment cannot initialize the System Command system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:802
+msgid "Setup Actions"
+msgstr ""
+
+#: src/bin/e_main.c:807
+msgid "Enlightenment cannot set up its actions system."
+msgstr ""
+
+#: src/bin/e_main.c:811
+msgid "Setup Execution System"
+msgstr ""
+
+#: src/bin/e_main.c:816
+msgid "Enlightenment cannot set up its exec system."
+msgstr ""
+
+#: src/bin/e_main.c:824
+msgid "Setup FM"
+msgstr ""
+
+#: src/bin/e_main.c:829
+msgid "Enlightenment cannot initialize the File manager.\n"
+msgstr ""
+
+#: src/bin/e_main.c:844
+msgid "Setup Message System"
+msgstr ""
+
+#: src/bin/e_main.c:849
+msgid "Enlightenment cannot set up its msg system."
+msgstr ""
+
+#: src/bin/e_main.c:854
+msgid "Setup DND"
+msgstr ""
+
+#: src/bin/e_main.c:859
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:864
+msgid "Setup Grab Input Handling"
+msgstr ""
+
+#: src/bin/e_main.c:869
+msgid "Enlightenment cannot set up its input grab handling system."
+msgstr ""
+
+#: src/bin/e_main.c:874
+msgid "Setup Modules"
+msgstr ""
+
+#: src/bin/e_main.c:879
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
+#: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr ""
+
+#: src/bin/e_main.c:894
+msgid "Setup Color Classes"
+msgstr ""
+
+#: src/bin/e_main.c:899
+msgid "Enlightenment cannot set up its color class system."
+msgstr ""
+
+#: src/bin/e_main.c:904
+msgid "Setup Gadcon"
+msgstr ""
+
+#: src/bin/e_main.c:909
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr ""
+
+#: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr ""
+
+#: src/bin/e_main.c:919
+msgid "Enlightenment cannot configure the DPMS settings."
+msgstr ""
+
+#: src/bin/e_main.c:923
+msgid "Set Up Powersave modes"
+msgstr ""
+
+#: src/bin/e_main.c:927
+msgid "Enlightenment cannot set up its powersave modes."
+msgstr ""
+
+#: src/bin/e_main.c:932
+msgid "Setup Wallpaper"
+msgstr ""
+
+#: src/bin/e_main.c:937
+msgid "Enlightenment cannot set up its desktop background system."
+msgstr ""
+
+#: src/bin/e_main.c:942
+msgid "Setup Mouse"
+msgstr ""
+
+#: src/bin/e_main.c:947
+msgid "Enlightenment cannot configure the mouse settings."
+msgstr ""
+
+#: src/bin/e_main.c:952
+msgid "Setup Bindings"
+msgstr ""
+
+#: src/bin/e_main.c:957
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:962
+msgid "Setup Popups"
+msgstr ""
+
+#: src/bin/e_main.c:967
+msgid "Enlightenment cannot set up its popup system."
+msgstr ""
+
+#: src/bin/e_main.c:972
+msgid "Setup Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:977
+msgid "Enlightenment cannot set up its shelf system."
+msgstr ""
+
+#: src/bin/e_main.c:982
+msgid "Setup Thumbnailer"
+msgstr ""
+
+#: src/bin/e_main.c:987
+msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
+msgstr ""
+
+#: src/bin/e_main.c:992
+msgid "Set Up File Ordering"
+msgstr ""
+
+#: src/bin/e_main.c:996
+msgid "Enlightenment cannot set up its order file system."
+msgstr ""
+
+#: src/bin/e_main.c:1031
+msgid "Load Modules"
+msgstr ""
+
+#: src/bin/e_main.c:1039
+msgid ""
+"Enlightenment crashed early on start and has<br>been restarted. All modules "
+"have been disabled<br>and will not be loaded to help remove any "
+"problem<br>modules from your configuration. The module<br>configuration "
+"dialog should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1046
+msgid "Enlightenment crashed early on start and has been restarted"
+msgstr ""
+
+#: src/bin/e_main.c:1047
+msgid ""
+"Enlightenment crashed early on start and has been restarted.<br>All modules "
+"have been disabled and will not be loaded to help<br>remove any problem "
+"modules from your configuration.<br><br>The module configuration dialog "
+"should let you select your<br>modules again."
+msgstr ""
+
+#: src/bin/e_main.c:1055
+msgid "Configure Shelves"
+msgstr ""
+
+#: src/bin/e_main.c:1066
+msgid "Almost Done"
+msgstr ""
+
+#: src/bin/e_module.c:126
+#, 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:130 src/bin/e_module.c:143 src/bin/e_module.c:160
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
+#, 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:159
+msgid "Module does not contain all needed functions"
+msgstr ""
+
+#: src/bin/e_module.c:173
+#, c-format
+msgid ""
+"Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
+"module API version of: %i.<br>The module API advertized by Enlightenment is: "
+"%i.<br>"
+msgstr ""
+
+#: src/bin/e_module.c:178
+#, c-format
+msgid "Enlightenment %s Module"
+msgstr ""
+
+#: src/bin/e_module.c:501
+msgid "Would you like to unload this module?<br>"
+msgstr ""
+
+#: src/bin/e_screensaver.c:99
+msgid ""
+"You disabled screensaver too fast.<br><br>Would you like to enable "
+"<b>presentation</b> mode and temporarily disable screen saver, lock and "
+"power saving?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
+msgid "Are you sure you want to delete this shelf?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1297
+msgid ""
+"You requested to delete this shelf.<br><br>Are you sure you want to delete "
+"it?"
+msgstr ""
+
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
+msgid "Stop Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
+msgid "Begin Moving/Resizing Items"
+msgstr ""
+
+#: src/bin/e_shelf.c:1705
+msgid "Set Shelf Contents"
+msgstr ""
+
+#: src/bin/e_shelf.c:1710
+msgid "Delete this Shelf"
+msgstr ""
+
+#: src/bin/e_startup.c:66
+msgid "Starting"
+msgstr ""
+
+#: src/bin/e_sys.c:170
+msgid "Checking System Permissions"
+msgstr ""
+
+#: src/bin/e_sys.c:208 src/bin/e_sys.c:219 src/bin/e_sys.c:228
+#: src/bin/e_sys.c:237
+msgid "System Check Done"
+msgstr ""
+
+#: src/bin/e_sys.c:312
+msgid "Logout problems"
+msgstr ""
+
+#: src/bin/e_sys.c:315
+msgid ""
+"Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
+"want to finish the logout<br>anyway without closing these<br>applications "
+"first?"
+msgstr ""
+
+#: src/bin/e_sys.c:321
+msgid "Logout now"
+msgstr ""
+
+#: src/bin/e_sys.c:322
+msgid "Wait longer"
+msgstr ""
+
+#: src/bin/e_sys.c:323
+msgid "Cancel Logout"
+msgstr ""
+
+#: src/bin/e_sys.c:362
+msgid "Logout in progress"
+msgstr ""
+
+#: src/bin/e_sys.c:365
+msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
+msgid "Enlightenment is busy with another request"
+msgstr ""
+
+#: src/bin/e_sys.c:397
+msgid ""
+"Logging out.<br>You cannot perform other system actions<br>once a logout has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:405
+msgid ""
+"Powering off.<br>You cannot do any other system actions<br>once a shutdown "
+"has been started."
+msgstr ""
+
+#: src/bin/e_sys.c:412
+msgid ""
+"Resetting.<br>You cannot do any other system actions<br>once a reboot has "
+"begun."
+msgstr ""
+
+#: src/bin/e_sys.c:419
+msgid ""
+"Suspending.<br>Until suspend is complete you cannot perform<br>any other "
+"system actions."
+msgstr ""
+
+#: src/bin/e_sys.c:426
+msgid ""
+"Hibernating.<br>You cannot perform an other system actions<br>until this is "
+"complete."
+msgstr ""
+
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
+msgid "EEK! This should not happen"
+msgstr ""
+
+#: src/bin/e_sys.c:459
+msgid "Power off failed."
+msgstr ""
+
+#: src/bin/e_sys.c:464
+msgid "Reset failed."
+msgstr ""
+
+#: src/bin/e_sys.c:469
+msgid "Suspend failed."
+msgstr ""
+
+#: src/bin/e_sys.c:474
+msgid "Hibernate failed."
+msgstr ""
+
+#: src/bin/e_sys.c:531
+msgid "Power off"
+msgstr ""
+
+#: src/bin/e_sys.c:534
+msgid "Power off.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:558
+msgid "Resetting"
+msgstr ""
+
+#: src/bin/e_sys.c:561
+msgid "Resetting.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:584
+msgid "Suspending"
+msgstr ""
+
+#: src/bin/e_sys.c:587
+msgid "Suspending.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_sys.c:610
+msgid "Hibernating"
+msgstr ""
+
+#: src/bin/e_sys.c:613
+msgid "Hibernating.<br><hilight>Please wait.</hilight>"
+msgstr ""
+
+#: src/bin/e_theme_about.c:17
+msgid "About Theme"
+msgstr ""
+
+#: src/bin/e_theme.c:42
+msgid "Set As Theme"
+msgstr ""
+
+#: src/bin/e_toolbar.c:340
+msgid "Set Toolbar Contents"
+msgstr ""
+
+#: src/bin/e_utils.c:245
+msgid "Cannot exit - immortal windows."
+msgstr ""
+
+#: src/bin/e_utils.c:246
+msgid ""
+"Some windows are left still around with the Lifespan lock enabled. This "
+"means<br>that Enlightenment will not allow itself to exit until these "
+"windows have<br>been closed or have the lifespan lock removed.<br>"
+msgstr ""
+
+#: src/bin/e_utils.c:804
+#, c-format
+msgid "%'.0f Bytes"
+msgstr ""
+
+#: src/bin/e_utils.c:808
+#, c-format
+msgid "%'.0f KB"
+msgstr ""
+
+#: src/bin/e_utils.c:812
+#, c-format
+msgid "%'.0f MB"
+msgstr ""
+
+#: src/bin/e_utils.c:816
+#, c-format
+msgid "%'.1f GB"
+msgstr ""
+
+#: src/bin/e_utils.c:836
+#, c-format
+msgid "In the Future"
+msgstr ""
+
+#: src/bin/e_utils.c:841
+#, c-format
+msgid "In the last Minute"
+msgstr ""
+
+#: src/bin/e_utils.c:843
+#, c-format
+msgid "%li Years ago"
+msgstr ""
+
+#: src/bin/e_utils.c:845
+#, c-format
+msgid "%li Months ago"
+msgstr ""
+
+#: src/bin/e_utils.c:847
+#, c-format
+msgid "%li Weeks ago"
+msgstr ""
+
+#: src/bin/e_utils.c:849
+#, c-format
+msgid "%li Days ago"
+msgstr ""
+
+#: src/bin/e_utils.c:851
+#, c-format
+msgid "%li Hours ago"
+msgstr ""
+
+#: src/bin/e_utils.c:853
+#, c-format
+msgid "%li Minutes ago"
+msgstr ""
+
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
+msgid "Unknown"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:63
+#: src/modules/conf_applications/e_int_config_apps.c:243
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
+#: src/modules/conf_shelves/e_int_config_shelf.c:79
+#: src/modules/ibar/e_mod_config.c:110
+msgid "Add"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:69
+msgid "Remove"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:83
+#: src/modules/conf_applications/e_int_config_apps.c:258
+msgid "Up"
+msgstr ""
+
+#: src/bin/e_widget_config_list.c:89
+#: src/modules/conf_applications/e_int_config_apps.c:263
+msgid "Down"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:292
+msgid "Add to Favorites"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:298
+#: src/modules/conf_desklock/e_int_config_desklock.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:834
+#: src/modules/conf_startup/e_int_config_startup.c:275
+#: src/modules/conf_theme/e_int_config_theme.c:405
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
+#: src/modules/gadman/e_mod_config.c:193
+msgid "Go up a Directory"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:359
+msgid "Permissions:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:375
+msgid "Modified:"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:614
+#, c-format
+msgid "You"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:663
+#, c-format
+msgid "Protected"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
+#, c-format
+msgid "Read Only"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
+#, c-format
+msgid "Forbidden"
+msgstr ""
+
+#: src/bin/e_widget_fsel.c:690
+msgid "Read-Write"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:41
+msgid "Battery Monitor Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:93
+msgid "Basic Settings"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:94
+msgid "Show alert when battery is low"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:138
+msgid "Check every:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:140
+#: src/modules/conf_performance/e_int_config_performance.c:149
+#: src/modules/temperature/e_mod_config.c:379
+#, c-format
+msgid "%1.0f ticks"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:143
+msgid "Polling"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:147
+msgid "Show alert on low battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:150
+msgid "Alert when at:"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:152
+#, c-format
+msgid "%1.0f min"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:155
+#, c-format
+msgid "%1.0f %%"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:158
+msgid "Auto dismiss in..."
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:161
+#, c-format
+msgid "%1.0f sec"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:164
+msgid "Alert"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:170
+msgid "Auto Detect"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:172
+#: 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
+msgid "Internal"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:174
+#: src/modules/fileman/e_mod_config.c:280
+msgid "HAL"
+msgstr ""
+
+#: src/modules/battery/e_mod_config.c:177
+msgid "Hardware"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:135
+msgid "Battery"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:847
+msgid "Your battery is low!"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:849
+msgid "AC power is recommended."
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:924
+msgid "N/A"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
+msgid "ERROR"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:1096
+msgid "Battery Meter"
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:98
+msgid "Clock"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
+msgid "Settings Panel"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:244
+msgid "Presentation"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:251
+msgid "Offline"
+msgstr ""
+
+#: src/modules/conf/e_mod_main.c:279
+msgid "Modes"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:50
+#: src/modules/conf_applications/e_mod_main.c:42
+msgid "Favorites Menu"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:104
+#: src/modules/conf_applications/e_int_config_apps.c:119
+#: src/modules/conf_applications/e_mod_main.c:36
+msgid "IBar Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:135
+#: src/modules/conf_applications/e_mod_main.c:38
+msgid "Startup Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:151
+#: src/modules/conf_applications/e_mod_main.c:37
+msgid "Restart Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:236
+#: src/modules/fileman/e_fwin.c:1869
+msgid "All Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_int_config_apps.c:250
+msgid "Selected Applications"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:34
+msgid "Apps"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:35
+msgid "New Application"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:40
+msgid "IBar Other"
+msgstr ""
+
+#: src/modules/conf_applications/e_mod_main.c:41
+#: src/modules/conf_clientlist/e_mod_main.c:34
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
+msgid "Menus"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:30
+#: src/modules/conf_borders/e_int_config_borders.c:202
+msgid "Default Border Style"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:50
+msgid "Window Border Selection"
+msgstr ""
+
+#: src/modules/conf_borders/e_int_config_borders.c:247
+msgid "Remember this Border for this window next time it appears"
+msgstr ""
+
+#: 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
+#: src/modules/conf_icon_theme/e_mod_main.c:21
+#: src/modules/conf_mouse_cursor/e_mod_main.c:34
+#: src/modules/conf_scale/e_mod_main.c:34
+#: src/modules/conf_startup/e_mod_main.c:34
+#: src/modules/conf_theme/e_mod_main.c:38
+#: src/modules/conf_transitions/e_mod_main.c:34
+#: src/modules/conf_wallpaper/e_mod_main.c:28
+#: src/modules/dropshadow/e_mod_main.c:89
+msgid "Look"
+msgstr ""
+
+#: src/modules/conf_borders/e_mod_main.c:35
+msgid "Borders"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:40
+msgid "Client List Settings"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:99
+msgid "Group By"
+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:664
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
+#: src/modules/conf_transitions/e_int_config_transitions.c:152
+#: src/modules/conf_transitions/e_int_config_transitions.c:204
+#: src/modules/conf_transitions/e_int_config_transitions.c:236
+msgid "None"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:107
+msgid "Include windows from other screens"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:111
+msgid "Separate Groups By"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:116
+msgid "Using separator bars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:118
+msgid "Using menus"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:122
+msgid "Client Sort Order"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:126
+msgid "Alphabetical"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:128
+msgid "Window stacking layer"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:130
+msgid "Most recently used"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:134
+msgid "Iconified Windows"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:136
+msgid "Group with owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:138
+msgid "Group with current desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:140
+msgid "Separate group"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:142
+msgid "Warp to owning desktop"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:146
+msgid "Menu Item Captions"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:147
+msgid "Limit caption length"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_int_config_clientlist.c:149
+#, c-format
+msgid "%1.0f Chars"
+msgstr ""
+
+#: src/modules/conf_clientlist/e_mod_main.c:35
+msgid "Client List Menu"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:47
+msgid "Window Manager"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:48
+msgid "About Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:49
+msgid "About Dialog Version"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:50
+msgid "Border Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:51
+msgid "Settings Dialog Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:52
+msgid "Error Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:53
+#: src/modules/conf_fonts/e_int_config_fonts.c:63
+msgid "Menu Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:54
+msgid "Menu Title Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:55
+#: src/modules/conf_fonts/e_int_config_fonts.c:62
+msgid "Menu Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:56
+msgid "Menu Item Active"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:57
+#: src/modules/conf_fonts/e_int_config_fonts.c:67
+msgid "Move Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:58
+#: src/modules/conf_fonts/e_int_config_fonts.c:68
+msgid "Resize Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:59
+msgid "Winlist Item"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:60
+msgid "Winlist Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:61
+#: src/modules/conf_fonts/e_int_config_fonts.c:69
+msgid "Winlist Title"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:67
+#: src/modules/conf_fonts/e_int_config_fonts.c:82
+msgid "Widgets"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:68
+msgid "Button Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:69
+msgid "Button Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:70
+msgid "Check Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:71
+msgid "Check Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:72
+msgid "Entry Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:73
+msgid "Label Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:74
+msgid "List Item Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:75
+msgid "List Item Odd Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:76
+#: src/modules/conf_fonts/e_int_config_fonts.c:92
+msgid "List Header"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:77
+msgid "Radio Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:78
+msgid "Radio Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:79
+msgid "Slider Text"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:80
+msgid "Slider Text Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:87
+msgid "Module Label"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:130
+#: src/modules/conf_colors/e_mod_main.c:35
+msgid "Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:251
+msgid "Other"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:435
+msgid "Window Manager Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:437
+#: src/modules/conf_colors/e_int_config_color_classes.c:445
+#: src/modules/conf_colors/e_int_config_color_classes.c:453
+#: src/modules/conf_colors/e_int_config_color_classes.c:517
+msgid "Enabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:439
+#: src/modules/conf_colors/e_int_config_color_classes.c:447
+#: src/modules/conf_colors/e_int_config_color_classes.c:455
+#: src/modules/conf_colors/e_int_config_color_classes.c:522
+msgid "Disabled"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:443
+msgid "Widget Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:451
+msgid "Module Colors"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:501
+msgid "Color Classes"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:529
+msgid "Object Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:538
+msgid "Outline Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:547
+msgid "Shadow Color"
+msgstr ""
+
+#: src/modules/conf_colors/e_int_config_color_classes.c:556
+msgid "Defaults"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:52
+msgid "Desk Settings"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:149
+msgid "Desktop Name"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:150
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
+msgid "Name:"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:156
+msgid "Desktop Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desk/e_int_config_desk.c:162
+#: src/modules/conf_mime/e_int_config_mime.c:193
+msgid "Set"
+msgstr ""
+
+#: src/modules/conf_desk/e_mod_main.c:35
+msgid "Desk"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:96
+msgid "Screen Lock Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:199
+msgid "Automatic Locking"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:201
+msgid "Lock when Enlightenment starts"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:205
+msgid "Lock when X screensaver activates"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:210
+msgid "Time after screensaver activated"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:213
+#: src/modules/conf_desklock/e_int_config_desklock.c:443
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:189
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:207
+#, c-format
+msgid "%1.0f seconds"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:218
+msgid "Lock when idle time exceeded"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:222
+msgid "Idle time to exceed"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:225
+#: src/modules/conf_dpms/e_int_config_dpms.c:208
+#: src/modules/conf_dpms/e_int_config_dpms.c:220
+#: src/modules/conf_dpms/e_int_config_dpms.c:232
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:143
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:181
+#, c-format
+msgid "%1.0f minutes"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:298
+#: src/modules/conf_imc/e_int_config_imc.c:822
+#: src/modules/conf_startup/e_int_config_startup.c:262
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
+#: src/modules/gadman/e_mod_config.c:186
+msgid "Personal"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:391
+msgid "Login Box Settings"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:394
+msgid "Show on all screen zones"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:398
+msgid "Show on current screen zone"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:402
+msgid "Show on screen zone #:"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:406
+#: src/modules/conf_desks/e_int_config_desks.c:247
+#: src/modules/conf_desks/e_int_config_desks.c:251
+#: src/modules/conf_desks/e_int_config_desks.c:284
+#: src/modules/conf_desks/e_int_config_desks.c:288
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:117
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:121
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:125
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:170
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:174
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:178
+#: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
+#: src/modules/fileman/e_mod_config.c:229
+#, c-format
+msgid "%1.0f"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:414
+msgid "Wallpaper Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:416
+#: src/modules/gadman/e_mod_config.c:149
+msgid "Theme Defined"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:419
+msgid "Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:422
+msgid "User Wallpaper"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:433
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:195
+msgid "Enter Presentation Mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:435
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:197
+msgid "Suggest entering presentation mode"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:439
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:202
+msgid "If deactivated before"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:457
+msgid "Custom Screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_int_config_desklock.c:458
+msgid "Use custom screenlock"
+msgstr ""
+
+#: src/modules/conf_desklock/e_mod_main.c:35
+msgid "Screen Lock"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:62
+#: src/modules/pager/e_mod_main.c:822
+msgid "Virtual Desktops Settings"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:239
+msgid "Number of Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:258
+#: src/modules/conf_desks/e_int_config_desks.c:295
+msgid "Desktop Mouse Flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:259
+msgid "Animated flip"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:277
+msgid "Desktops"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:296
+msgid "Flip when dragging objects to the screen edge"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:298
+msgid "Wrap desktops around when flipping"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:302
+msgid "Flip Animation"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:304
+msgid "Off"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:307
+msgid "Pane"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:310
+msgid "Zoom"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:313
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:146
+#, c-format
+msgid "%1.1f sec"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:317
+msgid "Background panning"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:321
+#, c-format
+msgid "%.2f X-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_int_config_desks.c:325
+#, c-format
+msgid "%.2f Y-axis pan factor"
+msgstr ""
+
+#: src/modules/conf_desks/e_mod_main.c:35
+msgid "Virtual Desktops"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
+msgid "Dialog Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
+#: src/modules/conf_engine/e_int_config_engine.c:94
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:114
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
+#: src/modules/conf_performance/e_int_config_performance.c:94
+#: src/modules/conf_performance/e_int_config_performance.c:134
+#: src/modules/conf_winlist/e_int_config_winlist.c:144
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
+#: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
+#: src/modules/mixer/conf_module.c:96
+msgid "General Settings"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
+msgid "Disable Confirmation Dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+msgid "Normal Windows"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
+msgid "Default Settings Dialogs Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
+msgid "Basic Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
+msgid "Advanced Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
+msgid "Default Dialog Mode"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_mod_main.c:35
+msgid "Dialogs"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:129
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:136
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored in %d seconds."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:146
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d at %d Hz "
+"will be restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:153
+#, c-format
+msgid ""
+"Does this look OK? <hilight>Save</hilight> if it does, or Restore if not."
+"<br>If you do not press a button, the old resolution of<br>%dx%d will be "
+"restored <hilight>IMMEDIATELY</hilight>."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:190
+msgid "Resolution change"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:194
+msgid "Save"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:195
+msgid "Restore"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:228
+msgid "Screen Resolution Settings"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:404
+msgid "Resolution"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:411
+msgid "Restore on login"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:415
+msgid "Refresh"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:474
+msgid "Rotation"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:493
+msgid "Mirroring"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:640
+msgid "Missing Features"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:641
+msgid ""
+"Your X Display Server is missing support for<br>the <hilight>XRandR</"
+"hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
+"resolutions without<br>the support of this extension. It could also "
+"be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
+"XRandR support detected."
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:653
+msgid "No Refresh Rates Found"
+msgstr ""
+
+#: src/modules/conf_display/e_int_config_display.c:654
+msgid ""
+"No refresh rates were reported by your X Display Server.<br>If you are "
+"running a nested X Display Server, then<br>this is to be expected. However, "
+"if you are not, then<br>the current refresh rate will be used when "
+"setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
+"screen."
+msgstr ""
+
+#: src/modules/conf_display/e_mod_main.c:35
+msgid "Screen Resolution"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:60
+#: src/modules/conf_dpms/e_int_config_dpms.c:81
+msgid "Display Power Management Signaling"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:61
+msgid "The current display server is not <br>DPMS capable."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:82
+msgid "The current display server does not <br>have the DPMS extension."
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:112
+msgid "Display Power Management Settings"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:198
+msgid "Enable Display Power Management"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:202
+msgid "Timers"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:204
+msgid "Standby time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:216
+msgid "Suspend time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_int_config_dpms.c:228
+msgid "Off time"
+msgstr ""
+
+#: src/modules/conf_dpms/e_mod_main.c:35
+msgid "Power Management"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
+#: 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 ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+msgid ""
+"Please select an edge,<br>or click <hilight>Close</hilight> to abort."
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
+msgid "Edge Binding Settings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
+#: src/modules/conf_edgebindings/e_mod_main.c:35
+msgid "Edge Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
+msgid "Add Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
+msgid "Delete Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
+msgid "Modify Edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:239
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
+msgid "Delete All"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:243
+msgid "Restore Default Bindings"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:248
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
+msgid "Action"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:255
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
+msgid "Action Params"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
+msgid "General Options"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
+msgid "Allow binding activation with fullscreen windows"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
+msgid "Edge Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
+#, c-format
+msgid "%.2f seconds"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
+msgid "Binding Edge Error"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
+#, c-format
+msgid ""
+"The binding key sequence, that you choose, is already used by <br><hilight>%"
+"s</hilight> action.<br>Please choose another binding edge sequence."
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
+#: src/modules/gadman/e_mod_gadman.c:811
+msgid "CTRL"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
+#: src/modules/gadman/e_mod_gadman.c:816
+msgid "ALT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
+#: src/modules/gadman/e_mod_gadman.c:822
+msgid "SHIFT"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
+#: src/modules/gadman/e_mod_gadman.c:828
+msgid "WIN"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_mod_main.c:34
+#: src/modules/conf_interaction/e_mod_main.c:34
+#: src/modules/conf_keybindings/e_mod_main.c:34
+#: src/modules/conf_mousebindings/e_mod_main.c:34
+#: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
+#: src/modules/mixer/app_mixer.c:301
+msgid "Input"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:38
+msgid "Engine Settings"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:95
+msgid "Enable Composite"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:102
+msgid "Default Engine"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:131
+msgid "Enable Composite Support ?"
+msgstr ""
+
+#: src/modules/conf_engine/e_int_config_engine.c:133
+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 ""
+
+#: src/modules/conf_engine/e_mod_main.c:35
+msgid "Engine"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:49
+msgid "Run Command Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:115
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:168
+msgid "Maximum Number of Matched Apps to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:119
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:172
+msgid "Maximum Number of Matched Exes to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:123
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:176
+msgid "Maximum History to List"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:129
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:182
+#: src/modules/conf_winlist/e_int_config_winlist.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:269
+msgid "Scroll Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:130
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:183
+#: src/modules/conf_winlist/e_int_config_winlist.c:184
+#: src/modules/conf_winlist/e_int_config_winlist.c:270
+msgid "Scroll Animate"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:185
+#: src/modules/conf_winlist/e_int_config_winlist.c:272
+msgid "Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:189
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:228
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:232
+#: src/modules/conf_winlist/e_int_config_winlist.c:261
+#: src/modules/conf_winlist/e_int_config_winlist.c:276
+#: src/modules/conf_winlist/e_int_config_winlist.c:287
+#: src/modules/conf_winlist/e_int_config_winlist.c:291
+#, c-format
+msgid "%1.2f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:197
+msgid "Terminal Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:198
+msgid "Terminal Command (CTRL+RETURN to utilize)"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:206
+#: src/modules/conf_winlist/e_int_config_winlist.c:295
+msgid "Size Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:207
+#: src/modules/conf_winlist/e_int_config_winlist.c:296
+msgid "Minimum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:209
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:213
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:217
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:221
+#: src/modules/conf_winlist/e_int_config_winlist.c:298
+#: src/modules/conf_winlist/e_int_config_winlist.c:302
+#: src/modules/conf_winlist/e_int_config_winlist.c:306
+#: src/modules/conf_winlist/e_int_config_winlist.c:310
+#, c-format
+msgid "%4.0f"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:211
+#: src/modules/conf_winlist/e_int_config_winlist.c:300
+msgid "Minimum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:215
+#: src/modules/conf_winlist/e_int_config_winlist.c:304
+msgid "Maximum Width"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:219
+#: src/modules/conf_winlist/e_int_config_winlist.c:308
+msgid "Maximum Height"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:225
+#: src/modules/conf_winlist/e_int_config_winlist.c:284
+msgid "Position Settings"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:226
+#: src/modules/conf_winlist/e_int_config_winlist.c:285
+msgid "X-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_int_config_exebuf.c:230
+#: src/modules/conf_winlist/e_int_config_winlist.c:289
+msgid "Y-Axis Alignment"
+msgstr ""
+
+#: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
+#: src/modules/exebuf/e_mod_main.c:129
+msgid "Run Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:60
+msgid "Core"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:61
+msgid "Title Bar"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:64
+msgid "Textblock Plain"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:65
+msgid "Textblock Light"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:66
+msgid "Textblock Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:70
+msgid "Settings Heading"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:71
+msgid "About Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:72
+msgid "About Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:73
+msgid "About Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:74
+msgid "Desklock Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:75
+msgid "Desklock Password"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:76
+msgid "Dialog Error"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:77
+msgid "Exebuf Command"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:78
+msgid "Splash Title"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:79
+msgid "Splash Text"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:80
+msgid "Splash Version"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:83
+msgid "Entry"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:84
+msgid "Frame"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:85
+msgid "Label"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:86
+msgid "Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:87
+msgid "Slider"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:88
+msgid "Radio Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:89
+msgid "Check Buttons"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:90
+msgid "Text List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:91
+msgid "List Item"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:94
+msgid "Filemanager"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:95
+msgid "Typebuf"
+msgstr ""
+
+#: 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:104
+msgid "Normal Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:105
+msgid "Large Styled"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:168
+msgid "Font Settings"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:271
+msgid "Big"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:277
+msgid "Really Big"
+msgstr ""
+
+#: 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:427
+msgid "Enable Custom Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
+#: 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:451
+msgid "Basic preview text: 123: 我的天空!"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:604
+msgid "Font Classes"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
+msgid "Enable Font Class"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
+msgid "Hinting"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
+msgid "Bytecode"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
+#: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
+msgid "Automatic"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
+msgid "Font Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
+msgid "Fallback Name"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
+msgid "Enable Fallbacks"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
+msgid "Icon Theme Settings"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
+msgid "Icon Themes"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
+msgid "Icon theme overrides general theme"
+msgstr ""
+
+#: src/modules/conf_icon_theme/e_mod_main.c:22
+msgid "Icon Theme"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:109
+#: src/modules/conf_imc/e_mod_main.c:35
+msgid "Input Method Settings"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:297
+msgid "Input Method Selector"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:300
+#: src/modules/conf_imc/e_int_config_imc.c:894
+msgid "Use No Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:305
+#: src/modules/conf_imc/e_int_config_imc.c:961
+msgid "Setup Selected Input Method"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:901
+msgid "New"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:903
+msgid "Import..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:908
+msgid "Input Method Parameters"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:918
+msgid "Execute Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:925
+msgid "Setup Command"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc.c:934
+msgid "Exported Environment Variables"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:66
+msgid "Select an Input Method Settings..."
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:281
+#: src/modules/conf_imc/e_int_config_imc_import.c:296
+msgid "Input Method Config Import Error"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:282
+msgid ""
+"Enlightenment was unable to import the configuration.<br><br>Are you sure "
+"this is really a valid configuration?"
+msgstr ""
+
+#: src/modules/conf_imc/e_int_config_imc_import.c:297
+msgid ""
+"Enlightenment was unable to import the configuration<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
+#: src/modules/wizard/page_010.c:142
+msgid "Language"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:37
+msgid "Interaction Settings"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:94
+msgid "Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:96
+msgid "Enable Thumbscroll"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:100
+msgid "Threshold for a thumb drag"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:103
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
+#, c-format
+msgid "%1.0f pixels"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:107
+msgid "Threshold for applying drag momentum"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:110
+#, c-format
+msgid "%1.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:114
+msgid "Friction slowdown"
+msgstr ""
+
+#: src/modules/conf_interaction/e_int_config_interaction.c:117
+#, 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:583
+#: src/modules/conf_intl/e_mod_main.c:35
+msgid "Language Settings"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:900
+#: src/modules/conf_intl/e_int_config_intl.c:977
+msgid "Language Selector"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:950
+#: src/modules/conf_intl/e_int_config_intl.c:1028
+msgid "Locale Selected"
+msgstr ""
+
+#: src/modules/conf_intl/e_int_config_intl.c:951
+#: src/modules/conf_intl/e_int_config_intl.c:1029
+msgid "Locale"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:7
+msgid ""
+"Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:92
+msgid "Key Binding Settings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:223
+#: src/modules/conf_keybindings/e_mod_main.c:35
+msgid "Key Bindings"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:228
+msgid "Add Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:231
+msgid "Delete Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:235
+msgid "Modify Key"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:918
+msgid "Key Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
+msgid "Binding Key Error"
+msgstr ""
+
+#: src/modules/conf_keybindings/e_int_config_keybindings.c:1130
+#, 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:44
+#: src/modules/conf_menus/e_int_config_menus.c:110
+#: src/modules/conf_menus/e_int_config_menus.c:169
+#: src/modules/conf_menus/e_mod_main.c:35
+msgid "Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:101
+#: src/modules/conf_menus/e_int_config_menus.c:160
+msgid "Main Menu Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:102
+#: src/modules/conf_menus/e_int_config_menus.c:161
+msgid "Show Favorites In Main Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:105
+#: src/modules/conf_menus/e_int_config_menus.c:164
+msgid "Show Applications In Main Menu"
+msgstr ""
+
+#: 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 ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:114
+#: src/modules/conf_menus/e_int_config_menus.c:173
+msgid "Show Generic In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:117
+#: src/modules/conf_menus/e_int_config_menus.c:176
+msgid "Show Comment In Menu"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:181
+msgid "Autoscroll Settings"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:182
+msgid "Autoscroll Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:184
+#: src/modules/conf_menus/e_int_config_menus.c:189
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:136
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:144
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:152
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
+#, c-format
+msgid "%2.0f pixels"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:187
+msgid "Autoscroll Cursor Margin"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:194
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:195
+msgid "Menu Scroll Speed"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:197
+#, c-format
+msgid "%5.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:200
+msgid "Fast Mouse Move Threshhold"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:202
+#: src/modules/conf_window_display/e_int_config_window_display.c:229
+#, c-format
+msgid "%4.0f pixels/sec"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:206
+msgid "Click Drag Timeout"
+msgstr ""
+
+#: src/modules/conf_menus/e_int_config_menus.c:208
+#, c-format
+msgid "%2.2f seconds"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:64
+#: src/modules/conf_mime/e_mod_main.c:35
+msgid "File Icons"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime.c:186
+msgid "File Types"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:69
+msgid "File Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:137
+msgid "Mime:"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:147
+msgid "Use Generated Thumbnail"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:150
+msgid "Use Theme Icon"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:153
+msgid "Use Edje File"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:156
+msgid "Use Image"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:159
+msgid "Use Default"
+msgstr ""
+
+#: src/modules/conf_mime/e_int_config_mime_edit.c:270
+msgid "Select an Edj File"
+msgstr ""
+
+#: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
+#: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
+msgid "Files"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
+msgid ""
+"Please hold any modifier you want<br>and press any button on your mouse,<br> "
+"or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
+"highlight> to abort."
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
+msgid "Mouse Binding Settings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
+#: src/modules/conf_mousebindings/e_mod_main.c:35
+msgid "Mouse Bindings"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
+msgid "Add Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
+msgid "Delete Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
+msgid "Modify Binding"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
+msgid "Restore Mouse and Wheel Binding Defaults"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
+msgid "Action Context"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
+msgid "Any"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
+msgid "Win List"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
+msgid "Popup"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
+msgid "Zone"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
+msgid "Container"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
+msgid "Manager"
+msgstr ""
+
+#: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
+msgid "Mouse Binding Sequence"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
+msgid "Cursor Settings"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
+msgid "Show Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
+msgid "Idle Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
+msgid "Use Enlightenment Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
+msgid "Use X Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
+msgid "Cursor Size"
+msgstr ""
+
+#: src/modules/conf_mouse_cursor/e_mod_main.c:35
+msgid "Mouse Cursor"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
+#: src/modules/conf_mouse/e_mod_main.c:35
+msgid "Mouse Settings"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
+msgid "Mouse Hand"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
+msgid "Mouse Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
+msgid "Acceleration"
+msgstr ""
+
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
+msgid "Threshold"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:62
+msgid "Search Path Settings"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:73
+msgid "Data"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:75
+msgid "Images"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:79
+#: src/modules/conf_theme/e_int_config_theme.c:1010
+msgid "Themes"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:81
+msgid "Icons"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:85
+msgid "Backgrounds"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:87
+msgid "Messages"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:168
+msgid "E Paths"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:199
+msgid "Default Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_int_config_paths.c:206
+msgid "User Defined Directories"
+msgstr ""
+
+#: src/modules/conf_paths/e_mod_main.c:35
+msgid "Search Directories"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:40
+msgid "Performance Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:95
+#: src/modules/conf_performance/e_int_config_performance.c:135
+msgid "Framerate"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:97
+#: src/modules/conf_performance/e_int_config_performance.c:137
+#, c-format
+msgid "%1.0f fps"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:100
+#: src/modules/conf_performance/e_int_config_performance.c:140
+msgid "Application Priority"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:146
+msgid "Cache Settings"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:147
+msgid "Cache Flush Interval"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:152
+msgid "Size Of Font Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:154
+#, c-format
+msgid "%1.1f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:157
+msgid "Size Of Image Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:159
+#, c-format
+msgid "%1.0f MB"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:162
+msgid "Number Of Edje Files To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:164
+#, c-format
+msgid "%1.0f files"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:167
+msgid "Number Of Edje Collections To Cache"
+msgstr ""
+
+#: src/modules/conf_performance/e_int_config_performance.c:169
+#, c-format
+msgid "%1.0f collections"
+msgstr ""
+
+#: src/modules/conf_performance/e_mod_main.c:35
+msgid "Performance"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
+msgid "Profile Selector"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
+msgid "Available Profiles"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
+msgid "Select a profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
+msgid "Reset"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
+#, c-format
+msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
+msgid "Delete OK?"
+msgstr ""
+
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
+msgid "Add New Profile"
+msgstr ""
+
+#: src/modules/conf_profiles/e_mod_main.c:22
+msgid "Profiles"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:61
+msgid "Scaling Settings"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:140
+msgid "Scale with DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:144
+msgid "Relative"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:145
+msgid "Base DPI to scale relative to"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:148
+#: src/modules/conf_scale/e_int_config_scale.c:259
+#, c-format
+msgid "%1.0f DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:151
+#, c-format
+msgid "Currently %i DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:245
+msgid "Policy"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:248
+msgid "Don't Scale"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:252
+msgid "Scale relative to screen DPI"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:255
+#, c-format
+msgid "Base DPI (Currently %i DPI)"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:263
+msgid "Custom scaling factor"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:266
+#: src/modules/conf_scale/e_int_config_scale.c:276
+#: src/modules/conf_scale/e_int_config_scale.c:282
+#, c-format
+msgid "%1.2f times"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:272
+msgid "Constraints"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:273
+msgid "Minimum"
+msgstr ""
+
+#: src/modules/conf_scale/e_int_config_scale.c:279
+msgid "Maximum"
+msgstr ""
+
+#: src/modules/conf_scale/e_mod_main.c:35
+msgid "Scaling"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:67
+msgid "Screen Saver Settings"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:135
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:173
+msgid "Enable X screensaver"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:138
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:176
+msgid "Screensaver Timer(s)"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:140
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:178
+msgid "Time until X screensaver starts"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:186
+msgid "Time until X screensaver alternates"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:216
+msgid "Blanking"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:221
+msgid "Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:224
+msgid "Not Preferred"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:229
+msgid "Exposure Events"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:234
+msgid "Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_int_config_screensaver.c:237
+msgid "Don't Allow"
+msgstr ""
+
+#: src/modules/conf_screensaver/e_mod_main.c:35
+msgid "Screen Saver"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:71
+msgid "Configured Shelves"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:84
+#: src/modules/ibar/e_mod_config.c:114
+msgid "Setup"
+msgstr ""
+
+#: src/modules/conf_shelves/e_int_config_shelf.c:277
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"shelf?"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:39
+msgid "Startup Settings"
+msgstr ""
+
+#: src/modules/conf_startup/e_int_config_startup.c:328
+msgid "Show Splash Screen on Login"
+msgstr ""
+
+#: src/modules/conf_startup/e_mod_main.c:35
+#: src/modules/conf_transitions/e_int_config_transitions.c:134
+msgid "Startup"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:90
+msgid "Theme Selector"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:434
+msgid " Import..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:438
+msgid " Online..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1001
+msgid "Theme Categories"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1019
+msgid "Assign"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme.c:1025
+msgid "Clear All"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:67
+msgid "Select a Theme..."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:274
+#: src/modules/conf_theme/e_int_config_theme_import.c:283
+msgid "Theme Import Error"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:275
+msgid ""
+"Enlightenment was unable to import the theme.<br><br>Are you sure this is "
+"really a valid theme?"
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_import.c:284
+msgid "Enlightenment was unable to import the theme<br>due to a copy error."
+msgstr ""
+
+#: src/modules/conf_theme/e_int_config_theme_web.c:127
+msgid "Exchange themes"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:44
+msgid "Transition Settings"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:126
+msgid "Events"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:135
+msgid "Desk Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:136
+msgid "Background Change"
+msgstr ""
+
+#: src/modules/conf_transitions/e_int_config_transitions.c:144
+#: src/modules/conf_transitions/e_mod_main.c:35
+msgid "Transitions"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
+msgid "Wallpaper Settings"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
+msgid "Use Theme Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
+msgid "Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
+msgid "Gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
+msgid "Online..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
+msgid "Where to place the Wallpaper"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+msgid "All Desktops"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+msgid "This Desktop"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
+msgid "This Screen"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
+msgid "Create a gradient..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
+msgid "Color 1:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
+msgid "Color 2:"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
+msgid "Fill Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
+msgid "Horizontal"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
+msgid "Vertical"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
+msgid "Diagonal Up"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
+msgid "Diagonal Down"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
+msgid "Radial"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
+msgid "Gradient Creation Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
+msgid "For some reason, Enlightenment was unable to create a gradient."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
+msgid "Wallpaper settings..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
+msgid "Fill and Stretch Options"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
+msgid "Stretch"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
+msgid "Center"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
+msgid "Tile"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
+msgid "Within"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
+msgid "Fill"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
+msgid "File Quality"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
+msgid "Use original file"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
+#, c-format
+msgid "%3.0f%%"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
+msgid "Select a Picture..."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
+msgid "Picture Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
+msgid ""
+"Enlightenment was unable to import the picture<br>due to conversion errors."
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
+msgid "Wallpaper Import Error"
+msgstr ""
+
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
+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:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
+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:117
+msgid "Exchange wallpapers"
+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:32
+#: src/modules/conf_wallpaper/e_mod_main.c:96
+msgid "Wallpaper"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:58
+#: src/modules/conf_window_display/e_mod_main.c:35
+msgid "Window Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:167
+msgid "Display"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:168
+msgid "Show window geometry information when moving or resizing"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:170
+#: src/modules/conf_window_display/e_int_config_window_display.c:227
+msgid "Animate the shading and unshading of windows"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:174
+#: src/modules/conf_window_display/e_int_config_window_display.c:254
+msgid "Automatic New Window Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:176
+#: src/modules/conf_window_display/e_int_config_window_display.c:257
+msgid "Smart Placement"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:178
+#: src/modules/conf_window_display/e_int_config_window_display.c:259
+msgid "Don't hide Gadgets"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:180
+#: src/modules/conf_window_display/e_int_config_window_display.c:261
+msgid "Place at mouse pointer"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:182
+#: src/modules/conf_window_display/e_int_config_window_display.c:263
+msgid "Place manually with the mouse"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:184
+#: src/modules/conf_window_display/e_int_config_window_display.c:265
+msgid "Automatically switch to desktop of new window"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:203
+msgid "Window Move Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:205
+#: src/modules/conf_window_display/e_int_config_window_display.c:216
+msgid "Display information"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:207
+msgid "Follow the window as it moves"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:214
+msgid "Window Resize Geometry"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:218
+msgid "Follow the window as it resizes"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:225
+msgid "Window Shading"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:234
+msgid "Linear"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:238
+msgid "Smooth accelerate and decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:242
+msgid "Accelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:246
+msgid "Decelerate"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:269
+msgid "Window Border"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:272
+msgid "Prefer user defined icon"
+msgstr ""
+
+#: src/modules/conf_window_display/e_int_config_window_display.c:274
+msgid "Prefer application provided icon"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:50
+msgid "Focus Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:165
+msgid "Click Window to Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:167
+msgid "Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:169
+msgid "Most recent Window under the Mouse"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:183
+msgid "Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:185
+msgid "Click to focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:187
+msgid "Pointer focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:189
+msgid "Sloppy focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:193
+msgid "New Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:195
+msgid "No new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:197
+msgid "All new windows get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:199
+msgid "Only new dialogs get focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:201
+msgid "Only new dialogs get focus if the parent has focus"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:205
+msgid "Other Settings"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:206
+msgid "Always pass on caught click events to programs"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:208
+msgid "A click on a window always raises it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:210
+msgid "A click in a window always focuses it"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:212
+msgid "Refocus last focused window on desktop switch"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:214
+msgid "Revert focus when hiding or closing a window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_int_config_focus.c:216
+msgid "Slide pointer to a new focused window"
+msgstr ""
+
+#: src/modules/conf_window_focus/e_mod_main.c:35
+#: src/modules/wizard/page_060.c:26
+msgid "Window Focus"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
+#: src/modules/conf_window_manipulation/e_mod_main.c:35
+msgid "Window Geometry"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
+msgid "Resistance"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
+msgid "Resist moving or resizing a window over an obstacle"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
+msgid "Resistance between windows:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
+msgid "Resistance at the edge of the screen:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
+msgid "Resistance to desktop gadgets:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
+msgid "Keyboard move and resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
+msgid "Automatically accept changes after:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
+msgid "Move by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
+msgid "Resize by:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
+#: src/modules/conf_window_manipulation/e_mod_main.c:37
+msgid "Window Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
+msgid "Smart expansion"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
+msgid "Fill available space"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
+msgid "Maximize Policy"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
+msgid "Maximize Directions"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
+msgid "Both"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
+msgid "Automatically move/resize windows on shelf autohide"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
+#: src/modules/conf_window_manipulation/e_mod_main.c:36
+msgid "Window Stacking"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
+msgid "Automatically raise windows on mouse over"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
+msgid "Allow windows to be above fullscreen window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
+msgid "Autoraise"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
+msgid "Delay before raising:"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
+msgid "Raise Window"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
+msgid "Raise when starting to move or resize"
+msgstr ""
+
+#: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
+msgid "Raise when clicking to focus"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
+#: src/modules/conf_window_remembers/e_mod_main.c:17
+msgid "Window Remembers"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
+msgid "Delete Remember(s)"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
+msgid "Details"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
+msgid "<No Name>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
+msgid "Class:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
+msgid "<No Class>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
+msgid "Title:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
+msgid "<No Title>"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
+msgid "Role:"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
+msgid "<No Role>"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:62
+msgid "Window List Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:145
+msgid "Show iconified windows"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:147
+msgid "Show iconified windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:151
+msgid "Show iconified windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:157
+msgid "Show windows from other desks"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:159
+msgid "Show windows from other screens"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:163
+#: src/modules/conf_winlist/e_int_config_winlist.c:241
+msgid "Selection Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:164
+#: src/modules/conf_winlist/e_int_config_winlist.c:242
+msgid "Focus window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:166
+#: src/modules/conf_winlist/e_int_config_winlist.c:244
+msgid "Raise window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:168
+#: src/modules/conf_winlist/e_int_config_winlist.c:246
+msgid "Warp mouse to window while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:170
+#: src/modules/conf_winlist/e_int_config_winlist.c:248
+msgid "Uncover windows while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:172
+#: src/modules/conf_winlist/e_int_config_winlist.c:250
+msgid "Jump to desk while selecting"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:176
+#: src/modules/conf_winlist/e_int_config_winlist.c:254
+msgid "Warp Settings"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:177
+#: src/modules/conf_winlist/e_int_config_winlist.c:255
+msgid "Warp At End"
+msgstr ""
+
+#: src/modules/conf_winlist/e_int_config_winlist.c:257
+msgid "Warp Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:135
+msgid "Cpufreq"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:182
+msgid "Fast (4 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:189
+msgid "Medium (8 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:196
+msgid "Normal (32 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:203
+msgid "Slow (64 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:210
+msgid "Very Slow (256 ticks)"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:225
+msgid "Manual"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
+msgid "Lower Power Automatic"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
+msgid "Minimum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
+msgid "Maximum Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:244
+msgid "Restore CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:252
+msgid "Powersaving policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:280
+msgid "Automatic powersaving"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:299
+#, c-format
+msgid "%i MHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:301
+#, c-format
+msgid "%i.%i GHz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:318
+msgid "Time Between Updates"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:324
+msgid "Set CPU Power Policy"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:331
+msgid "Set CPU Speed"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:337
+msgid "Powersaving behavior"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:386
+msgid ""
+"There was an error trying to set the<br>cpu frequency governor via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:412
+msgid ""
+"Your kernel does not support setting the<br>CPU frequency at all. You may be "
+"missing<br>Kernel modules or features, or your CPU<br>simply does not "
+"support this feature."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:432
+msgid ""
+"There was an error trying to set the<br>cpu frequency setting via the "
+"module's<br>setfreq utility."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:40
+msgid "Dropshadow Settings"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:108
+msgid "Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:111
+msgid "High Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:113
+msgid "Medium Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:115
+msgid "Low Quality"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:119
+msgid "Blur Type"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:122
+msgid "Very Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:124
+msgid "Fuzzy"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:128
+msgid "Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:130
+msgid "Very Sharp"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:134
+msgid "Shadow Distance"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:137
+msgid "Very Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:139
+msgid "Far"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:141
+msgid "Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:143
+msgid "Very Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:145
+msgid "Extremely Near"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:147
+msgid "Underneath"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:151
+msgid "Shadow Darkness"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:154
+msgid "Very Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:156
+msgid "Dark"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:158
+msgid "Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_config.c:160
+msgid "Very Light"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:90
+msgid "Dropshadow"
+msgstr ""
+
+#: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
+msgid "Run Command Dialog"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
+msgid "Home"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:322
+msgid "Favorites"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:334
+msgid "Root"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:431
+msgid ""
+"Fileman Module Settings data needed upgrading. Your old configuration<br>has "
+"been wiped and a new set of defaults initialized. This<br>will happen "
+"regularly during development, so don't report a<br>bug. This simply means "
+"Fileman module needs new configuration<br>data by default for usable "
+"functionality that your old<br>configuration simply lacks. This new set of "
+"defaults will fix<br>that by adding it in. You can re-configure things now "
+"to your<br>liking. Sorry for the hiccup in your configuration.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:444
+msgid ""
+"Your Fileman Module configuration is NEWER than Fileman Module version. This "
+"is very<br>strange. This should not happen unless you downgraded<br>the "
+"Fileman Module or copied the configuration from a place where<br>a newer "
+"version of the Fileman Module was running. This is bad and<br>as a "
+"precaution your configuration has been now restored to<br>defaults. Sorry "
+"for the inconvenience.<br>"
+msgstr ""
+
+#: src/modules/fileman/e_mod_main.c:513
+msgid "Fileman Settings Updated"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:95
+msgid "Fileman Settings"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:227
+msgid "Icon Size"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:233
+msgid "View"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:236
+msgid "Open Dirs In Place"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:240
+msgid "Sort Dirs First"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:243
+msgid "Case Sensitive"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:247
+msgid "Use Single Click"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:250
+msgid "Use Alternate Selection Modifiers"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:254
+msgid "Show Icon Extension"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:257
+msgid "Show Full Path"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:260
+msgid "Show Desktop Icons"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:263
+msgid "Show Toolbar"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:267
+#: src/modules/gadman/e_mod_gadman.c:775
+msgid "Behavior"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:270
+msgid "Show HAL icons on desktop"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:273
+msgid "Mount volumes on insert"
+msgstr ""
+
+#: src/modules/fileman/e_mod_config.c:276
+msgid "Open filemanager on mount"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1412
+msgid "Go to Parent Directory"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1474
+msgid "Other application..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
+msgid "Open"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
+msgid "Open with..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1838
+msgid "Known Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1848
+msgid "Specific Applications"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:1890
+msgid "Custom Command"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2146
+#: src/modules/fileman_opinfo/e_mod_main.c:94
+#, c-format
+msgid "Copying is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2149
+#: src/modules/fileman_opinfo/e_mod_main.c:97
+#, c-format
+msgid "Moving is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2152
+#: src/modules/fileman_opinfo/e_mod_main.c:100
+#, c-format
+msgid "Deleting is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2155
+#: src/modules/fileman_opinfo/e_mod_main.c:103
+#, c-format
+msgid "Unknown operation from slave is aborted"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2165
+#: src/modules/fileman_opinfo/e_mod_main.c:113
+#, c-format
+msgid "Copy of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2167
+#: src/modules/fileman_opinfo/e_mod_main.c:115
+#, c-format
+msgid "Copying %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2171
+#: src/modules/fileman_opinfo/e_mod_main.c:119
+#, c-format
+msgid "Move of %s done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2173
+#: src/modules/fileman_opinfo/e_mod_main.c:121
+#, c-format
+msgid "Moving %s (eta: %d sec)"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2177
+#: src/modules/fileman_opinfo/e_mod_main.c:125
+#, c-format
+msgid "Delete done"
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2179
+#: src/modules/fileman_opinfo/e_mod_main.c:127
+#, c-format
+msgid "Deleting files..."
+msgstr ""
+
+#: src/modules/fileman/e_fwin.c:2182
+#: src/modules/fileman_opinfo/e_mod_main.c:130
+#, c-format
+msgid "Unknow operation from slave %d"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:138
+#: src/modules/fileman_opinfo/e_mod_main.c:148
+msgid "(no information)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:142
+#, c-format
+msgid "File: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:144
+#, c-format
+msgid "From: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:151
+#, c-format
+msgid "To: %s"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:329
+#, c-format
+msgid "Processing %d operation(s)"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:333
+msgid "Filemanager is idle"
+msgstr ""
+
+#: src/modules/fileman_opinfo/e_mod_main.c:414
+msgid "EFM Operation Info"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:58
+msgid "Gadgets Manager"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:147
+msgid "Background Mode"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
+msgid "Custom Image"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
+msgid "Custom Color"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:160
+msgid "Transparent"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:167
+msgid "Animations"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:168
+msgid "Background"
+msgstr ""
+
+#: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
+#: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
+#: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
+msgid "Gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:723
+msgid "Free"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:755
+msgid "Always on desktop"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:765
+msgid "On top pressing"
+msgstr ""
+
+#: src/modules/gadman/e_mod_gadman.c:796
+msgid "Add other gadgets"
+msgstr ""
+
+#: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
+msgid "Show/hide gadgets"
+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
+msgid "Window : List"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
+msgid "Next Window"
+msgstr ""
+
+#: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
+msgid "Previous Window"
+msgstr ""
+
+#: src/modules/winlist/e_winlist.c:141
+msgid "Select a window"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:56
+msgid "IBar Settings"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:102
+msgid "Selected Bar Source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:123
+msgid "Icon Labels"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
+msgid "Show Icon Label"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:130
+msgid "Display App Name"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:134
+msgid "Display App Comment"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:138
+msgid "Display App Generic"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:168
+msgid "Create new IBar source"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:169
+msgid "Enter a name for this new source:"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:183
+#, c-format
+msgid ""
+"You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
+"bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_config.c:187
+msgid "Are you sure you want to delete this bar source?"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:215
+msgid "IBar"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:797
+msgid "Change Icon Properties"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:802
+msgid "Remove Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:812
+msgid "Add An Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:819
+msgid "Create New Icon"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:835
+msgid "Add Application"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:51
+msgid "IBox Settings"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:104
+msgid "Display Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:109
+msgid "Display Title"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:114
+msgid "Display Class"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:119
+msgid "Display Icon Name"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:124
+msgid "Display Border Caption"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:154
+msgid "Show windows from all screens"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:159
+msgid "Show windows from current screen"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:168
+msgid "Show windows from all desktops"
+msgstr ""
+
+#: src/modules/ibox/e_mod_config.c:173
+msgid "Show windows from active desktop"
+msgstr ""
+
+#: src/modules/ibox/e_mod_main.c:227
+msgid "IBox"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:72
+msgid "Pager Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
+msgid "Flip desktop on mouse wheel"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
+msgid "Show desktop names"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
+msgid "Popup Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
+msgid "Show popup on desktop change"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:132
+msgid "Show popup for urgent windows"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:169
+msgid "Select and Slide button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
+#, c-format
+msgid "Click to set"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:176
+msgid "Drag and Drop button"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:183
+msgid "Drag whole desktop"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:192
+msgid "Keyaction popup height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
+#, c-format
+msgid "%.0f px"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:198
+msgid "Resistance to dragging"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:209
+msgid "Popup pager height"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
+msgid "Popup speed"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
+#, c-format
+msgid "%1.1f seconds"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:231
+msgid "Urgent Window Settings"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:232
+msgid "Show popup on urgent window"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:235
+msgid "Popup on urgent window sticks on the screen"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:288
+msgid "Pager Button Grab"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:290
+msgid ""
+"Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
+"<br>Or <hilight>Del</hilight> to reset the button."
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:345
+msgid "Attetion"
+msgstr ""
+
+#: src/modules/pager/e_mod_config.c:346
+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 ""
+
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
+#, c-format
+msgid "Button %i"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2850
+msgid "Show Pager Popup"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
+msgid "Popup Desk Right"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
+msgid "Popup Desk Left"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
+msgid "Popup Desk Up"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
+msgid "Popup Desk Down"
+msgstr ""
+
+#: src/modules/start/e_mod_main.c:111
+msgid "Start"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:34
+msgid "System Control"
+msgstr ""
+
+#: src/modules/syscon/e_mod_main.c:55
+msgid "System Controls"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:63
+msgid "Temperature Settings"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:248
+#: src/modules/temperature/e_mod_config.c:352
+msgid "Display Units"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:250
+#: src/modules/temperature/e_mod_config.c:354
+msgid "Celsius"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:252
+#: src/modules/temperature/e_mod_config.c:356
+msgid "Fahrenheit"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:256
+#: src/modules/temperature/e_mod_config.c:378
+msgid "Check Interval"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:258
+msgid "Fast"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:262
+msgid "Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:264
+msgid "Very Slow"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:271
+#: src/modules/temperature/e_mod_config.c:295
+#: src/modules/temperature/e_mod_config.c:396
+#: src/modules/temperature/e_mod_config.c:408
+msgid "High Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:274
+msgid "200 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:276
+msgid "150 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:278
+#: src/modules/temperature/e_mod_config.c:287
+msgid "110 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:282
+#: src/modules/temperature/e_mod_config.c:306
+#: src/modules/temperature/e_mod_config.c:401
+#: src/modules/temperature/e_mod_config.c:413
+msgid "Low Temperature"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:285
+msgid "130 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:289
+msgid "90 F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:298
+msgid "93 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:300
+msgid "65 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:302
+#: src/modules/temperature/e_mod_config.c:311
+msgid "43 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:309
+msgid "55 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:313
+msgid "32 C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:367
+msgid "Sensors"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:397
+#: src/modules/temperature/e_mod_config.c:402
+#, c-format
+msgid "%1.0f F"
+msgstr ""
+
+#: src/modules/temperature/e_mod_config.c:409
+#: src/modules/temperature/e_mod_config.c:414
+#, c-format
+msgid "%1.0f C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:147
+msgid "Temperature"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:221
+msgid "Next"
+msgstr ""
+
+#: src/modules/wizard/e_wizard.c:281
+msgid "Welcome to Enlightenment"
+msgstr ""
+
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
+msgid "Select one"
+msgstr ""
+
+#: src/modules/wizard/page_020.c:58
+msgid "Profile"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:91
+msgid ""
+"No menu files were<br>found on your system.<br>Please see "
+"the<br>documentation on<br>www.enlightenment.org<br>for more details "
+"on<br>how to get your<br>application menus<br>working."
+msgstr ""
+
+#: src/modules/wizard/page_030.c:107
+msgid "Select application menu"
+msgstr ""
+
+#: src/modules/wizard/page_030.c:124
+msgid "System Default"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:25
+msgid "Launcher Bar"
+msgstr ""
+
+#: src/modules/wizard/page_040.c:27
+msgid "Select applications"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:28
+msgid "Desktop Files"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:32
+msgid "No icons on desktop"
+msgstr ""
+
+#: src/modules/wizard/page_050.c:35
+msgid "Enable desktop icons"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:28
+msgid "Focus mode"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:32
+msgid "Click to focus windows"
+msgstr ""
+
+#: src/modules/wizard/page_060.c:35
+msgid "Mouse over focuses windows"
+msgstr ""
+
+#: src/modules/wizard/page_070.c:204
+msgid "Select Icons to Add"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:60
+msgid "Quick Launch"
+msgstr ""
+
+#: src/modules/wizard/page_080.c:62
+msgid "Select Applications"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:165
+msgid "Capture"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:167
+msgid "Playback"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:289
+msgid "Output"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:363
+msgid "Cards"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
+msgid "Channels"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:390
+msgid "Card:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:394
+msgid "Channel:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:398
+msgid "Type:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:402
+msgid "Left:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:407
+msgid "Right:"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
+msgid "Mute"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
+msgid "Lock Sliders"
+msgstr ""
+
+#: src/modules/mixer/app_mixer.c:419
+msgid "Edit"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:202
+msgid "Show both sliders when locked"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:322
+msgid "Sound Cards"
+msgstr ""
+
+#: src/modules/mixer/conf_gadget.c:377
+msgid "Mixer Settings"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:98
+msgid "Mixer to use for global actions:"
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:152
+msgid "Launch mixer..."
+msgstr ""
+
+#: src/modules/mixer/conf_module.c:187
+msgid "Mixer Module Settings"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:123
+msgid "Mixer Settings Updated"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:602
+msgid "Controls"
+msgstr ""
+
+#: src/modules/mixer/e_mod_main.c:1157
+msgid ""
+"Mixer Module Settings data changed.<br>Your old configuration has been "
+"replaced with new default.<br>Sorry for the inconvenience."
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:214
+msgid "Connection Manager"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:731
+msgid "Network Connection Settings"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:737
+msgid "Network Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:742
+msgid "Wifi"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:745
+msgid "LAN"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:748
+msgid "Specific Device"
+msgstr ""
+
+#: src/modules/connman/e_mod_main.c:769
+msgid "Networks"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:891
+msgid "Another systray exists"
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:892
+msgid "There can be only one systray gadget and another one already exists."
+msgstr ""
+
+#: src/modules/systray/e_mod_main.c:1094
+msgid "Systray"
+msgstr ""
diff --git a/po/ru.gmo b/po/ru.gmo
index ef4c805..8497815 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index a59afff..bfe8547 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,40 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-08 07:11+0000\n"
-"Last-Translator: Koptev Oleg <Unknown>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-06 10:49+0000\n"
+"Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Koptev Oleg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Об Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -49,16 +51,15 @@ 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 ""
-"Авторское право &copy; 1999-2008, Команда разработчиков Enlightenment."
-"<br><br> Мы надеемся, что Вам нравится использовать эту программу также, как "
-"нам нравится писать её.<br><br> Это программное обеспечение предоставляется "
-"как есть, без явной или подразумеваемой гарантии. Это программное "
-"обеспечение покрыто лицензионными условиями, пожалуйста см. установленные на "
-"вашей системе файлы лицензий COPYING и COPYING-PLAIN. Enlightenment "
-"находится в стадии <hilight>УСИЛЕННОЙ РАЗРАБОТКИ</hilight> и он не стабилен. "
-"Большинство особенностей не работает или не существует вообще, а то что "
-"работает - может иметь много ошибок.<br>Вы были <hilight>ПРЕДУПРЕЖДЕНЫ!</"
-"hilight>"
+"Copyright &copy; 1999-2009, команда разработки Enlightenment Development."
+"<br><br>Мы надеемся, что вам так же понравится использовать эту программу, "
+"как нам понравилось ее писать.<br><br>Эта программа предоставляется как есть "
+"без явной или подразумеваемой гарантии. Использование этой программа "
+"регулируется лицензионным соглашением, пожалуйста, обратитесь к файлам "
+"лицензий COPYING и COPYING-PLAIN, установленным на вашей системе."
+"<br><br>Enlightenment в <hilight>АКТИВНОЙ РАЗРАБОТКЕ</hilight> и не является "
+"стабильной. Многие возможности незакончены или вообще отсутствуют, и в них "
+"может быть много ошибок. Вас <hilight>ПРЕДУПРЕДИЛИ!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -78,45 +79,45 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Вы действительно хотите убить это окно?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Да"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Нет"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Вы запросили выйти из Enlightenment.<br><br>Вы действительно хотите выйти?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Вы действительно хотите завершить сессию?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Вы запросили завершить сессию.<br><br>Вы уверены, что Вы этого хотите?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Вы действительно хотите выключить компьютер?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
@@ -124,28 +125,28 @@ msgstr ""
 "Вы запросили выключить ваш компьютер.<br><br>Вы действительно хотите "
 "выключить?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Вы действительно хотите перегрузить компьютер?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 "Вы запросили перегрузить ваш компьютер.<br><br>Вы действительно хотите этого?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "Вы запросили suspend компьютера.<br><br>Вы действительно хотите этого?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Вы действительно хотите \"заморозить\" систему?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -153,494 +154,494 @@ msgstr ""
 "Вы запросили \"заморозить\" ваш компьютер.<br><br>Вы действительно хотите "
 "этого?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Окно: Действия"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Двигать"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Изменить Размер"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Меню Окна"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Повысить"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Понизить"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Убить"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Окно: Состояние"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Включить Режим Окна \"Липкий\""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Переключить Режим Иконки"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Переключить Полноэкранный Режим"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Увеличить"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Увеличить в Полный Экран"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Режим Увеличения \"Умный\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Режим Увеличения \"Расширить\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Режим Увеличения \"Заполнить\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Переключить Режим Свернуть Вверх"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Переключить Режим Свернуть Вниз"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Переключить Режим Свернуть Влево"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Переключить Режим Свернуть Вправо"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Переключить Свёрнутый Режим"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Переключить Режим Без Бордюра"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Переключить Режим Прикрепления"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Перенести Стол Влево"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Перенести Стол Вправо"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Перенести Стол Вверх"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Перенести Стол Вниз"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Перенести Стол По..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Показать Рабочий Стол"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Показать полку"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Перенести Стол На..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Перенести Стол Линейно..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Переключить на Рабочий Стол 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Переключить на Рабочий Стол 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Переключить на Рабочий Стол 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Переключить на Рабочий Стол 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Переключить на Рабочий Стол 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Переключить на Рабочий Стол 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Переключить на Рабочий Стол 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Переключить на Рабочий Стол 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Переключить на Рабочий Стол 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Переключить на Рабочий Стол 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Переключить на Рабочий Стол 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Переключить на Рабочий Стол..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Перенести Стол Влево (Все Экраны)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Перенести Стол Вправо (Все Экраны)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Перенести Стол Вверх (Все Экраны)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Перенести Стол Вниз (Все Экраны)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Перенести Стол Через... (Все Экраны)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Перенести Стол На... (Все Экраны)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Перенести Стол Линейно... (Все Экраны)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Развернуть рабочий стол в направлении..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Переключиться На Раб. Стол 0 (Все Экраны)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Переключиться На Раб. Стол 1 (Все Экраны)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Переключиться На Раб. Стол 2 (Все Экраны)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Переключиться На Раб. Стол 3 (Все Экраны)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Переключиться На Раб. Стол 4 (Все Экраны)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Переключиться На Раб. Стол 5 (Все Экраны)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Переключиться На Раб. Стол 6 (Все Экраны)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Переключиться На Раб. Стол 7 (Все Экраны)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Переключиться На Раб. Стол 8 (Все Экраны)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Переключиться На Раб. Стол 9 (Все Экраны)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Переключиться На Раб. Стол 10 (Все Экраны)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Переключиться На Раб. Стол 11 (Все Экраны)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Переключиться На Рабочий Стол... (Все Экраны)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Экран"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Послать Мышь На Экран 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Послать Мышь На Экран 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Послать Мышь На Экран..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Послать Мышь 1 Экран Вперёд"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Послать Мышь 1 Экран Назад"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Послать Мышь Вперед/Назад..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Окно: Передвижение"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "На Следующий Рабочий Стол"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "На Предыдущий Рабочий Стол"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "По # Стола..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "На Рабочий Стол..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Показать Главное Меню"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Показать Избранное Меню"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Показать Меню \"Все Приложения\""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Показать Меню Клиента"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Показать Меню..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Запустить"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
-msgstr "Комманда"
+msgstr "Команда"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Приложение"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Перезапустить"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Выход"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Выйти сейчас"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr ""
+msgstr "Enlightenment : Режим"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr ""
+msgstr "Переключение режима презентаций"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr ""
+msgstr "Переключение режима оффлайн"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Система"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Выход из Сессии"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Выключить сейчас"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Выключить"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Перегрузить"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Приостановить"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Заморозить"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Заблокировать"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Расчистить Окна"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Общее: Действия"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Отложеное Выполнение"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Установить Как Фон"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Сканирование файлов запуска программ завершено"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Сканирование файлов запуска программ"
 
@@ -648,41 +649,40 @@ msgstr "Сканирование файлов запуска программ"
 msgid "Color Selector"
 msgstr "Диалог выбора цвета"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "ОК"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -693,7 +693,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -707,11 +707,11 @@ msgstr ""
 "версия Enlightenment.<br>Это неправильно, и поэтому ваша конфигурация "
 "была<br>восстановлена на стандартную. Извините за неудобство.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Параметры обновлены"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -722,7 +722,7 @@ msgstr ""
 "может быть<br>определена.<br><br>Файл в котором возникла ошибка:<br>%"
 "s<br><br>Этот файл был удалён с целью предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -737,7 +737,7 @@ msgstr ""
 "домашнего<br><br>каталога. Файл, в котором возникла ошибка:<br>%"
 "s<br><br>Этот файл был удалён с целью предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -750,7 +750,7 @@ msgstr ""
 "котором<br><br>возникла ошибка:<br>%s<br><br>Этот файл был удалён с целью "
 "предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -764,7 +764,7 @@ msgstr ""
 "котором<br><br>возникла ошибка:<br>%s<br><br>Этот файл был удалён с целью "
 "предотвращения повреждения данных.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -772,11 +772,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Проблемы при сохранении параметров Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -784,12 +784,12 @@ msgstr "Проблемы при сохранении параметров Enligh
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Базово"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Применить"
 
@@ -797,7 +797,7 @@ msgstr "Применить"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Модули"
 
@@ -806,44 +806,44 @@ msgstr "Модули"
 msgid "Extensions"
 msgstr "Расширения"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Ошибка - нет поддержки PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Поддержка PAM не была включена при сборке Enlightenment, "
 "поэтому<br>запирание экрана отключено."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Не Удалось Замкнуть"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 "Не получилось замкнуть рабочий стол, т.к. мышка и/или "
-"клавиатура<br>удерживаются каким-то приложением, и это удерживание не "
-"возможно разорвать"
+"клавиатура<br>удерживаются каким-то приложением, и это удерживание "
+"невозможно разорвать"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
-msgstr "Пожалуйста введите ваш пароль"
+msgstr "Пожалуйста, введите ваш пароль"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Ошибка Системы Опознавания"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -852,26 +852,29 @@ msgid ""
 msgstr ""
 "Авторизации средствами PAM не удалось настроить сессию.<br>Код ошибки "
 "<hilight>%i</hilight>.<br>Это плохо и такого не должно случатьса."
-"<br>Пожалуйста сообщите об этой ошибке."
+"<br>Пожалуйста, сообщите об этой ошибке."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Активировать режим презентаций?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Вы разблокировали рабочий стол слишком быстро.<br><br>Включить режим "
+"<b>презентаций</b> и временно отключить хранитель экрана, блокировку и "
+"энергосбережение?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Нет, но увеличить задержку"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Нет, и не спрашивать больше."
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
@@ -896,7 +899,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Редактор Программ"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -941,7 +944,7 @@ msgstr "Категории"
 msgid "Mime Types"
 msgstr "Типы MIME"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Опции"
 
@@ -973,23 +976,23 @@ msgstr "Выбрать Иконку"
 msgid "Select an Executable"
 msgstr "Выберите Исполняемый Файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Стереть"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Вставить"
 
@@ -997,24 +1000,24 @@ msgstr "Вставить"
 msgid "Select All"
 msgstr "Выделить Всё"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Ошибка Запуска"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Ошибка запуска приложения"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1023,307 +1026,307 @@ msgstr ""
 "Enlightenment не смог запустить приложение:<br><br>%s<br><br>приложение не "
 "запустилось."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Ошибка Выполнения Приложения"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s неожиданно закончил исполнение."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Код выхода %i был возвращен из %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s было прервано Сигналом Прерыва."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s было прервано Сигналом Выхода."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s было прервано Сигналом Аварийного прекращения работы."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s было прервано Ошибкой Плавающей Запятой."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s было прервано Сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s было прервано Ошибкой Сегментации."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s было прервано Ошибкой Broken Pipe."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s было прервано Сигналом Завершения."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s было прервано Ошибкой Bus Error."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s было прервано сигналом номер %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** Остаток вывода был обрезан. Сохраните для просмотра. ***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Лог Ошибки"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Не было сообщения ошибки."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Сохранить Это Сообщение"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Этот лог об ошибке будет сохранён как %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Информация об Ошибке"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Информация Сигнала об Ошибке"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Выход Данных"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Не было никаких данных."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Несуществующий путь"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s не существует."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr ""
+msgstr "Ошибка подключения"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Не удалось подключить устройство"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr ""
+msgstr "Ошибка отключения"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Не удалось отключить устройство"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr ""
+msgstr "Ошибка извлечения"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "Не удалось извлечь устройство"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i файлов"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Ссылка"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Отменить"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Наследовать родительские настройки"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Режим Отображения"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Обновить Вид"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Показать  Скрытые Файлы"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Запомнить Очередность"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Сортировать"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Новый Каталог"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Переименовать"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Отключить"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Подключить"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Извлечь"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Свойства"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "По умолчанию"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Сетка Иконок"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Свои Иконки"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Список"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Размер значка (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr ""
+msgstr "Установить фон..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr ""
+msgstr "Установить перекрытие..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Создать новый каталог"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Имя Нового Каталога:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Переименовать %s в:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Переименовать Файл"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Повторить"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Нет для всего"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Да для всего"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Файл уже существует, перезаписать?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Пропустить это"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Пропустить все"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Во время исполнения произошла ошибка.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Подтвердите Удаление"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Вы действительно хотите стереть <br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1336,144 +1339,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Свойства Файла"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Размер:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Посл. Изменение:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Тип Файла:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Разрешения"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Владелец:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Другие могут читать"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Другие могут писать"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Владелец может читать"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Владелец может писать"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Предосмотр"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "По Умолчанию"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Миниатюра"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Личные"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Использовать эту иконку для всех файлов этого типа"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Информация о Ссылке"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Выбрать Изображение"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%lluТиБ"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu ГиБ"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu МиБ"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu КиБ"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu Б"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Не известный Носитель"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Съёмное Устройство"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
-msgstr "В Сэте"
+msgstr "Вклад"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Вид"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Автопрокрутка содержимого"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Может менять размер"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Начать сдвиг/размер этого гаджета"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Убрать этот гаджет"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Завершить сдвиг/размер этого гаджета"
 
@@ -1485,7 +1492,7 @@ msgstr ""
 "Предыдущая субстанция Enlightenment ещё работает\n"
 "на этом экране. Отменяю запуск.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Замки Окна"
 
@@ -1519,21 +1526,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Уровень"
 
@@ -1542,12 +1549,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Свёрнутое состояние"
 
@@ -1556,7 +1563,7 @@ msgid "Maximized state"
 msgstr "Увеличеное состояние"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Полноэкранное состояние"
 
@@ -1564,7 +1571,7 @@ msgstr "Полноэкранное состояние"
 msgid "Lock me from changing:"
 msgstr "Запрет мне менять:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Стиль бордюра"
 
@@ -1612,115 +1619,116 @@ msgstr "Открепить от Стола"
 msgid "More..."
 msgstr "Еще..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Опустить"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Увеличить вертикально"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Увеличить горизонтально"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Обычный размер"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Комбинация Клавиш"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "В Меню Избранного"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "В Панель Запуска"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Бордюр"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Пропускать"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Состояние"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Запомнить"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Свойства Окна"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Всегда Поверху"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Нормально"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Всегда Понизу"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Выбор Стиля Бордюра"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Иконка от Е17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Иконка от Приложения "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Иконка от Пользователя"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Свёрнут"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Липкий"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Полный Экран"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Список Окон"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Панель задач"
 
@@ -1736,7 +1744,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "Свойства ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1828,11 +1836,11 @@ msgstr "Свойства NetWM"
 msgid "Modal"
 msgstr "Модульное"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Пропускает Таскбар"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Пропускает Пэйджер"
 
@@ -1840,15 +1848,15 @@ msgstr "Пропускает Пэйджер"
 msgid "Hidden"
 msgstr "Спрятанное"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Запомнить Окно"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Свойства этого окна не являются уникальным совпадением"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1873,11 +1881,11 @@ msgstr ""
 "hilight><br>и ваш выбор будет принят. Если вы не уверены,<br>нажмите "
 "<hilight>Отмена</hilight>, и ничего не будет затронуто."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Не определены свойства совпадения"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1889,115 +1897,101 @@ msgstr ""
 "способа запоминания</hilight>.<br><br>Вы должны определить по крайней мере 1 "
 "способ запомнить это окно."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Вы просите чтобы Enlightenment запомнил применение<br>свойств (типа размера, "
-"местоположения, стиль границы и т.д.)<br>к окну, которое <hilight>не имеет "
-"уникальных свойств</hilight>.<br><br>Это значит, что это окно разделяет "
-"свойства<br>(типа Название/Класс, Быстротечность, Роль и т.д.)<br>более чем "
-"с 1 окном на экране, и свойства запоминания для этого окна <br>так-же "
-"применятся ко всем другим окнам,которые соответствуют этим свойствам."
-"<br><br>Возможно, вы захотите включить опцию <hilight>Совпадает только одно "
-"окно</hilight><br>если другие такие же окна не будут изменятьса.<br><br>Это "
-"сообщение - только предупреждение на случай, если Вы<br>не намеревались "
-"чтобы такое случилось.<br>Если же Вы действительно хотите это сделать, "
-"просто нажмите <hilight>Применить</hilight> или  <hilight>OK</hilight><br>и "
-"ваш выбор будет принят. Если вы не уверены,<br>нажмите <hilight>Отмена</"
-"hilight>, и ничего не будет затронуто."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Ничего"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Размер и Позицию"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Замки"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Размер, Позицию и Замки"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Всё"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Запомнить используя"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Имя и класс окна"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Имя окна"
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Класс окна"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Роль Окна"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Тип Окна"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Быстротечность"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Запомнить свойства"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Предпочтение Иконки"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Виртуальный Рабочий стол"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Текущий Экран"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Пропуск Окна"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Совпадает только одно окно"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Запустить эту программу при логине"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Автоматически фокусировать при запуске"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Сохранить текущие параметры"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Запустить эту программу при логине"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Настройки"
@@ -2016,24 +2010,24 @@ msgstr "Полка"
 msgid "Module Settings"
 msgstr "Настройки Модулей"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Доступные Модули"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Загрузить Модуль"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Загруженные Модули"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Выгрузить Модуль"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2067,8 +2061,8 @@ msgstr "Убрать Гаджет"
 msgid "Toolbar Settings"
 msgstr "Настройки панели инструментов"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Расположение"
 
@@ -2095,12 +2089,12 @@ msgid "Favorite Applications"
 msgstr "Избранные Приложения"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Приложения"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2109,7 +2103,7 @@ msgstr "Приложения"
 msgid "Windows"
 msgstr "Окна"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Потерянные Окна"
 
@@ -2143,131 +2137,130 @@ msgstr "(Нет приложений)"
 
 #: src/bin/e_int_menus.c:709
 msgid "Set Virtual Desktops"
-msgstr ""
+msgstr "Установка виртуальных рабочих столов"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Нет окон)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Нет имени!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Нет Полок)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Полка #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Добавить Полку"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Стереть Полку"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Настройки Полки"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
-msgstr "Тини"
+msgstr "Крошечный"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Маленький"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Средне"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Большой"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Огромный"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr ""
+msgstr "Настроить содержимое..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Над Всем"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Под Окнами"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Под Всем"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Позволять окнам перекрывать полку"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Ужимать под Размер Содержимого"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f пикс."
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Стили"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Авто-сокрытие"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Прятать полку автоматически"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Показывать при мыши в"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Показывать при щелчке мышью"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Время задержки до сокрытия"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f сек"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Время сокрытия"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Показывать на всех Рабочих Столах"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Показывать на указанных Рабочих Столах"
 
@@ -2285,7 +2278,7 @@ msgstr ""
 "уже существует, НО имеет разрешения, которые являются\n"
 "ошибочными (должно быть читаемым и перезаписываемым\n"
 "только владельцем, и больше никем), или не принадлежит Вам.\n"
-"Пожалуйста проверьте: %s/enlightenment-%s\n"
+"Пожалуйста, проверьте: %s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:57
 #, c-format
@@ -2297,7 +2290,7 @@ msgid ""
 msgstr ""
 "Директория IPC гнезда не может быть создана или\n"
 "исследована.\n"
-" Пожалуйста проверьте:\n"
+" Пожалуйста, проверьте:\n"
 "%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
@@ -2416,7 +2409,7 @@ msgid ""
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
 "Enlightenment обнаружил, что ecore_evas не поддерживает Software X11\n"
-"предоставление в Evas. Пожалуйста проверьте вашу установку Evas и Ecore\n"
+"предоставление в Evas. Пожалуйста, проверьте вашу установку Evas и Ecore\n"
 "и проверьте, что они поддерживают предоставление Software X11."
 
 #: src/bin/e_main.c:522
@@ -2426,7 +2419,7 @@ msgid ""
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 "Enlightenment обнаружил, что ecore_evas не поддерживает Software Buffer\n"
-"предоставление в Evas. Пожалуйста проверьте вашу установку Evas и Ecore\n"
+"предоставление в Evas. Пожалуйста, проверьте вашу установку Evas и Ecore\n"
 "и проверьте, что они поддерживают предоставление Software Buffer."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
@@ -2485,7 +2478,7 @@ msgstr "Запускается Языковая Поддержка"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment не может настроить свою систему языков."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2493,20 +2486,20 @@ msgstr ""
 "Enlightenment не может настроить экран инициализации.\n"
 "Возможно, у вас недостаточно памяти?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Проверка Поддержки Форматов"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
-"Enlightenment обнаружил, что Evas не может создать буферный слой. Пожалуйста "
-"проверьте,\n"
+"Enlightenment обнаружил, что Evas не может создать буферный слой. "
+"Пожалуйста, проверьте,\n"
 "что Evas поддерживает движок Software Buffer.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2514,7 +2507,7 @@ msgstr ""
 "Enlightenment обнаружил, что Evas не может загружать файлы PNG. Проверьте,\n"
 "что Evas имеет поддержку загрузчика PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2522,7 +2515,7 @@ msgstr ""
 "Enlightenment обнаружил, что Evas не может загружать файлы JPEG. Проверьте,\n"
 "что Evas имеет поддержку загрузчика JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2530,7 +2523,7 @@ msgstr ""
 "Enlightenment обнаружил, что Evas не может загружать файлы EET. Проверьте,\n"
 "что Evas имеет поддержку загрузчика EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2541,11 +2534,11 @@ msgstr ""
 "имеет ли Evas поддержку в fontconfig, и определяет ли fontconfig шрифт "
 "'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Настройка Экранов"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2553,192 +2546,192 @@ msgstr ""
 "Настройка управления окнами для всех экранов на вашей системе не удалась.\n"
 "Возможно запущен другой менеджер окон?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Настройка Хранителя Экрана"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr "Enlightenment не может настроить X скринсэйвер."
+msgstr "Enlightenment не может настроить хранитель экрана."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Настройка Запирания"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr ""
 "Enlightenment не может настроить свою систему запирания рабочего стола."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Идет Настройка Путей"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Настройка Системы Управления"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr "Enlightenment не может настроить систему Системных Комманд.\n"
+msgstr "Enlightenment не может настроить систему Системных Команд.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Настройка Действий"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment не может настроить свою систему действий."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Настройка Системы Запуска"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment не может настроить свою систему запуска."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Настройка Запоминаний"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment не может настроить запоминание настроек."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Настройка ФМ"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment не может инициализировать менеджер файлов.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Настройка Системы Сообщений"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment не может настроить свою систему сообщений."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Настройка ДНД"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment не может настроить свою систему ДНД."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment не может настроить свою систему обработки захвата ввода."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Настройка Модулей"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment не может настроить свою систему модулей."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Настройка Запоминаний"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment не может настроить запоминание настроек."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Настройка Цветовых Классов"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment не может настроить свою систему класса цветов."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Настройка Контейнера Гаджетов"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment не может настроить свою систему управления гаджетами."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Настройка DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment не может настроить DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Настроить Энергосбережение"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment не может настроить систему энергосбережения."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Настройка Фона"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment не может настроить свою систему фона рабочего стола."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Настройка Мыши"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment не может настроить параметры мыши."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Настройка Назначений"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment не может настроить свою систему привязок."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Настройка Подсказок"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment не может настроить свою систему подсказок."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Настройка Полок"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment не может настроить свою shelf систему."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Настройка Генератора Просмотра"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment не может настроить систему Thumbnailing.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Настроить Очередность Файлов"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment не может настроить свою систему очередей."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Загрузить Модули"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2750,11 +2743,11 @@ msgstr ""
 "проблему с модулями в Вашей конфигурации.<br>Диалог конфигурации модулей "
 "позволит Вам выбрать нужные<br> модули заново."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment дал сбой при старте и был перезапущен"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2766,15 +2759,15 @@ msgstr ""
 "проблему с модулями в Вашей конфигурации.<br><br>Диалог конфигурации модулей "
 "позволит Вам выбрать нужные<br> модули заново."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Параметры полок"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Почти закончено"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2783,11 +2776,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Модуль с именем %s не был "
 "найден в<br>директориях поиска модулей.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Ошибка загрузки модуля"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2796,11 +2789,11 @@ msgstr ""
 "Произошла ошибка загрузки модуля с именем: %s<br>Полный путь до этого модуля:"
 "<br>%s<br>Сообщение ошибки:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Модуль не содержит всех требуемых функций"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2811,12 +2804,12 @@ msgstr ""
 "минимальную версию API модулей: %i.<br>Версия API модуля объявленная для "
 "Enlightenment: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Модуль %s для Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Хотите выгрузить этот модуль?<br>"
 
@@ -2826,31 +2819,34 @@ msgid ""
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Вы очень быстро выключили заставку.<br><br>Хотите включить режим "
+"<b>презентации</b> и временно отключить заставку, блокирование экрана и "
+"экономию энергии?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите стереть эту полку?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr ""
 "Вы запросили стереть эту полку.<br><br>Вы действительно хотите стереть её?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Закончить Перемещения/Изменения Элементов"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Начать Перемещения/Изменения Элементов"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr ""
+msgstr "Установка содержимого панели"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Стереть эту Полку"
 
@@ -2867,11 +2863,11 @@ msgstr "Проверка Системных Разрешений"
 msgid "System Check Done"
 msgstr "Проверка Системы Закончена"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Проблемы с выходом из сессии"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2881,31 +2877,31 @@ msgstr ""
 "отказываются закрыться. <br>Вы хотите закончить отключение так или иначе, не "
 "закрывая эти <br>приложения сначала?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Выйти сейчас"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Подождите ещё"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Отменить Выход"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Выполняется выход"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Завершение сеанса.<br><hilight>Подождите.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment занят другим обращением"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2913,7 +2909,7 @@ msgstr ""
 "Завершение сеанса.<br>Вы не можете выполнять другие действия<br>после "
 "завершения сеанса."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2921,7 +2917,7 @@ msgstr ""
 "Выключение.<br>Вы не можете выполнять другие действия<br>после того как "
 "инициировано выключение."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2929,7 +2925,7 @@ msgstr ""
 "Перезагрузка.<br>Вы не можете выполнять другие действия<br>после того как "
 "инициирована перезагрузка."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2937,7 +2933,7 @@ msgstr ""
 "Переход в режим ожидания.<br>Пока переход не завершится вы не можете "
 "выполнять<br>любые другие действия."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2945,57 +2941,57 @@ msgstr ""
 "Переход в режим сна.<br>Вы не можете выполнять другие действия<br>пока "
 "переход не завершится."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "Ааарррр! Этого не должно случатьса"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ".Ошибка при выключении"
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Ошибка при перезагрузке."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Ошибка при переходе в режим ожидания."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Ошибка при переходе в режим сна."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Выключить"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr "Выключение.<br><hilight>Пожалуйста ждите.</hilight>"
+msgstr "Выключение.<br><hilight>Пожалуйста, ждите.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Перезагрузка"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr "Перезагрузка.<br><hilight>Пожалуйста ждите.</hilight>"
+msgstr "Перезагрузка.<br><hilight>Пожалуйста, ждите.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Приостановка"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
-msgstr "Переход в режим ожидания.<br><hilight>Пожалуйста ждите.</hilight>"
+msgstr "Переход в режим ожидания.<br><hilight>Пожалуйста, ждите.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Заморозка"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr "Переход в режим сна.<br><hilight>Пожалуйста ждите.</hilight>"
+msgstr "Переход в режим сна.<br><hilight>Пожалуйста, ждите.</hilight>"
 
 #: src/bin/e_theme_about.c:17
 msgid "About Theme"
@@ -3007,13 +3003,13 @@ msgstr "Установить Как Тему"
 
 #: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
-msgstr ""
+msgstr "Установка содержимого панели инструментов"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Не могу выйти - бессмертные окна."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3023,77 +3019,77 @@ msgstr ""
 "Enlightenment не даст себе выйти, пока эти окна не будут закрыты,<br>или вы "
 "не уберёте флаг защиты.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Байт"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f Кб"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f Мб"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f Гб"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "В Будущем"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "За последнюю минуту"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Лет назад"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Месяцев назад"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Недель назад"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Дней назад"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Часов назад"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Минут назад"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Не известный"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3113,51 +3109,51 @@ msgstr "Вверх"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Добавить в Избранное"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Каталог Вверх"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Разрешения:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Изменено:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ð’Ñ‹"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Защищено"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Только Чтение"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Чтение-Запись"
 
@@ -3173,57 +3169,57 @@ msgstr "Базовые Настройки"
 msgid "Show alert when battery is low"
 msgstr "Предупреждать при низком уровне"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Проверять каждые:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f тиков"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Пуллинг"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Показывать предупреждение при низком заряде"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Предупреждать если:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f мин"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f сек"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Предупреждение"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Автоопределение"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3231,37 +3227,37 @@ msgstr "Автоопределение"
 msgid "Internal"
 msgstr "Встроеный"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
-msgstr ""
+msgstr "Устройства"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Низкий заряд батареи!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Рекомендовано сетевое питание."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Индикатор Батареи"
 
@@ -3269,22 +3265,22 @@ msgstr "Индикатор Батареи"
 msgid "Clock"
 msgstr "Часы"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Панель параметров"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr ""
+msgstr "Презентация"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr ""
+msgstr "Режимы"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
@@ -3308,7 +3304,7 @@ msgid "Restart Applications"
 msgstr "Перезапускаемые Приложения"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Все Приложения"
 
@@ -3330,12 +3326,12 @@ msgstr "Другой IBar"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Меню"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Стиль Бордюра по Умолчанию"
 
@@ -3343,14 +3339,14 @@ msgstr "Стиль Бордюра по Умолчанию"
 msgid "Window Border Selection"
 msgstr "Выбор Границы Окна (Бордюр)"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Запомнить Бордюр для этого окна на будущее"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3376,7 +3372,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3442,7 +3438,7 @@ msgstr "Надписи Элементов Меню"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
-msgstr "Ограничить длинну надписи"
+msgstr "Ограничить длину надписи"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
 #, c-format
@@ -3471,7 +3467,7 @@ msgstr "Заголовок Границ"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Settings Dialog Title"
-msgstr ""
+msgstr "Заголовок диалога настроек"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3644,9 +3640,9 @@ msgid "Desktop Name"
 msgstr "Имя Стола"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Имя:"
 
@@ -3677,11 +3673,11 @@ msgstr "Заблокировать при старте Enlightenment"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
-msgstr "Запирать со стартом X скринсейвера"
+msgstr "Запирать со стартом хранителя экрана"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
 msgid "Time after screensaver activated"
-msgstr ""
+msgstr "Время после активации хранителя экрана"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3712,10 +3708,10 @@ msgstr "%1.0f мин."
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Личный"
@@ -3747,8 +3743,8 @@ msgstr "Показывать на экране #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3769,22 +3765,22 @@ msgstr "Обои из Темы"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
 msgid "User Wallpaper"
-msgstr ""
+msgstr "Пользовательские обои"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
 msgid "Enter Presentation Mode"
-msgstr ""
+msgstr "Включить режим презентации"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:435
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:197
 msgid "Suggest entering presentation mode"
-msgstr ""
+msgstr "Предлагать войти в режим презентации"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:439
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:202
 msgid "If deactivated before"
-msgstr ""
+msgstr "если выключена раньше"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
@@ -3869,46 +3865,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Виртуальные Столы"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Настройки Диалога"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Общие Настройки"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Отключить Диалоги Подтверждения"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Обычные окна"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Режим диалога стандартных установок"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Базовый Режим"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Расширенный Режим"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Диалог по Умолчанию"
 
@@ -3962,7 +3963,7 @@ msgstr ""
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
-msgstr "Смена Резолюции"
+msgstr "Смена разрешения"
 
 #: src/modules/conf_display/e_int_config_display.c:194
 msgid "Save"
@@ -3974,33 +3975,33 @@ msgstr "Восстановить"
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
-msgstr "Настройки Резолюции Экрана"
+msgstr "Настройки Разрешения Экрана"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
-msgstr "Резолюция"
+msgstr "Разрешение"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Восстанавливать при входе"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Частота Кадров"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Оборот"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Зеркально"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Отсутствующие Особенности"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4009,11 +4010,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Не Найдены Частоты Экрана"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4023,12 +4024,12 @@ msgid ""
 msgstr ""
 "Ваш X сервер не сообщил частот экрана.<br>Если у вас запущен nested X "
 "сервер, то этого следует ожидать.<br>Однако, если это не так, то текущая "
-"частота будет использована при<br>выставлении резолюции экрана, что может "
+"частота будет использована при<br>выставлении разрешения экрана, что может "
 "<hilight>повредить</hilight> ваш экран."
 
 #: src/modules/conf_display/e_mod_main.c:35
 msgid "Screen Resolution"
-msgstr "Резолюция Экрана"
+msgstr "Разрешение Экрана"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
@@ -4072,7 +4073,7 @@ msgid "Power Management"
 msgstr "Управление Питанием"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4082,102 +4083,107 @@ msgstr "<Пусто>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Настройки привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Привязки к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Добавить границу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Удалить границу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Изменить границу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Стереть Всё"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Вернуть Привязки по Умолчанию"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Действие"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Параметры Действия"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Основные опции"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Последовательность привязок к краям"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f секунд"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Ошибка привязки к краю"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4188,7 +4194,7 @@ msgstr "WIN"
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
 msgid "Input"
-msgstr "Вход"
+msgstr "Ввод"
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
 msgid "Engine Settings"
@@ -4200,7 +4206,7 @@ msgstr "Включить Композицию"
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
 msgid "Default Engine"
-msgstr "Движок по Умолчанию"
+msgstr "Движок по умолчанию"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
@@ -4221,7 +4227,7 @@ msgstr "Движок"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:49
 msgid "Run Command Settings"
-msgstr "Настройки Запуска Комманды"
+msgstr "Настройки Запуска Команды"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:115
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:168
@@ -4274,7 +4280,7 @@ msgstr "Настройки Терминала"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr "Комманда Вызова Терминала"
+msgstr "Команда Вызова Терминала"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
@@ -4331,7 +4337,7 @@ msgstr "Выравнивание Y-Координат"
 #: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
 #: src/modules/exebuf/e_mod_main.c:129
 msgid "Run Command"
-msgstr "Запуск Комманды"
+msgstr "Запуск Команды"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
@@ -4383,7 +4389,7 @@ msgstr "Диалог Ошибки"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
-msgstr "Комманда Exebuf"
+msgstr "Команда Exebuf"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
@@ -4474,18 +4480,17 @@ msgstr "Очень Большой"
 msgid "%d pixels"
 msgstr "%d пикс."
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Использовать Свои Классы Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Базовая Тестовая Строка: 123:"
 
@@ -4493,38 +4498,50 @@ msgstr "Базовая Тестовая Строка: 123:"
 msgid "Font Classes"
 msgstr "Классы Шрифта"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Включить Классы Шрифта"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Шрифт"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Стиль"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Расширеная Тестовая Строка..."
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Подсказки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Байткод"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Запасные Шрифты"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Запасное Имя"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Включить Запасные"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Расширеная Тестовая Строка..."
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4538,7 +4555,7 @@ msgstr "Темы Иконок"
 msgid "Icon theme overrides general theme"
 msgstr "Тема иконок переопределяет основную тему"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Тема Иконки"
 
@@ -4575,11 +4592,11 @@ msgstr "Параметры Метода Ввода"
 
 #: src/modules/conf_imc/e_int_config_imc.c:918
 msgid "Execute Command"
-msgstr "Выполнить Комманду"
+msgstr "Выполнить Команду"
 
 #: src/modules/conf_imc/e_int_config_imc.c:925
 msgid "Setup Command"
-msgstr "Настройка Комманды"
+msgstr "Настройка Команды"
 
 #: src/modules/conf_imc/e_int_config_imc.c:934
 msgid "Exported Environment Variables"
@@ -4609,7 +4626,7 @@ msgstr ""
 "Enlightenment не смог импортировать конфигурацию<br>из-за ошибки копирования."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Язык"
 
@@ -4681,7 +4698,7 @@ msgstr "Локаль"
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
-"Пожалуйста нажмите последовательность клавиш,<br><br>или <hilight>Escape</"
+"Пожалуйста, нажмите последовательность клавиш,<br><br>или <hilight>Escape</"
 "hilight> для отмены."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:92
@@ -4784,7 +4801,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Край Курсора Автопрокрутки"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Различные Настройки"
 
@@ -4963,24 +4980,24 @@ msgstr "Размер Указателя Мыши"
 msgid "Mouse Cursor"
 msgstr "Курсор Мыши"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Настройки мыши"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Левая/правая мышь"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Ускорение Мыши"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Ускорение"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "Порог"
 
@@ -4997,7 +5014,7 @@ msgid "Images"
 msgstr "Изображения"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Темы"
 
@@ -5097,33 +5114,33 @@ msgstr "%1.0f коллекций"
 msgid "Performance"
 msgstr "Производительность"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Выбор Профиля"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Доступные Профили"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Выбрать профиль"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Сброс"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr ""
+msgstr "Вы хотите удалить профиль \"%s\".<br><br>Вы уверены?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Удалить?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Добавить Новый Профиль"
 
@@ -5188,7 +5205,7 @@ msgstr "%1.2f раз"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
 msgid "Constraints"
-msgstr ""
+msgstr "Ограничения"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
@@ -5209,21 +5226,21 @@ msgstr "Настройки Хранителя Экрана"
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:135
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:173
 msgid "Enable X screensaver"
-msgstr "Включить X скринсейвер"
+msgstr "Включить хранитель экрана"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:138
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:176
 msgid "Screensaver Timer(s)"
-msgstr "Таймер(ы) Скринсэйвера"
+msgstr "Таймер(ы) хранителя экрана"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:140
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:178
 msgid "Time until X screensaver starts"
-msgstr "Время до старта X скринсейвера"
+msgstr "Время до старта X хранителя экрана"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
-msgstr "Время до смены X скринсейвера"
+msgstr "Время до смены X хранителя экрана"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
@@ -5260,7 +5277,7 @@ msgstr "Настроенные Полки"
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr ""
+msgstr "Настройка"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
@@ -5288,23 +5305,23 @@ msgstr "Запуск"
 msgid "Theme Selector"
 msgstr "Выбор Темы"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Импортировать..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " В сети..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Категории Тем"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Назначить"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Очистить Всё"
 
@@ -5359,38 +5376,38 @@ msgid "Wallpaper Settings"
 msgstr "Настройки Обоев"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Использовать Обои из Темы"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Изображение..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Градиент..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "В сети..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Где разместить Обои"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Все Столы"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Этот Стол"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Этот Экран"
 
@@ -5411,14 +5428,14 @@ msgid "Fill Options"
 msgstr "Опции Заполнения"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Горизонтально"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Вертикально"
 
@@ -5444,7 +5461,7 @@ msgstr "По какой-то причине Enlightenment не смог созд
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
 msgid "Wallpaper settings..."
-msgstr ""
+msgstr "Настройки фона"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
@@ -5483,35 +5500,35 @@ msgstr "Использовать оригинальный файл"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Выбрать Изображение..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Ошибка Импорта Изображения"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 "Enlightenment не смог импортировать изображение<br>из-за ошибок в конверсии."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Ошибка Импорта Обоев"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5519,7 +5536,7 @@ msgstr ""
 "Enlightenment не смог импортировать фон.<br><br>Вы уверены что это "
 "подходящий файл фона?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Смена обоев"
 
@@ -5631,14 +5648,6 @@ msgstr "Предпочитать пользовательскую иконку"
 msgid "Prefer application provided icon"
 msgstr "Предпочитать иконку предоставляемую приложением"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Внутренние Окна"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Всегда запоминать внутренние окна"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Настройки Фокусирования"
@@ -5771,17 +5780,12 @@ msgid "Window Maximize Policy"
 msgstr "Политика максимизации окна"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Умное расширение"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Расширить окно"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Заполнить доступное место"
 
@@ -5789,19 +5793,19 @@ msgstr "Заполнить доступное место"
 msgid "Maximize Policy"
 msgstr "Политика Увеличения"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Направления максимизации"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Оба"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Разрешить манипулирование окном"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Автоматически изменять окна при авто-сокрытии полки"
 
@@ -5840,49 +5844,57 @@ msgstr "Поднимать начиная перемещаться или изм
 msgid "Raise when clicking to focus"
 msgstr "Поднимать при нажатии для фокуса"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Память Окна"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Стереть Память Окна"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Подробности"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Без Имени>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Класс:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Без Класса>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Без Заголовка>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Роль:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Без Роли>"
 
@@ -6152,7 +6164,7 @@ msgstr "Тень"
 
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 msgid "Run Command Dialog"
-msgstr "Диалог Запуска Комманды"
+msgstr "Диалог Запуска Команды"
 
 #: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
@@ -6218,7 +6230,7 @@ msgstr "Директории Отсортированы Первыми"
 
 #: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr ""
+msgstr "С учетом регистра"
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
@@ -6245,7 +6257,7 @@ msgid "Show Toolbar"
 msgstr "Показывать Панель Инструментов"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Поведение"
 
@@ -6261,95 +6273,95 @@ msgstr "Монтировать тома при подключении"
 msgid "Open filemanager on mount"
 msgstr "Открыть менеджер файлов при монтировании"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "В Родительский Каталог"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr ""
+msgstr "Другое приложение"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Открыть"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Открыть через..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr ""
+msgstr "Известные приложения"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Указаные Приложения"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Своя Команда"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Копирование прервано"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "Перемещение прервано"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Удаление прервано"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "Копирование %s завершено"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "Копирование %s (осталось примерно %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "Перемещение %s завершено"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "Перемещение %s (осталось примерно %d сек.)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
-msgstr ""
+msgstr "Удаление завершено"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr ""
+msgstr "Удаление файлов..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6358,33 +6370,33 @@ msgstr ""
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
 msgid "(no information)"
-msgstr ""
+msgstr "(нет данных)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
 #, c-format
 msgid "File: %s"
-msgstr ""
+msgstr "Файл: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "Из: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "Ð’: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "Выполняется операций: %d"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6422,19 +6434,19 @@ msgstr "Фон"
 msgid "Gadgets"
 msgstr "Гаджеты"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Свободно"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Всегда на столе"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "По нажатию сверху"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Добавить другие гаджеты"
 
@@ -6471,7 +6483,7 @@ msgstr "Выбранный Источник Раздела"
 msgid "Icon Labels"
 msgstr "Ярлыки Иконки"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Показывать Ярлык Иконки"
 
@@ -6532,43 +6544,43 @@ msgstr "Создать Новою Иконку"
 msgid "Add Application"
 msgstr "Добавить Приложение"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Параметры IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Показывать Имя"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Показывать Название"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Показывать Класс"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Показать Имя Иконки"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Показывать Заголовок Окна"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Показывать окна со всех экранов"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Показывать окна с текущего экрана"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Показывать окна со всех столов"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Показывать окна с текущего стола"
 
@@ -6588,11 +6600,11 @@ msgstr "Переход по столам колесом мышки"
 msgid "Show desktop names"
 msgstr "Показывать имена столов"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Настройка Подсказок"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Показать подсказку при смене стола"
 
@@ -6600,81 +6612,81 @@ msgstr "Показать подсказку при смене стола"
 msgid "Show popup for urgent windows"
 msgstr "Показывать подсказку для срочных окон"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Выбор и Передвижение - кнопка"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Нажать для установки"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Кнопка Тащи-и-Бросай"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Тянуть весь рабочий стол"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "Высота подсказки ключевого действия"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f пикс."
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Сопротивление к перетаскиванию"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr "Высота подсказки пэйджера"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Скорость подсказки"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f сек"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Настройки Срочного Окна"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Показывать подсказку на срочном окне"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Подсказка залипает на экране при срочном окне"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "Кнопки Захвата Пэйджера"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
-"Пожалуйста нажмите клавишу мыши<br>Нажмите <hilight>Escape</hilight> для "
+"Пожалуйста, нажмите клавишу мыши<br>Нажмите <hilight>Escape</hilight> для "
 "отмены<br>Или <hilight>Del</hilight> для сброса кнопки."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Внимание"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 "
@@ -6684,29 +6696,29 @@ msgstr ""
 "занята внутренним<br>кодом для контекстных меню.<br>Эта кнопка работает "
 "только в Подсказках"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Кнопка %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Показывать Подсказку Пэйджера"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "Передвинуть вправо"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "Передвинуть влево"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "Передвинуть вверх"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "Передвинуть вниз"
 
@@ -6830,7 +6842,7 @@ msgstr "%1.0f Ф"
 msgid "%1.0f C"
 msgstr "%1.0f Ц"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Температура"
 
@@ -6842,15 +6854,15 @@ msgstr "Далее"
 msgid "Welcome to Enlightenment"
 msgstr "Добро пожаловать в Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Выбрать один"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Профиль"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6900,15 +6912,15 @@ msgstr "Кликните для фокусировании на окне"
 msgid "Mouse over focuses windows"
 msgstr "Наведение мышки фокусирует окна"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Выберите иконки для добавления"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Быстрый запуск"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Выбор приложений"
 
@@ -7032,18 +7044,51 @@ msgstr "Указанное Устройство"
 msgid "Networks"
 msgstr "Сети"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Вы просите чтобы Enlightenment запомнил применение<br>свойств (типа "
+#~ "размера, местоположения, стиль границы и т.д.)<br>к окну, которое "
+#~ "<hilight>не имеет уникальных свойств</hilight>.<br><br>Это значит, что "
+#~ "это окно разделяет свойства<br>(типа Название/Класс, Быстротечность, Роль "
+#~ "и т.д.)<br>более чем с 1 окном на экране, и свойства запоминания для "
+#~ "этого окна <br>так-же применятся ко всем другим окнам,которые "
+#~ "соответствуют этим свойствам.<br><br>Возможно, вы захотите включить опцию "
+#~ "<hilight>Совпадает только одно окно</hilight><br>если другие такие же "
+#~ "окна не будут изменятьса.<br><br>Это сообщение - только предупреждение на "
+#~ "случай, если Вы<br>не намеревались чтобы такое случилось.<br>Если же Вы "
+#~ "действительно хотите это сделать, просто нажмите <hilight>Применить</"
+#~ "hilight> или  <hilight>OK</hilight><br>и ваш выбор будет принят. Если вы "
+#~ "не уверены,<br>нажмите <hilight>Отмена</hilight>, и ничего не будет "
+#~ "затронуто."
+
+#~ msgid "Window name and class"
+#~ msgstr "Имя и класс окна"
+
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "Настроить Виртуальные Столы"
 
@@ -7068,11 +7113,14 @@ msgstr ""
 #~ msgid "Configure Heading"
 #~ msgstr "Заголовок Конфигурационной Панели"
 
-#~ msgid "Scaling Factors"
-#~ msgstr "Масштабные коэффициенты"
+#~ msgid "Internal Windows"
+#~ msgstr "Внутренние Окна"
 
-#~ msgid "Personal scaling factor"
-#~ msgstr "Пользовательский масштабный коэффициент"
+#~ msgid "Expand the window"
+#~ msgstr "Расширить окно"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Разрешить манипулирование окном"
 
 #~ msgid "Custom Grid Icons"
 #~ msgstr "Сетка Своих Иконок"
@@ -7080,11 +7128,11 @@ msgstr ""
 #~ msgid "Custom Smart Grid Icons"
 #~ msgstr "Умная Сетка Своих Иконок"
 
-#~ msgid "Flip when moving mouse to the screen edge"
-#~ msgstr "Переход по столам мышкой с краёв экрана"
+#~ msgid "Scaling Factors"
+#~ msgstr "Масштабные коэффициенты"
 
-#~ msgid "Defined Command"
-#~ msgstr "Определённая Комманда"
+#~ msgid "Personal scaling factor"
+#~ msgstr "Пользовательский масштабный коэффициент"
 
 #~ msgid "Exit Immediately"
 #~ msgstr "Выход Немедленно"
@@ -7101,6 +7149,62 @@ msgstr ""
 #~ msgid "Desktop Lock"
 #~ msgstr "Закрыть Рабочий Стол"
 
+#~ msgid "Desktop %i, %i"
+#~ msgstr "Рабочий стол %i, %i"
+
+#~ msgid "Configuration Upgraded"
+#~ msgstr "Настройки Изменились"
+
+#~ msgid "Configuration"
+#~ msgstr "Настройки"
+
+#~ msgid "Toolbar Configuration"
+#~ msgstr "Настройка Панели Инструментов"
+
+#~ msgid "Lock Screen"
+#~ msgstr "Замкнуть Экран"
+
+#~ msgid "Logout"
+#~ msgstr "Логаут"
+
+#~ msgid "Shelf Configuration"
+#~ msgstr "Настройки Полки"
+
+#~ msgid ""
+#~ "Enlightenment is busy logging out.<br>You cannot perform other system "
+#~ "actions<br>once a logout has begun."
+#~ msgstr ""
+#~ "Enlightenment занят выходом из сессии.<br>Вы не можете выполнять другие "
+#~ "системные операции <br>с момента запуска выхода из сессии."
+
+#~ msgid ""
+#~ "Enlightenment is shutting the system down.<br>You cannot do any other "
+#~ "system actions<br>once a shutdown has been started."
+#~ msgstr ""
+#~ "Enlightenment выключает систему.<br>Вы не можете выполнять "
+#~ "никакихсистемных операций<br>с момента запуска выключения."
+
+#~ msgid ""
+#~ "Enlightenment is rebooting the system.<br>You cannot do any other system "
+#~ "actions<br>once a reboot has begun."
+#~ msgstr ""
+#~ "Enlightenment перегружает систему.<br>Вы не можете выполнять другие "
+#~ "системные операции <br>с момента запуска перегрузки."
+
+#~ msgid ""
+#~ "Enlightenment is suspending the system.<br>Until suspend is complete you "
+#~ "cannot perform<br>any other system actions."
+#~ msgstr ""
+#~ "Enlightenment приостанавливает систему.<br>Пока приостанов не закончится "
+#~ "Вы не можете выполнять никаких <br>системных операций."
+
+#~ msgid ""
+#~ "Enlightenment is hibernating the system.<br>You cannot perform an other "
+#~ "system actions<br>until this is complete."
+#~ msgstr ""
+#~ "Enlightenment замораживает систему.<br>Вы не можете выполнять другие "
+#~ "системные операции <br>пока эта не закончится."
+
 #~ msgid "Shutting down of your system failed."
 #~ msgstr "Остановка вашей системы не удалась."
 
@@ -7110,22 +7214,66 @@ msgstr ""
 #~ msgid "Suspend of your system failed."
 #~ msgstr "Приостановка Вашей системы не удалась."
 
+#~ msgid "Hibernating your system failed."
+#~ msgstr "Заморозка вашей системы не удалась."
+
 #~ msgid "Shutting down"
 #~ msgstr "Выключение"
 
-#~ msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
-#~ msgstr ""
-#~ "Ваш компьютер останавливается.<br><hilight>Пожалуйста подождите.</hilight>"
-
 #~ msgid "Rebooting"
 #~ msgstr "Перезагрузка"
 
 #~ msgid "Advanced Settings"
 #~ msgstr "Дополнительные Настройки"
 
+#~ msgid "Check battery every:"
+#~ msgstr "Проверять батарею каждые:"
+
+#~ msgid "Alert when battery is down to:"
+#~ msgstr "Предупреждать при уровне близком к:"
+
 #~ msgid "%1.0f percent"
 #~ msgstr "%1.0f проц."
 
+#~ msgid "Dismiss alert automatically"
+#~ msgstr "Автоматически убирать предупреждения"
+
+#~ msgid "Dismiss alert after:"
+#~ msgstr "Убирать предупреждения через:"
+
+#~ msgid "Enlightenment Configuration"
+#~ msgstr "Конфигурация Enlightenment"
+
+#~ msgid "Items"
+#~ msgstr "Элементы"
+
+#~ msgid "Configuration Panel"
+#~ msgstr "Конфигурационная панель"
+
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Переход по рабочим столам мышкой с краёв экрана"
+
+#~ msgid "Flip when moving mouse to the screen edge"
+#~ msgstr "Переход по столам мышкой с краёв экрана"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Время задержки на краю до перехода:"
+
+#~ msgid "Default Configuration Dialogs Mode"
+#~ msgstr "Режим Диалогов по Умолчанию"
+
+#~ msgid "Input Method Configuration"
+#~ msgstr "Настройки Метода Ввода"
+
+#~ msgid "Language Configuration"
+#~ msgstr "Настройки Языка"
+
+#~ msgid "Keyboard & Mouse"
+#~ msgstr "Клавиатура & Мышь"
+
+#~ msgid "Search Path Configuration"
+#~ msgstr "Настройки Путей Поиска"
+
 #~ msgid ""
 #~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
 #~ "this profile?"
@@ -7142,50 +7290,41 @@ msgstr ""
 #~ msgid "Clone Current Profile"
 #~ msgstr "Клонировать Текущий Профиль"
 
-#~ msgid "Lock Screen"
-#~ msgstr "Замкнуть Экран"
-
-#~ msgid "Logout"
-#~ msgstr "Логаут"
-
-#~ msgid "Desktop %i, %i"
-#~ msgstr "Рабочий стол %i, %i"
-
-#~ msgid "Configuration Upgraded"
-#~ msgstr "Настройки Изменились"
+#~ msgid "Choose a website from list..."
+#~ msgstr "Выбор сайта из списка..."
 
-#~ msgid "Configuration"
-#~ msgstr "Настройки"
+#~ msgid "get-e.org - Static"
+#~ msgstr "get-e.org - Статика"
 
-#~ msgid "Toolbar Configuration"
-#~ msgstr "Настройка Панели Инструментов"
+#~ msgid "get-e.org  - Animated"
+#~ msgstr "get-e.org  - Аннимация"
 
-#~ msgid "Shelf Configuration"
-#~ msgstr "Настройки Полки"
+#~ msgid "[%s] Getting feed... DONE!"
+#~ msgstr "[%s] Получение канала... ГОТОВО!"
 
-#~ msgid "Enlightenment Configuration"
-#~ msgstr "Конфигурация Enlightenment"
+#~ msgid "[%s] Getting feed... FAILED!"
+#~ msgstr "[%s] Получение канала... ОШИБКА!"
 
-#~ msgid "Items"
-#~ msgstr "Элементы"
+#~ msgid "[%s] Parsing feed... DONE!"
+#~ msgstr "[%s] Разбор канала... ГОТОВО!"
 
-#~ msgid "Configuration Panel"
-#~ msgstr "Конфигурационная панель"
+#~ msgid "[%s] Parsing feed... FAILED!"
+#~ msgstr "[%s] Разбор канала... ОШИБКА!"
 
-#~ msgid "Default Configuration Dialogs Mode"
-#~ msgstr "Режим Диалогов по Умолчанию"
+#~ msgid "[%s] Downloading of edje file..."
+#~ msgstr "[%s] Загрузка файла edje..."
 
-#~ msgid "Input Method Configuration"
-#~ msgstr "Настройки Метода Ввода"
+#~ msgid "[%s] Download %d images of %d"
+#~ msgstr "[%s] Загрузка %d изображений из %d"
 
-#~ msgid "Language Configuration"
-#~ msgstr "Настройки Языка"
+#~ msgid "[%s] Choose an image from list"
+#~ msgstr "[%s] Выбор изображения из списка"
 
-#~ msgid "Keyboard & Mouse"
-#~ msgstr "Клавиатура & Мышь"
+#~ msgid "[%s] Downloading of edje file... %d%% done"
+#~ msgstr "[%s] Загрузка файла edje... %d%% готово"
 
-#~ msgid "Search Path Configuration"
-#~ msgstr "Настройки Путей Поиска"
+#~ msgid "[%s] Getting feed..."
+#~ msgstr "[%s] Получение канала..."
 
 #~ msgid "Dropshadow Configuration"
 #~ msgstr "Настройки Тени"
@@ -7214,52 +7353,18 @@ msgstr ""
 #~ msgid "Mixer Module Configuration"
 #~ msgstr "Настройки Модуля Микшер"
 
-#~ msgid "Back"
-#~ msgstr "Назад"
-
-#~ msgid "Choose Language"
-#~ msgstr "Выбор Языка"
-
 #~ msgid "X reports there are no root windows and %i screens!\n"
 #~ msgstr "X уведомляет, что нет корневых окон и %i экранов!\n"
 
 #~ msgid "Disable this splash screen in the future?"
 #~ msgstr "Выключить эту заставку в будущем?"
 
-#~ msgid "Theme Bug Detected"
-#~ msgstr "Найдена Ошибка в Теме"
-
-#~ msgid ""
-#~ "The theme you are using for your init splash<br>has a bug. It does not "
-#~ "respond to signals when<br>startup is complete. You should use an "
-#~ "init<br>splash theme that is correctly made or fix the<br>one you use."
-#~ msgstr ""
-#~ "Тема которую вы используете для init заставки<br>имеет ошибку. Она "
-#~ "неотвечает на сигналы<br>в конце загрузки. Вы должны использовать "
-#~ "правильно сделаную<br>тему init заставки,  либо починить ту, "
-#~ "которую<br>вы используете."
-
-#~ msgid "Init"
-#~ msgstr "Инициализация"
-
 #~ msgid "Window Manipulation"
 #~ msgstr "Управление Окнами"
 
 #~ msgid "When moving or resizing windows, resist at the boundaries"
 #~ msgstr "Упор в границах при перемещении или изменении размеров окна"
 
-#~ msgid "Both directions"
-#~ msgstr "В обе стороны"
-
-#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
-#~ msgstr "Enlightenment не может настроить конфигурацию ускорения мыши."
-
-#~ msgid "Mouse Acceleration Settings"
-#~ msgstr "Настройки Ускорения Мыши"
-
-#~ msgid "Add To Favorites Menu"
-#~ msgstr "Добавить в Избранное"
-
 #~ msgid ""
 #~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
 #~ "switch to an AC source."
@@ -7285,115 +7390,65 @@ msgstr ""
 #~ msgid "Charging"
 #~ msgstr "Зарядка"
 
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "Переход по рабочим столам мышкой с краёв экрана"
-
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "Время задержки на краю до перехода:"
-
-#~ msgid "Dismiss alert automatically"
-#~ msgstr "Автоматически убирать предупреждения"
-
-#~ msgid "Dismiss alert after:"
-#~ msgstr "Убирать предупреждения через:"
-
-#~ msgid "Choose a website from list..."
-#~ msgstr "Выбор сайта из списка..."
-
-#~ msgid "get-e.org - Static"
-#~ msgstr "get-e.org - Статика"
-
-#~ msgid "get-e.org  - Animated"
-#~ msgstr "get-e.org  - Аннимация"
-
-#~ msgid "[%s] Getting feed... DONE!"
-#~ msgstr "[%s] Получение канала... ГОТОВО!"
-
-#~ msgid "[%s] Getting feed... FAILED!"
-#~ msgstr "[%s] Получение канала... ОШИБКА!"
-
-#~ msgid "[%s] Parsing feed... DONE!"
-#~ msgstr "[%s] Разбор канала... ГОТОВО!"
+#~ msgid "Back"
+#~ msgstr "Назад"
 
-#~ msgid "[%s] Parsing feed... FAILED!"
-#~ msgstr "[%s] Разбор канала... ОШИБКА!"
+#~ msgid "Choose Language"
+#~ msgstr "Выбор Языка"
 
-#~ msgid "[%s] Downloading of edje file..."
-#~ msgstr "[%s] Загрузка файла edje..."
+#~ msgid "Theme Bug Detected"
+#~ msgstr "Найдена Ошибка в Теме"
 
-#~ msgid "[%s] Download %d images of %d"
-#~ msgstr "[%s] Загрузка %d изображений из %d"
+#~ msgid ""
+#~ "The theme you are using for your init splash<br>has a bug. It does not "
+#~ "respond to signals when<br>startup is complete. You should use an "
+#~ "init<br>splash theme that is correctly made or fix the<br>one you use."
+#~ msgstr ""
+#~ "Тема которую вы используете для init заставки<br>имеет ошибку. Она "
+#~ "неотвечает на сигналы<br>в конце загрузки. Вы должны использовать "
+#~ "правильно сделаную<br>тему init заставки,  либо починить ту, "
+#~ "которую<br>вы используете."
 
-#~ msgid "[%s] Choose an image from list"
-#~ msgstr "[%s] Выбор изображения из списка"
+#~ msgid "Init"
+#~ msgstr "Инициализация"
 
-#~ msgid "[%s] Downloading of edje file... %d%% done"
-#~ msgstr "[%s] Загрузка файла edje... %d%% готово"
+#~ msgid "Both directions"
+#~ msgstr "В обе стороны"
 
-#~ msgid "[%s] Getting feed..."
-#~ msgstr "[%s] Получение канала..."
+#~ msgid "Enlightenment cannot configure the mouse acceleration settings."
+#~ msgstr "Enlightenment не может настроить конфигурацию ускорения мыши."
 
-#~ msgid "Logout is currently in progress.<br><hilight>Please wait.</hilight>"
-#~ msgstr "В процессе выхода.<br><hilight>Пожалуйста подождите.</hilight>"
+#~ msgid "Mouse Acceleration Settings"
+#~ msgstr "Настройки Ускорения Мыши"
 
-#~ msgid ""
-#~ "Enlightenment is busy logging out.<br>You cannot perform other system "
-#~ "actions<br>once a logout has begun."
-#~ msgstr ""
-#~ "Enlightenment занят выходом из сессии.<br>Вы не можете выполнять другие "
-#~ "системные операции <br>с момента запуска выхода из сессии."
+#~ msgid "Move with Keyboard"
+#~ msgstr "Двигать с клавиатуры"
 
-#~ msgid ""
-#~ "Enlightenment is shutting the system down.<br>You cannot do any other "
-#~ "system actions<br>once a shutdown has been started."
-#~ msgstr ""
-#~ "Enlightenment выключает систему.<br>Вы не можете выполнять "
-#~ "никакихсистемных операций<br>с момента запуска выключения."
+#~ msgid "Resize with Keyboard"
+#~ msgstr "Менять размер с клавиатуры"
 
-#~ msgid ""
-#~ "Enlightenment is rebooting the system.<br>You cannot do any other system "
-#~ "actions<br>once a reboot has begun."
-#~ msgstr ""
-#~ "Enlightenment перегружает систему.<br>Вы не можете выполнять другие "
-#~ "системные операции <br>с момента запуска перегрузки."
+#~ msgid "Add To Favorites Menu"
+#~ msgstr "Добавить в Избранное"
 
-#~ msgid ""
-#~ "Enlightenment is suspending the system.<br>Until suspend is complete you "
-#~ "cannot perform<br>any other system actions."
-#~ msgstr ""
-#~ "Enlightenment приостанавливает систему.<br>Пока приостанов не закончится "
-#~ "Вы не можете выполнять никаких <br>системных операций."
+#~ msgid "Defined Command"
+#~ msgstr "Определённая Команда"
 
-#~ msgid ""
-#~ "Enlightenment is hibernating the system.<br>You cannot perform an other "
-#~ "system actions<br>until this is complete."
+#~ msgid "Shutting down your Computer.<br><hilight>Please wait.</hilight>"
 #~ msgstr ""
-#~ "Enlightenment замораживает систему.<br>Вы не можете выполнять другие "
-#~ "системные операции <br>пока эта не закончится."
+#~ "Ваш компьютер останавливается.<br><hilight>Пожалуйста, подождите.</"
+#~ "hilight>"
 
-#~ msgid "Hibernating your system failed."
-#~ msgstr "Заморозка вашей системы не удалась."
+#~ msgid "Logout is currently in progress.<br><hilight>Please wait.</hilight>"
+#~ msgstr "В процессе выхода.<br><hilight>Пожалуйста, подождите.</hilight>"
 
 #~ msgid "Rebooting your Computer.<br><hilight>Please wait.</hilight>"
 #~ msgstr ""
-#~ "Перезагрузка Вашего Компьютера.<br><hilight>Пожалуйста ждите.</hilight>"
+#~ "Перезагрузка Вашего Компьютера.<br><hilight>Пожалуйста, ждите.</hilight>"
 
 #~ msgid "Suspending your Computer.<br><hilight>Please wait.</hilight>"
 #~ msgstr ""
-#~ "Приостановка вашего компьютера.<br><hilight>Пожалуйста ждите.</hilight>"
+#~ "Приостановка вашего компьютера.<br><hilight>Пожалуйста, ждите.</hilight>"
 
 #~ msgid "Hibernating your Computer.<br><hilight>Please wait.</hilight>"
 #~ msgstr ""
-#~ "Заморозка Вашего Компьютера.<br><hilight>Пожалуйста подождите.</hilight>"
-
-#~ msgid "Check battery every:"
-#~ msgstr "Проверять батарею каждые:"
-
-#~ msgid "Alert when battery is down to:"
-#~ msgstr "Предупреждать при уровне близком к:"
-
-#~ msgid "Move with Keyboard"
-#~ msgstr "Двигать с клавиатуры"
-
-#~ msgid "Resize with Keyboard"
-#~ msgstr "Менять размер с клавиатуры"
+#~ "Заморозка Вашего Компьютера.<br><hilight>Пожалуйста, подождите.</hilight>"
diff --git a/po/sk.gmo b/po/sk.gmo
index 2e8a167..31f5c6b 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 675b460..5c781cf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,40 +5,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-16 15:14+0000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-08-07 11:08+0000\n"
 "Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovakian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -47,14 +49,6 @@ 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-2008, vývojový tím Enlightenment.<br><br>Dúfame, že "
-"tento program používate tak radi ako sme ho my radi vyvíjali.<br><br>Tento "
-"program je poskytovaný tak, ako je bez akejkoľvek výslovnej či implicitnej "
-"záruky. Šírenie tohto softvéru sa riadi licenčnými podmienkami, preto si "
-"prosím pozrite súbory COPYING a COPYING-PLAIN na vašom systéme.<br><br>Na "
-"Enlightenment <hilight>NEUSTÁLE PREBIEHA VÝVOJ</hilight> a nie je stabilné. "
-"Mnohé vlastnosti zatiaľ nie sú dokončené alebo neexistujú a môžu obsahovať "
-"veľa chýb. Boli ste <hilight>UPOZORNENÍ!</hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -75,56 +69,56 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ste si istý, že chcete násilne ukončiť toto okno?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Áno"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nie"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Ste si istý, že chcete skončiť?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Požadujete ukončenie Enlightenment.<br><br>Ste si istý, že chcete skončiť?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Ste si istý, že sa chcete odhlásiť?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "Chystáte sa odhlásiť.<br><br>Ste si istý, že to chcete?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Ste si istý, že chcete vypnúť počítač?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 "Požadujete vypnutie počítača.<br><br>Ste si istý, že chcete vypnúť počítač?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Ste si istý, že chcete reštartovať počítač?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -132,7 +126,7 @@ msgstr ""
 "Požadujete reštartovanie počítača.<br><br>Ste si istý, že chcete reštartovať "
 "počítač?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -140,11 +134,11 @@ msgstr ""
 "Požadujete prepnutie počítača do úsporného režimu.<br><br>Ste si istý, že "
 "chcete prepnúť počítač do úsporného režimu?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Ste si istý, že chcete prepnúť počítač do režimu spánku?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -152,494 +146,494 @@ msgstr ""
 "Požadujete prepnutie počítača do režimu spánku.<br><br>Ste si istý, že "
 "chcete prepnúť počítač do režimu spánku?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Okno : Operácie"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Presunúť"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Zmeniť veľkosť"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menu"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Menu Okna"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Vyššie"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Nižšie"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Násilne ukončiť"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Okno : Stav"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Zmeniť Lepkavosť"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Zmeniť Ikonifikáciu"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Zmeniť Na celú obrazovku"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximalizovať"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximalizovať zvisle"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximalizovať vodorovne"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximalizovať na celú obrazovka"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Inteligentný režim maximalizácie"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Režim maximalizácie „Zväčšiť“"
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Režim maximalizácie „Vyplniť“"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Nastaviť režim Tieň hore"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Nastaviť režim Tieň dole"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Nastaviť režim Tieň doľava"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Nastaviť režim Tieň doprava"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Zmeniť režim Tieňa"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Zmeniť stav Bez okrajov"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Zmeniť stav Pripnutia"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Plocha"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Preklopiť plochu doľava"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Preklopiť plochu doprava"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Preklopiť Plochu hore"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Preklopiť plochu dolu"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Preklopiť plochu podľa..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Zobraziť plochu"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Zobraziť policu"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Preklopiť plochu na..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Preklopiť plochu lineárne..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Prepnúť na plochu 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Prepnúť na plochu 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Prepnúť na plochu 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Prepnúť na plochu 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Prepnúť na plochu 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Prepnúť na plochu 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Prepnúť na plochu 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Prepnúť na plochu 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Prepnúť na plochu 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Prepnúť na plochu 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Prepnúť na plochu 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Prepnúť na plochu 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Prepnúť na plochu 12"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Preklopiť plochu vľavo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Preklopiť plochu vpravo (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Preklopiť plochu hore (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Preklopiť plochu dolu (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Preklopiť plochu podľa... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Preklopiť plochu do... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Preklopiť plochu lineárne... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Prevrátiť desktop v smere..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Preklopiť na plochu 0 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Preklopiť na plochu 1 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Preklopiť na plochu 2 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Preklopiť na plochu 3 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Preklopiť na plochu 4 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Preklopiť na plochu 5 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Preklopiť na plochu 6 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Preklopiť na plochu 7 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Preklopiť na plochu 8 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Preklopiť na plochu 9 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Preklopiť na plochu 10 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Preklopiť na plochu 11 (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Preklopiť na plochu... (všetky obrazovky)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Poslať myš na obrazovku 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Poslať myš na obrazovku 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Poslať myš na obrazovku..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Poslať myš dopredu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Poslať myš dozadu o 1 obrazovku"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Poslať myš dopredu/dozadu o obrazovky..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Okno : Presun"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Na ďalšiu plochu"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Na predošlú plochu"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Podľa č. plochy..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Na plochu..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Zobraziť Hlavné menu"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Zobraziť menu Obľúbené"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Zobraziť všetky aplikácie Menu"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Zobraziť menu Klienti"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Zobraziť menu..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Spustiť"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Príkaz"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Aplikácia"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Ukončiť"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Ukončiť teraz"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : režim"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Prepnúť režim prezentácie"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Prepnúť režim offline"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Systém"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Odhlásiť sa"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Vypnúť teraz"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Vypnúť"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Reštartovať"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Úsporný režim"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Režim spánku"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Usporiadať Okná"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Všeobecné : Operácie"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "Odložená operácia"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Nastaviť ako pozadie"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Sken súborov plochy dokončený"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Sken súboru plochy"
 
@@ -647,41 +641,40 @@ msgstr "Sken súboru plochy"
 msgid "Color Selector"
 msgstr "Výber farieb"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -700,7 +693,7 @@ msgstr ""
 "hodnoty.<br> Teraz môžete veci nakonfigurovať podľa svojej ľubovôle. "
 "Ospravedlňujeme sa za nepríjemnosti.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -714,11 +707,11 @@ msgstr ""
 "verzia Enlightenment.<br>To je zlé a preventívne bola vaša konfigurácia "
 "obnovená na predvolené hodnoty.<br>Ospravedlňujeme sa za nepríjemnosti.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Nastavenia aktualizované"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -729,7 +722,7 @@ msgstr ""
 "nepodarilo<br>určiť.<br><br>Súbor, kde sa chyba vyskytla:<br>%s<br><br>Tento "
 "súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -744,7 +737,7 @@ msgstr ""
 "vášho<br>domovského adresára.<br><br>Súbor, kde sa chyba vyskytla:<br>%"
 "s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -757,7 +750,7 @@ msgstr ""
 "chyba vyskytla:<br>%s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo "
 "poškodeniu údajov.<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -770,7 +763,7 @@ msgstr ""
 "prekročili svoju diskovú kvótu<br><br>Súbor, kde sa chyba vyskytla:<br>%"
 "s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -781,11 +774,11 @@ msgstr ""
 "zatvorený. To je veľmi nezvyčajné.<br><br>Súbor, kde sa chyba vyskytla:<br>%"
 "s<br><br>Tento súbor bol zmazaný, aby sa<br>zabránilo poškodeniu údajov.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Problémy so zápisom nastavení Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -793,12 +786,12 @@ msgstr "Problémy so zápisom nastavení Enlightenment"
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Základné"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Použiť"
 
@@ -806,7 +799,7 @@ msgstr "Použiť"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduly"
 
@@ -815,27 +808,27 @@ msgstr "Moduly"
 msgid "Extensions"
 msgstr "Rozšírenia"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Kontajner %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Chyba - chýba popdora PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 "Do Enlightenment nebola pridaná podpora PAM<br>takže zamykanie plochy je "
 "vypnuté."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Zamknutie zlyhalo"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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."
@@ -844,15 +837,15 @@ msgstr ""
 "ku klávesnici alebo myši, prípadne obidvom,<br>a tento vyhradený prístup sa "
 "nepodarilo zrušiť."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Prosím, zadajte heslo na odomknutie"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Chyba autentifikačného systému"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -863,11 +856,11 @@ msgstr ""
 "vytvoriť<br>autentifikovanú reláciu. Kód chyby je <hilight>%i</hilight>.<br> "
 "To nie je dobre a nemalo by sa to stávať. Prosím, ohláste túto chybu."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Aktivovať režim prezentácie?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -876,11 +869,11 @@ msgstr ""
 "Odomkli ste plochu príliš rýchlo.<br><br>Chcete umožniť <b>prezentáciu</b> a "
 "systému dočasne vypnúť šetrič obrazovky, zámok a úsporu energie?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Nie, ale zvýšenie zostávajuceho času"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Nie, a žiadosť o zastavenie"
 
@@ -906,7 +899,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Editor záznamov plochy"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -951,7 +944,7 @@ msgstr "Kategórie"
 msgid "Mime Types"
 msgstr "Typy MIME"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Voľby"
 
@@ -983,23 +976,23 @@ msgstr "Vybrať ikonu"
 msgid "Select an Executable"
 msgstr "Vybrať spustiteľný súbor"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Vložiť"
 
@@ -1007,24 +1000,24 @@ msgstr "Vložiť"
 msgid "Select All"
 msgstr "Vybrať všetky"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Chyba pri Spustení"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment nemôže vytvoriť proces potomka:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Chyba pri spustení aplikácie"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1033,309 +1026,309 @@ msgstr ""
 "Enlightenment nemôže spustiť aplikáciu.<br><br>%s<br><br>Aplikácia zlyhala "
 "pri spustení."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Chyba pri Spustení Aplikácie"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s neočakávane ukončil svoj beh."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "Návratová hodnota %2$s vrátila aplikácia %1$i."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s prerušil signál Interrupt."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s prerušil signál Quit."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s prerušil signál Abort."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s prerušila chyba pohyblivej desatinnej čiarky."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s prerušil signál Uninterruptable Kill."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s prerušila chyba segmentácie."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s prerušila prerušená rúra."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s prerušil signál Termination."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s prerušila chyba zbernice."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s prerušil signál č. %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 "***Zvyšný výstup bol vynechaný vo výpise. Zobraziť ho môžete uložením "
 "výstupu.***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Záznamy chýb"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Žiadne chybové hlásenie."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Uložiť túto správu"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Tento chybový záznam sa uloží ako %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informácia o chybe"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informácia chybového signálu"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Výstupné dáta"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Žiaden výstup."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Neexistujúca cesta"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s neexistuje."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Chyba pri pripájaní"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Nedá sa pripojiť jednotka"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr "Chyba pri odpájaní"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Nedá sa odpojiť jednotka"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Chyba pri vysunutí"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Nedá sa vysunúť jednotka"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Súbory"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Odkaz"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Zrušiť"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Zdedené rodičovské nastavenia"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Zobraziť režim"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Obnoviť zobrazenie"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Zobraziť skryté súbory"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Zapamätať objednávku"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Zoradiť teraz"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Nový Adresár"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Premenovať"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Odpojiť"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "Pripojiť"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Vysunúť"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Použiť predvolené"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Mriežka ikôn"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Vlastné ikony"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Zoznam"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Veľkosť ikony (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Nastaviť pozadie..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Nastaviť prekrývanie..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Vytvoriť nový adresár"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Názov nového adresára:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Premenovať %s na:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Premenovať súbor"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Opakovať"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Chyba"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Nie pre všetko"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Áno na všetko"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Varovanie"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Súbor už existuje, prepísať?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorovať"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorovať všetko"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Došlo ku chybe počas vykonávania operácie.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Potvrdiť zmazanie"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Ste si istí, že chcete zmazať<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1347,144 +1340,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "Vlastnosti súboru"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Súbor:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Veľkosť:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Posledná úprava:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Typ súboru:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Privilégiá"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Majiteľ:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Skupina môže čítať"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Skupina môže zapisovať"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Vlastník  môže čítať"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Vlastník  môže zapisovať"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Predvolené"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Náhľad"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Vlastné"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Použiť túto ikonu pre všetky súbory typu"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Linka informácie"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Vybrať obrázok"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Neznámy zväzok"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Vymeniteľné Zariadenie"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Priame"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Zabudovaný"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Vzhľad"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Automaticky rolovať obsah"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Umožniť Zmenu Veľkosti"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Začiatok pohybu/zmeny veľkosti tohto gadgetu"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Odstrániť túto špecialitu"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Ukončenie pohybu/zmeny veľkosti tohto gadgetu"
 
@@ -1496,7 +1493,7 @@ msgstr ""
 "Predchádzajúca inštancia Enlightenmentu je stále aktívna\n"
 "na tejto obrazovke. Zrušenie štartu.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Zámky Okna"
 
@@ -1530,21 +1527,21 @@ msgid "Lock program changing:"
 msgstr "Uzamknúť pred zmenou programom:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Umiestnenie"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Veľkosť"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Usporiadanie"
 
@@ -1553,12 +1550,12 @@ msgid "Iconified state"
 msgstr "Ikonifikovaný stav"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Lepkavosť"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Schovanie"
 
@@ -1567,7 +1564,7 @@ msgid "Maximized state"
 msgstr "Maximalizovaný stav"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Celá Obrazovka"
 
@@ -1575,7 +1572,7 @@ msgstr "Celá Obrazovka"
 msgid "Lock me from changing:"
 msgstr "Uzamknúť pred zmenou užívateľom:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Štýl okrajov"
 
@@ -1623,115 +1620,116 @@ msgstr "Odopnúť z plochy"
 msgid "More..."
 msgstr "Viac..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimalizovať"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximalizovať vertikálne"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximalizovať horizontálne"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Nemaximalizovať"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Klávesová skratka"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "K obľúbeným položkám"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "K spúšťaču"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Okraj"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Preskočiť"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Stav"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Zapamätať"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Vlastnosti Okna"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Vždy Nad"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normálne"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Vždy Pod"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Vybrať ohraničený štýl"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Použiť E17 predvolené nastavenie ikôn"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Za predpokladu použitia ikôn "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Použi užívateľom definovanú ikonu"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Schované"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Lepkavé"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Celá Obrazovka"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Zoznam Okien"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Pager"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Panel"
 
@@ -1747,7 +1745,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM vlastnosti"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Názov"
 
@@ -1839,11 +1837,11 @@ msgstr "NetWM vlastnosti"
 msgid "Modal"
 msgstr "Formálny"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Preskočiť panel"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Preskočiť pager"
 
@@ -1851,15 +1849,15 @@ msgstr "Preskočiť pager"
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Zapamätať Okno"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Nastavenia okna nie sú unikátne"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1886,11 +1884,11 @@ msgstr ""
 "uložené. Stlač <hilight>Zrušiť</hilight> pokiaľ<br>nie si si istý a žiadne "
 "zmeny sa neaplikujú."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Požadované vlastnosti nie sú nastavené"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1902,115 +1900,101 @@ msgstr ""
 "špecifikovania ako si ich zapamätať</hilight>.<br><br>Musíte špecifikovať "
 "aspoň 1 spôsob ako si zapamätať nastavenia pre toto okno."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Chcete aby si Enlightenment zapamätal, že má aplikovať<br>nastavenia (ako je "
-"veľkosť, umiestnenie, štýl okraju atď.) pre<br>okno, ktoré <hilight>nemá "
-"unikátne nastavenia</hilight>.<br><br>To znamená, že zdieľa Meno/Triedu, "
-"Priesvitnosť, Úlohu a ďalšie nastavenia s viac ako jedným ďalším oknom na "
-"obrazovke a zapamätanie<br>nastavení pre toto okno sa aplikuje aj na všetky "
-"ostatné okná<br>ktoré,majú rovnaké nastavenia.<br><br>Vhodné je zapnúť voľbu "
-"<hilight>Aplikuj iba pre jedno okno</hilight> v prípade, že si<br>prajete "
-"aby nastavenia platili iba pre jednu inštanciu tohoto okna a<br>nie pre "
-"všetky inštancie.<br><br>Toto je iba varovanie pre prípad, že neočakávate "
-"takýto priebeh.<br>V prípade, že očakávate stlačte <hilight>Aplikuj</"
-"hilight> alebo <hilight>OK</hilight> tlačítko<br>a Vaše nastavenia budú "
-"uložené. Stlač <hilight>Zrušiť</hilight> pokiaľ<br>nie si si istý a žiadne "
-"zmeny sa neaplikujú."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Veľkosť a Umiestnenie"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Zámky"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Veľkosť, Umiestnenie a Zámky"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "VÅ¡etko"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Zapamätať použitie"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Trieda a meno okna"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Úloha Okna"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Typ okna"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Priehľadnosť"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Zapamätať nastavenia"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuálna Plocha"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Aktuálna obrazovka"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Neuvádzať v Zozname Okien"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Platí iba pre jedno okno"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Spustiť tento program pri prihlásení"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Vždy so zameraním na začiatok"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Spustiť tento program pri prihlásení"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Nastavenia"
@@ -2029,24 +2013,24 @@ msgstr "Shelf"
 msgid "Module Settings"
 msgstr "Moduly"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Moduly k dispozícii"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Nahrať modul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Nahrané moduly"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Uvolniť modul"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2080,8 +2064,8 @@ msgstr "Odstrániť Špecialitu"
 msgid "Toolbar Settings"
 msgstr "Nastavenia panelu"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Rozloženie"
 
@@ -2108,12 +2092,12 @@ msgid "Favorite Applications"
 msgstr "Obľúbené Aplikácie"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Aplikácie"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2122,7 +2106,7 @@ msgstr "Aplikácie"
 msgid "Windows"
 msgstr "Okná"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Stratené Okná"
 
@@ -2158,129 +2142,128 @@ msgstr "(Žiadne Aplikácie)"
 msgid "Set Virtual Desktops"
 msgstr "Nastaviť virtuálne plochy"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Žiadne Okná)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Žiadne meno!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(žiadne shelves)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Shelf #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Pridať shelf"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Odstránniť shelf"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Nastavenia Å elfu"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Drobné"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Malý"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Stredne Veľké"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Veľký"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Obrovské"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "Nastaviť obsah..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Nad Všetkým"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Pod Oknami"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Pod Všetkým"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Povoliť prekrytie okna shelfom"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Zmenšiť na Veľkosť Obsahu"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixelov"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Štýly"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Automatické skrývanie"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Automaticky skrývať shelf"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Zobraziť pri prejdení myšou"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Zobraziť pri kliknutí myšou"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Skryť timeout"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekundy"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Zobraziť trvanie"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Zobraziť na všetkých plochách"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Zobraziť na určených plochách"
 
@@ -2524,7 +2507,7 @@ msgstr "Spúšťam medzinárodnú podporu"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment nemôže spustiť intl systém."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2532,11 +2515,11 @@ msgstr ""
 "Enlightenment nemôže spustiť úvodnú obrazovku.\n"
 "Možno máte nedostatok pamäte?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "Testujem podporu formátu"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2545,7 +2528,7 @@ msgstr ""
 "skontroluj,\n"
 "že Evas má podporu pre softvérový buffer engine.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2554,7 +2537,7 @@ msgstr ""
 "Evas podporu\n"
 "pre nahrávanie PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2563,7 +2546,7 @@ msgstr ""
 "Evas podporu\n"
 "pre nahrávanie JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2572,7 +2555,7 @@ msgstr ""
 "Evas podporu\n"
 "pre nahrávanie EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2582,11 +2565,11 @@ msgstr ""
 "má Evas\n"
 "podporu fontconfig a či fontconfig definuje 'Sans' písmo.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Nastaviť obrazovky"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2594,221 +2577,229 @@ msgstr ""
 "Nastavenie manažéra okien na všetkých obrazovkách v systéme zlyhalo.\n"
 "Nebeží už iný okenný manažér?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Nastaviť šetrič obrazovky"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment nevie nakonfigurovať X šetrič."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Nastavenie Desklock"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment nemôže nastaviť systém pre uzamknutie plochy."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Nastavenie cesty"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Inštalačný systém kontroly"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment nemôže inicializovať systémové príkazy systému.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Nastaviť akciu"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment nemôže spustiť systém akcií."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Nastavenie výkonu systému"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenmentu sa nepodarilo nastaviť exec systém."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Nastaviť zapamätanie"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment nemôže nastaviť uložené nastavenia."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "nastavenie FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment nemôže zinicializovať Súborový manažér.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Nastaviť systémové správy"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment nemôže spustiť systém msg."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "Nastavenie DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment nemôže spustiť systém dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr "Nastaviť zachytenie vstupnej manipulácie"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
 "Enlightenment nemôže spustiť systém na spracovanie zachyteného\n"
 "vstupu."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Nastavenie modulov"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment nemôže spustiť systém modulov."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Nastaviť zapamätanie"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment nemôže nastaviť uložené nastavenia."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Nastavenie triedy farieb"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment nemôže spustiť systém tried farieb."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Nastavenie gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment nemôže nastaviť systém pre ovládanie špecialít."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "Nastavenie DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment nie je schopný konfigurovať DPMS nastavenia."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Nastaviť mód úspory energie"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment nemôže nastaviť svoje módy šetrenia."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Nastaviť obrázok pozadia"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenmentu sa nepodarilo nastaviť pozadia plochy systému."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Nastaviť myš"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment nemôže konfigurovať nastavenia myši."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Nastaviť väzby"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment nemôže nastaviť systém klávesových skratiek."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Nastaviť vyskakovacie okná"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment nemôže spustiť popup systém."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Nastaviť shelvy"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment nemôže nastaviť shelf systém."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Nastaviť náhľady"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment nemôže zinicializovať Thumbnail systém.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Nastavujem poradie súborov"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
-msgstr ""
+msgstr "Enlightenment nemôže nastaviť svoj súborový systém."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Spustiť moduly"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
 "problem<br>modules from your configuration. The module<br>configuration "
 "dialog should let you select your<br>modules again."
 msgstr ""
+"Enlightenment zlyhal pri štarte a<br>bude reštartovaný. Všetky moduly boli "
+"zakázané<br>a nebude spustený pomocník k odstráneniu akéhokoľvek "
+"problému<br>modulu vo vašej konfigurácii. Dialóg<br>nastavenie modulu vám "
+"vyberie<br>moduly znova."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment havaroval na začiatku a bol reštartovaný"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
+"Enlightenment  zlyhal pri štarte abude reštartovaný.<br>Všetky moduly boli "
+"zakázané<br>a nebude spustený pomocník<br>k odstráneniu akéhokoľvek "
+"problému<br><br>modulu vo vašej konfigurácii. Dialóg nastavenie modulu vám "
+"vyberie<br>moduly znova."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Konfigurovať shelvy"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Takmer hotovo"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2817,11 +2808,11 @@ msgstr ""
 "Došlo k chybe pri načítaní modulu: %s<br>Žiadny modul s názvom %s nebol "
 "nájdený v<br>adresároch s modulmi.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Chyba pri nahrávaní modulu"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2830,11 +2821,11 @@ msgstr ""
 "Došlo k chybe pri načítaní modulu: %s<br>Úplná cesta k modulu je:<br>%"
 "s<br>Došlo k chybe:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modul neobsahuje všetky potrebné funkcie"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2845,12 +2836,12 @@ msgstr ""
 "modul minimálne vo verzii: %i.<br>API modul v Enlightenment je vo verzii: %i."
 "<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Chceš unloadnúť tento modul?<br>"
 
@@ -2860,12 +2851,15 @@ msgid ""
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Vypli ste šetrič obrazovky príliš rýchlo.<br><br>Ak chcete povoliť "
+"<b>prezentačný mód</b> a dočasne vypnúť šetrič obrazovky, zámok a správu "
+"napájania?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ste si istý, že chcete zmazať tento šelf ?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2873,19 +2867,19 @@ msgstr ""
 "Požadujete zmazanie tohoto šelfu.<br><br>Ste si istý, že chcete ho chcete "
 "zmazať?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Ukončiť Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Začať Presúvanie/Zmenu Veľkosti Položiek"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Nastaviť obsah shelf-u"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Zmazať tento Šelf"
 
@@ -2902,49 +2896,51 @@ msgstr "Kontrola privilégií systému"
 msgid "System Check Done"
 msgstr "Kontrola systému skončená"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Problém s odhlásením"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
+"Odhlasovanie trvá príliš dlho. Niektoré<br>aplikácie sa nechcú ukončiť."
+"<br>Chcete sa dokončiť odhlásenie<br>bez zatvorenia týchto<br>aplikácií?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Odhlásiť teraz"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Počkať dlhšie"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Zrušiť odhlásenie"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Prebieha odhlásenie"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Prebieha odhlásenie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment je zamestnaný inou požiadavkou"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 "Odhlásenie.<br>Nemôžete vykonať ďalšie akcie systému<br>odhlásenie začalo."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2952,7 +2948,7 @@ msgstr ""
 "Vypínanie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2960,7 +2956,7 @@ msgstr ""
 "Resetovanie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2968,7 +2964,7 @@ msgstr ""
 "Pozastavenie.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2976,55 +2972,55 @@ msgstr ""
 "Hibernácia.<br>Nemôžete vykonávať iné akcie do systému<br>pokiaľ to nie je "
 "kompletné."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "EEK! K tomu nemalo dôjsť"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Vypnutie zlyhalo."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Reset zlyhal."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Zastavenie zlyhalo."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Hibernácia zlyhala"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Vypnutie"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Vypnutie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Resetovanie"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Resetovanie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Zastavenie"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Zastavenie.<br><hilight>Prosím čakajte.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Hibernácia"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Hibernácia.<br><hilight>Prosím čakajte.</hilight>"
 
@@ -3040,11 +3036,11 @@ msgstr "Nastaviť ako motív"
 msgid "Set Toolbar Contents"
 msgstr "Nastaviť obsah panela nástrojov"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Nie je možné skončiť - nesmrteľné okná."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3054,77 +3050,77 @@ msgstr ""
 "znamená, že<br>Enlightenment nebude možné ukončiť pokiaľ tieto okná "
 "nebudú<br>uzatvorené, alebo lifespan zámok nebude vypnutý.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytov"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.0f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "V budúcnosti"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "V poslednej minúte"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li pred rokmi"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li pred mesiacmi"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li pred týždňami"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li pred dňami"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li pred hodinami"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li pred minútami"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznámy"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3144,51 +3140,51 @@ msgstr "Hore"
 msgid "Down"
 msgstr "Dole"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Pridať do obľúbených"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Prejsť hore do adresára"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Oprávnenia:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Zmenené:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ty"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Chránené"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Iba na čítanie"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Zakázané"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Čítať-zapisovať"
 
@@ -3204,57 +3200,57 @@ msgstr "Základné Nastavenia"
 msgid "Show alert when battery is low"
 msgstr "Upozorniť keď bude batéria takmer vybitá"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Skontrolujte každý:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
-msgstr ""
+msgstr "%1.0f dielov"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Zobraziť upozornenie pri slabej batérii"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Upozornenie pri:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Automatické zamietnutie v..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sek"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Výzva"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Automatická detekcia"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3262,12 +3258,12 @@ msgstr "Automatická detekcia"
 msgid "Internal"
 msgstr "Interné"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Hardwér"
 
@@ -3276,24 +3272,24 @@ msgstr "Hardwér"
 msgid "Battery"
 msgstr "Batéria"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Vaša batéria je slabá!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "Doporučujem napojenie na AC sieť."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Ukazovateľ stavu batérie"
 
@@ -3301,20 +3297,20 @@ msgstr "Ukazovateľ stavu batérie"
 msgid "Clock"
 msgstr "Hodiny"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "nastavenia panelu"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Prezentácia"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Nepripojený"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Mód"
 
@@ -3340,7 +3336,7 @@ msgid "Restart Applications"
 msgstr "Reštart aplikácií"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Všetky aplikácie"
 
@@ -3362,12 +3358,12 @@ msgstr "IBar ďaľší"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Ponuky"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Predvolený štýl ohraničenia"
 
@@ -3375,14 +3371,14 @@ msgstr "Predvolený štýl ohraničenia"
 msgid "Window Border Selection"
 msgstr "Výber Okraju Okna"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapamätať si okraj okna pre budúcnosť"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3399,7 +3395,7 @@ msgstr "Okraje"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
 msgid "Client List Settings"
-msgstr ""
+msgstr "Zoznam nastavení klienta"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
 msgid "Group By"
@@ -3408,7 +3404,7 @@ msgstr "Skupina podľa"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3434,7 +3430,7 @@ msgstr "Používanie menu"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:122
 msgid "Client Sort Order"
-msgstr ""
+msgstr "Zoradenie klienta"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
 msgid "Alphabetical"
@@ -3442,7 +3438,7 @@ msgstr "Abecedne"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
 msgid "Window stacking layer"
-msgstr ""
+msgstr "Vrstva radenia okna"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
@@ -3450,7 +3446,7 @@ msgstr "V poslednej dobe používané"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:134
 msgid "Iconified Windows"
-msgstr ""
+msgstr "Ikonované okná"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
@@ -3466,15 +3462,15 @@ msgstr "Oddeliť skupiny"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:142
 msgid "Warp to owning desktop"
-msgstr ""
+msgstr "Presunúť na vlastnú plochu"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
 msgid "Menu Item Captions"
-msgstr ""
+msgstr "Popisky položiek menu"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
-msgstr ""
+msgstr "Limit dĺžky popisky"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
 #, c-format
@@ -3491,11 +3487,11 @@ msgstr "Okenný Manažér"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
 msgid "About Dialog Title"
-msgstr ""
+msgstr "Titulok dialógu o aplikácii"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
 msgid "About Dialog Version"
-msgstr ""
+msgstr "O verzii dialógu o aplikácii"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
 msgid "Border Title"
@@ -3503,7 +3499,7 @@ msgstr "Ohraničenie názvu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Settings Dialog Title"
-msgstr ""
+msgstr "Nastavenia dialógu o aplikácii"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
@@ -3516,7 +3512,7 @@ msgstr "Názov menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Aktívny titulok menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
@@ -3525,7 +3521,7 @@ msgstr "Položka Menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
 msgid "Menu Item Active"
-msgstr ""
+msgstr "Aktívna položka menu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
@@ -3539,11 +3535,11 @@ msgstr "Zmeniť Veľkosť Textu"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
 msgid "Winlist Item"
-msgstr ""
+msgstr "Položka zoznamu okien"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
 msgid "Winlist Label"
-msgstr ""
+msgstr "Označenie zoznamu okien"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
@@ -3676,9 +3672,9 @@ msgid "Desktop Name"
 msgstr "Názov plochy"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Názov:"
 
@@ -3697,7 +3693,7 @@ msgstr "Plocha"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
-msgstr ""
+msgstr "Nastavenie uzamknutia obrazovky"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
@@ -3705,11 +3701,11 @@ msgstr "Automatické Uzamykanie"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
-msgstr ""
+msgstr "Zamknúť pri štarte Enlightenment"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
-msgstr ""
+msgstr "Zamknúť pri aktivovaní X screensaver"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
 msgid "Time after screensaver activated"
@@ -3744,10 +3740,10 @@ msgstr "%1.0f minút"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Osobné"
@@ -3779,8 +3775,8 @@ msgstr "Ukázať v zóne obrazovky #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3901,46 +3897,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Virtuálne Plochy"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Hlavné Nastavenia"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normálne okná"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Základný Mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Pokročilý Mód"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Štandardný Mód Dialógu"
 
@@ -3996,31 +3997,31 @@ msgstr "Obnoviť"
 msgid "Screen Resolution Settings"
 msgstr "Nastavenie rozšírenia obrazovky"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Obnoviť pri prihlásení"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Obnoviť"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Točenie"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Zrkadlenie"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Chýbajúce Vlastnosti"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4029,11 +4030,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Nenájdená obnovovacia frekvencia"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4088,7 +4089,7 @@ msgid "Power Management"
 msgstr "Správa napájania"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4098,102 +4099,107 @@ msgstr "<Žiadny>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Nastavenie väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Väzby okrajov"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Pridať okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Odstrániť okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Upraviť okraj"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Odstrániť všetko"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Obnoviť predvolené väzby"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Akcia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Hlavné nastavenia"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f sekúnd"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4488,18 +4494,17 @@ msgstr "Skutočne veľký"
 msgid "%d pixels"
 msgstr "%d pixelov"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Fonty"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Jednoduchá ukážka textu: 123: 我的天空!"
 
@@ -4507,38 +4512,50 @@ msgstr "Jednoduchá ukážka textu: 123: 我的天空!"
 msgid "Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Povoliť Triedu Fontu"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Font"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Pokročilá ukážka textu.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Vyhladzovanie"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "Fonty Záloha"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "Meno Zálohy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "Povoliť Zálohy"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Pokročilá ukážka textu.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4552,7 +4569,7 @@ msgstr "Ikona motívu"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Téma Ikony"
 
@@ -4620,7 +4637,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Jazyk"
 
@@ -4790,7 +4807,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Okraj Autoscroll Kurzoru"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Rozmanité Nastavenia"
 
@@ -4966,24 +4983,24 @@ msgstr "Veľkosť Kurzora"
 msgid "Mouse Cursor"
 msgstr "Kurzor Myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Nastavenia myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Akcelerácia myši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Akcelerácia"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -5000,7 +5017,7 @@ msgid "Images"
 msgstr "Obrázky"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Témy"
 
@@ -5100,33 +5117,33 @@ msgstr "%1.0f kolekcií"
 msgid "Performance"
 msgstr "Výkon"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Vybratie profilu"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Dostupné profily"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Vybrať profil"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Reset"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "Chcete odstrániť \"%s\" profil.<br><br>Ste si istý?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Odstrániť OK?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Pridať nový profil"
 
@@ -5290,23 +5307,23 @@ msgstr "Spustenie"
 msgid "Theme Selector"
 msgstr "Výber Témy"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Import..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Pripojený..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Kategórie motívov"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Priradiť"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Vymazať všetko"
 
@@ -5363,38 +5380,38 @@ msgid "Wallpaper Settings"
 msgstr "Nastavenia tapety"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Použiť tapetu motívu"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Obrázok..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Pripojený..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Kam umiestniť tapetu"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "VÅ¡etky Plochy"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Táto Plocha"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Táto obrazovka"
 
@@ -5415,14 +5432,14 @@ msgid "Fill Options"
 msgstr "Vyplňte Voľby"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horizontálne"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertikálne"
 
@@ -5487,40 +5504,40 @@ msgstr "Použi originálny súbor"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Vybrať obrázok"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Zlyhal import obrázka"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Zlyhal import tapety"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Výmena tapety"
 
@@ -5632,14 +5649,6 @@ msgstr "Preferujete užívateľom definovanú ikonu"
 msgid "Prefer application provided icon"
 msgstr "Preferujete aplikáciu pridelenú ikonu"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Vnútorné okná"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Vždy pamätajte vnútorné okná"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Nastavenia Zaostrenia"
@@ -5772,17 +5781,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Inteligentne zväčšiť"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Zväčšiť okno"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Vyplniť dostupné miesto"
 
@@ -5790,19 +5794,19 @@ msgstr "Vyplniť dostupné miesto"
 msgid "Maximize Policy"
 msgstr "Pravidlá Maximalizácie"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Obidva"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Povoliť manipuláciu s oknami"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5841,49 +5845,57 @@ msgstr "Zdvihnúť pri pohybe alebo pri zmene veľkosti"
 msgid "Raise when clicking to focus"
 msgstr "Zdvihnúť pri zaostrení kliknutím"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Zapamätanie okna"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Odstrániť Zapamätané"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Bez názvu>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Trieda:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Bez triedy>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Názov"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Bez názvu>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Úloha:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Bez úlohy>"
 
@@ -6241,7 +6253,7 @@ msgid "Show Toolbar"
 msgstr "Zobraziť lištu s nástrojmi"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Chovanie"
 
@@ -6257,95 +6269,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "Ďaľšie aplikácie"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Otvoriť"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Otvoriť s..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Známe aplikácie"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Konkrétne aplikácie"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Vlastný príkaz"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6371,16 +6383,16 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6418,19 +6430,19 @@ msgstr "Pozadie"
 msgid "Gadgets"
 msgstr "Å peciality"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "Voľné"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Vždy na ploche"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "Pridať daľšie gadgety"
 
@@ -6467,7 +6479,7 @@ msgstr "Vybraný Zdroj Lišty"
 msgid "Icon Labels"
 msgstr "Označenia Ikony"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Ukázať Označenie Ikony"
 
@@ -6528,43 +6540,43 @@ msgstr "Vytvoriť novú ikonu"
 msgid "Add Application"
 msgstr "Pridať aplikáciu"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "Nastavenia IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Zobraziť Meno"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Zobraziť Titul"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Zobraziť Triedu"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Zobraziť Názov Ikony"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Zobraziť okná zo všetkých obrazoviek"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Zobraziť okná z aktuálnej obrazovky"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Ukázať okná zo všetkých plôch"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Ukázať okná z aktívnej plochy"
 
@@ -6584,11 +6596,11 @@ msgstr "Prepnúť plochu otočením kolečka myši"
 msgid "Show desktop names"
 msgstr "Zobraziť názvy plôch"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Nastavenie Popup"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "Zobraziť okno pri zmene plochy"
 
@@ -6596,108 +6608,108 @@ msgstr "Zobraziť okno pri zmene plochy"
 msgid "Show popup for urgent windows"
 msgstr "Zobraziť okno pre naliehavé okná"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Vyberte a posuňte tlačidlo"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Kliknúť k nastaveniu"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Rýchlosť popup"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekúnd"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "Naliehavé nastavenie okna"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr "Zobraziť popup v naliehavom okne"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Upozornenie"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "Tlačitko %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6821,7 +6833,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f °C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Teplota"
 
@@ -6833,15 +6845,15 @@ msgstr "Ďaľší"
 msgid "Welcome to Enlightenment"
 msgstr "Vitajte v Enlightenment-e"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Vyberte jednu"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6888,15 +6900,15 @@ msgstr "Klikni k zameraniu okna"
 msgid "Mouse over focuses windows"
 msgstr "Myš nad zameranými oknami"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Vybrať ikony k pridaniu"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Rýchle spustenie"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Vyber aplikácie"
 
@@ -7018,18 +7030,50 @@ msgstr "Špeciálne zariadenie"
 msgid "Networks"
 msgstr "Siete"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Ďalší systray existuje"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "Tu môže byť len jeden gadget systray a ďalší už existuje."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Systray"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Chcete aby si Enlightenment zapamätal, že má aplikovať<br>nastavenia (ako "
+#~ "je veľkosť, umiestnenie, štýl okraju atď.) pre<br>okno, ktoré "
+#~ "<hilight>nemá unikátne nastavenia</hilight>.<br><br>To znamená, že zdieľa "
+#~ "Meno/Triedu, Priesvitnosť, Úlohu a ďalšie nastavenia s viac ako jedným "
+#~ "ďalším oknom na obrazovke a zapamätanie<br>nastavení pre toto okno sa "
+#~ "aplikuje aj na všetky ostatné okná<br>ktoré,majú rovnaké nastavenia."
+#~ "<br><br>Vhodné je zapnúť voľbu <hilight>Aplikuj iba pre jedno okno</"
+#~ "hilight> v prípade, že si<br>prajete aby nastavenia platili iba pre jednu "
+#~ "inštanciu tohoto okna a<br>nie pre všetky inštancie.<br><br>Toto je iba "
+#~ "varovanie pre prípad, že neočakávate takýto priebeh.<br>V prípade, že "
+#~ "očakávate stlačte <hilight>Aplikuj</hilight> alebo <hilight>OK</hilight> "
+#~ "tlačítko<br>a Vaše nastavenia budú uložené. Stlač <hilight>Zrušiť</"
+#~ "hilight> pokiaľ<br>nie si si istý a žiadne zmeny sa neaplikujú."
+
+#~ msgid "Window name and class"
+#~ msgstr "Trieda a meno okna"
+
 #~ msgid "Shelf Size"
 #~ msgstr "Velkosť Šelfu"
 
@@ -7039,18 +7083,18 @@ msgstr "Systray"
 #~ msgid "Configure Heading"
 #~ msgstr "Konfigurovať Smerovanie"
 
+#~ msgid "Expand the window"
+#~ msgstr "Zväčšiť okno"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Povoliť manipuláciu s oknami"
+
 #~ msgid "Defined Command"
 #~ msgstr "Definovaný Príkaz"
 
 #~ msgid "Desktop Lock"
 #~ msgstr "Zámok Plochy"
 
-#~ msgid "Advanced Settings"
-#~ msgstr "Pokročilé Nastavenia"
-
-#~ msgid "Lock Screen"
-#~ msgstr "Uzamknúť Obrazovku"
-
 #~ msgid "Desktop %i, %i"
 #~ msgstr "Plocha %i, %i"
 
@@ -7060,15 +7104,27 @@ msgstr "Systray"
 #~ msgid "Configuration"
 #~ msgstr "Konfigurácia"
 
+#~ msgid "Lock Screen"
+#~ msgstr "Uzamknúť Obrazovku"
+
 #~ msgid "Shelf Configuration"
 #~ msgstr "Konfigurácia Šelfu"
 
+#~ msgid "Advanced Settings"
+#~ msgstr "Pokročilé Nastavenia"
+
 #~ msgid "Enlightenment Configuration"
 #~ msgstr "Enlightenment Konfigurácia"
 
 #~ msgid "Configuration Panel"
 #~ msgstr "Konfiguračný Panel"
 
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "Preklopiť plochu keď  je myš na okraji"
+
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "Doba po ktorú je myš na okraji pred preklopením"
+
 #~ msgid "Search Path Configuration"
 #~ msgstr "Konfigurácia Prehľadávanej Cesty"
 
@@ -7093,49 +7149,6 @@ msgstr "Systray"
 #~ msgid "Disable this splash screen in the future?"
 #~ msgstr "Zablokovať úvodnú obrazovku pre budúcnosť?"
 
-#~ msgid "Window Manipulation"
-#~ msgstr "Manipulácia s Oknami"
-
-#~ msgid "When moving or resizing windows, resist at the boundaries"
-#~ msgstr "Pri hýbaní a zmene veľkosti okien, klásť odpor na okrajoch"
-
-#~ msgid "Both directions"
-#~ msgstr "Obidva smery"
-
-#~ msgid ""
-#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
-#~ "switch to an AC source."
-#~ msgstr ""
-#~ "Batéria je takmer vybitá<br>Vaša batéria je už skoro vybitá.<br>Bolo by "
-#~ "dobré pripojiť napájanie do siete."
-
-#~ msgid "BAD DRIVER"
-#~ msgstr "ZLÝ OVLÁDAČ"
-
-#~ msgid "FULL"
-#~ msgstr "PLNÁ"
-
-#~ msgid "High"
-#~ msgstr "Veľa Energie"
-
-#~ msgid "Low"
-#~ msgstr "Málo Energie"
-
-#~ msgid "Danger"
-#~ msgstr "Nebezpečenstvo"
-
-#~ msgid "NO INFO"
-#~ msgstr "NO INFO"
-
-#~ msgid "NO BAT"
-#~ msgstr "NO BAT"
-
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "Preklopiť plochu keď  je myš na okraji"
-
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "Doba po ktorú je myš na okraji pred preklopením"
-
 #~ msgid "Enlightenment cannot set up its app system."
 #~ msgstr "Enlightenment nemôže spustiť systém pre aplikácie."
 
@@ -7151,15 +7164,15 @@ msgstr "Systray"
 #~ msgid "Miscellaneous"
 #~ msgstr "Rozmanité"
 
+#~ msgid "Window Manipulation"
+#~ msgstr "Manipulácia s Oknami"
+
 #~ msgid "Window list skip"
 #~ msgstr "Vynechať zo Zoznamu Okien"
 
 #~ msgid "Window"
 #~ msgstr "Okno"
 
-#~ msgid "Window Name"
-#~ msgstr "Meno Okna"
-
 #~ msgid "Window Title"
 #~ msgstr "Titul Okna"
 
@@ -7169,6 +7182,9 @@ msgstr "Systray"
 #~ msgid "Window Frame"
 #~ msgstr "Rám Okna"
 
+#~ msgid "When moving or resizing windows, resist at the boundaries"
+#~ msgstr "Pri hýbaní a zmene veľkosti okien, klásť odpor na okrajoch"
+
 #~ msgid "Module State"
 #~ msgstr "Stav Modulu"
 
@@ -7181,6 +7197,34 @@ msgstr "Systray"
 #~ msgid "Font Class Configuration"
 #~ msgstr "Konfigurácia Triedy Fontu"
 
+#~ msgid ""
+#~ "Battery Running Low<br>Your battery is running low.<br>You may wish to "
+#~ "switch to an AC source."
+#~ msgstr ""
+#~ "Batéria je takmer vybitá<br>Vaša batéria je už skoro vybitá.<br>Bolo by "
+#~ "dobré pripojiť napájanie do siete."
+
+#~ msgid "NO INFO"
+#~ msgstr "NO INFO"
+
+#~ msgid "NO BAT"
+#~ msgstr "NO BAT"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "ZLÝ OVLÁDAČ"
+
+#~ msgid "FULL"
+#~ msgstr "PLNÁ"
+
+#~ msgid "High"
+#~ msgstr "Veľa Energie"
+
+#~ msgid "Low"
+#~ msgstr "Málo Energie"
+
+#~ msgid "Danger"
+#~ msgstr "Nebezpečenstvo"
+
 #~ msgid "Enlightenment Battery Module"
 #~ msgstr "Enlightenment Modul Batéria"
 
@@ -7520,32 +7564,15 @@ msgstr "Systray"
 #~ msgid "Check Very Slow (60 sec)"
 #~ msgstr "Kontrolovať Veľmi Pomaly (60 sek)"
 
+#~ msgid "Both directions"
+#~ msgstr "Obidva smery"
+
 #~ msgid "EFM"
 #~ msgstr "EFM"
 
 #~ msgid "Move Up"
 #~ msgstr "Posunút Hore"
 
-#~ msgid "App name"
-#~ msgstr "Názov aplikácie"
-
-#~ msgid "New Row of Desktops"
-#~ msgstr "Nový Riadok Plôch"
-
-#~ msgid ""
-#~ "Error starting icon editor\n"
-#~ "\n"
-#~ "please install e_util_eapp_edit\n"
-#~ "or make sure it is in your PATH\n"
-#~ msgstr ""
-#~ "Vznikla chyba pri spúšťaní editoru ikon\n"
-#~ "\n"
-#~ "prosím nainštalujte e_util_eapp_edit\n"
-#~ "alebo sa uistite, že je uvedený v PATH\n"
-
-#~ msgid "Wait Exit"
-#~ msgstr "Počkať pri Ukončení"
-
 #~ msgid "Show windows from all zones"
 #~ msgstr "Ukázať okná zo všetkých zón"
 
@@ -7613,6 +7640,9 @@ msgstr "Systray"
 #~ msgid "Exit Enlightenment"
 #~ msgstr "Ukončiť Enlightenment"
 
+#~ msgid "App name"
+#~ msgstr "Názov aplikácie"
+
 #~ msgid "Enlightenment: Error!"
 #~ msgstr "Enlightenment: Chyba!"
 
@@ -7848,6 +7878,9 @@ msgstr "Systray"
 #~ msgid "Mouse Pointer Settings"
 #~ msgstr "Nastavenie Kurzora Myši"
 
+#~ msgid "New Row of Desktops"
+#~ msgstr "Nový Riadok Plôch"
+
 #~ msgid "10 Mins"
 #~ msgstr "10 minút"
 
@@ -7874,9 +7907,6 @@ msgstr "Systray"
 #~ msgid "Lifespan"
 #~ msgstr "Lifespan"
 
-#~ msgid "Remember This Window"
-#~ msgstr "Zapamätať Si Toto Okno"
-
 #~ msgid "Remember This Instance Only"
 #~ msgstr "Zapamätať Si Iba Túto Inštanciu"
 
@@ -7907,12 +7937,26 @@ msgstr "Systray"
 #~ msgid "Send To"
 #~ msgstr "Poslať Na"
 
+#~ msgid ""
+#~ "Error starting icon editor\n"
+#~ "\n"
+#~ "please install e_util_eapp_edit\n"
+#~ "or make sure it is in your PATH\n"
+#~ msgstr ""
+#~ "Vznikla chyba pri spúšťaní editoru ikon\n"
+#~ "\n"
+#~ "prosím nainštalujte e_util_eapp_edit\n"
+#~ "alebo sa uistite, že je uvedený v PATH\n"
+
 #~ msgid "Enlightenment Cpufreq Module"
 #~ msgstr "Modul Cpufreq pre Enlightenment"
 
 #~ msgid "CpuFreq"
 #~ msgstr "CpuFreq"
 
+#~ msgid "Wait Exit"
+#~ msgstr "Počkať pri Ukončení"
+
 #~ msgid "%3.0f"
 #~ msgstr "%3.0f"
 
@@ -7946,3 +7990,6 @@ msgstr "Systray"
 
 #~ msgid "Gadget test"
 #~ msgstr "Test Å peciality"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Vnútorné okná"
diff --git a/po/sl.gmo b/po/sl.gmo
index 771d514..c1ad472 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 6c8f333..b1fcf2e 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: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\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,29 +17,29 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Zapri"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 #, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -75,49 +75,49 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Da"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ne"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 #, fuzzy
 msgid "Are you sure you want to log out?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 #, fuzzy
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 #, fuzzy
 msgid "Are you sure you want to turn off?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 #, fuzzy
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
@@ -125,12 +125,12 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 #, fuzzy
 msgid "Are you sure you want to reboot?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 #, fuzzy
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
@@ -138,7 +138,7 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 #, fuzzy
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
@@ -146,12 +146,12 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 #, fuzzy
 msgid "Are you sure you want to hibernate?"
 msgstr "Ste prepričani, da bi radi zapustili Enlightenment?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 #, fuzzy
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
@@ -159,574 +159,574 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 #, fuzzy
 msgid "Window : Actions"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 #, fuzzy
 msgid "Move"
 msgstr "Jaz"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 #, fuzzy
 msgid "Resize"
 msgstr "Upor"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meni"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 #, fuzzy
 msgid "Window Menu"
 msgstr "Vloga Okna"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr ""
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 #, fuzzy
 msgid "Lower"
 msgstr "Nizko"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Uniči"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 #, fuzzy
 msgid "Window : State"
 msgstr "Ime Okna"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 #, fuzzy
 msgid "Fullscreen Mode Toggle"
 msgstr "Celozaslonsko stanje"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maksimiraj"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 #, fuzzy
 msgid "Maximize Vertically"
 msgstr "Maksimirano po vertikali"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 #, fuzzy
 msgid "Maximize Horizontally"
 msgstr "Maksimirano po horizontali"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 #, fuzzy
 msgid "Maximize Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 #, fuzzy
 msgid "Maximize Mode \"Smart\""
 msgstr "Maksimirano stanje"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr ""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 #, fuzzy
 msgid "Maximize Mode \"Fill\""
 msgstr "Taktika Maksimiranja"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 #, fuzzy
 msgid "Toggle Borderless State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 #, fuzzy
 msgid "Toggle Pinned State"
 msgstr "Brez okvirjev"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 #, fuzzy
 msgid "Flip Desktop Left"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 #, fuzzy
 msgid "Flip Desktop Right"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 #, fuzzy
 msgid "Flip Desktop Up"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 #, fuzzy
 msgid "Flip Desktop Down"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 #, fuzzy
 msgid "Flip Desktop By..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 #, fuzzy
 msgid "Show The Desktop"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 #, fuzzy
 msgid "Flip Desktop To..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr ""
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 #, fuzzy
 msgid "Switch To Desktop 0"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 #, fuzzy
 msgid "Switch To Desktop 1"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 #, fuzzy
 msgid "Switch To Desktop 2"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 #, fuzzy
 msgid "Switch To Desktop 3"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 #, fuzzy
 msgid "Switch To Desktop 4"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 #, fuzzy
 msgid "Switch To Desktop 5"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 #, fuzzy
 msgid "Switch To Desktop 6"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 #, fuzzy
 msgid "Switch To Desktop 7"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 #, fuzzy
 msgid "Switch To Desktop 8"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 #, fuzzy
 msgid "Switch To Desktop 9"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 #, fuzzy
 msgid "Switch To Desktop 10"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 #, fuzzy
 msgid "Switch To Desktop 11"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 #, fuzzy
 msgid "Switch To Desktop..."
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "Vsa Namizja"
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 #, fuzzy
 msgid "Screen"
 msgstr "Zakleni zaslon"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr ""
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr ""
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr ""
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr ""
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr ""
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 #, fuzzy
 msgid "Window : Moving"
 msgstr "Zasenčevanje oken"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 #, fuzzy
 msgid "To Next Desktop"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 #, fuzzy
 msgid "To Previous Desktop"
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 #, fuzzy
 msgid "By Desktop #..."
 msgstr "Desktop"
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 #, fuzzy
 msgid "To Desktop..."
 msgstr "To Namizje"
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 #, fuzzy
 msgid "Show Main Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 #, fuzzy
 msgid "Show Favorites Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 #, fuzzy
 msgid "Show All Applications Menu"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 #, fuzzy
 msgid "Show Clients Menu"
 msgstr "Prikaži Komentar v Meniju"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 #, fuzzy
 msgid "Show Menu..."
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr ""
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 #, fuzzy
 msgid "Command"
 msgstr "Poženi ukaz"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 #, fuzzy
 msgid "Application"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr ""
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 #, fuzzy
 msgid "Exit"
 msgstr "Počakaj z izhodom"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 #, fuzzy
 msgid "Exit Now"
 msgstr "Počakaj z izhodom"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Celozaslonsko stanje"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Celozaslonsko stanje"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr ""
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr ""
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr ""
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr ""
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 #, fuzzy
 msgid "Hibernate"
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 #, fuzzy
 msgid "Lock"
 msgstr "Zaklepi"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Razporedi Okna"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Delayed Action"
 msgstr "Dejanja Modula"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 #, fuzzy
 msgid "Set As Background"
 msgstr "Nastavi Ozadje za"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 #, fuzzy
 msgid "Desktop files scan done"
 msgstr "Desktop"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 #, fuzzy
 msgid "Desktop file scan"
 msgstr "Desktop"
@@ -736,41 +736,40 @@ msgstr "Desktop"
 msgid "Color Selector"
 msgstr "Tematski izbirnik"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "V Redu"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Pozabi"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -788,7 +787,7 @@ msgstr ""
 "stara nastavitvena datoteka ne vsebuje. Sedaj<br>pa lahko ponovno nastavite "
 "stvari po svoje. Opravičujemo se za kolcanje.<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -804,12 +803,12 @@ msgstr ""
 "nastavili na privzete vrednosti. Prosimo, sprejmite naše<br>opravičilo za "
 "vse nevšečnosti.<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "Nastavitve Namizij"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -817,7 +816,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -827,7 +826,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -836,7 +835,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -845,7 +844,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -853,12 +852,12 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Nastavitev Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -866,12 +865,12 @@ msgstr "Nastavitev Enlightenment"
 msgid "Advanced"
 msgstr "Napredno"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Osnovno"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Uporabi"
 
@@ -879,7 +878,7 @@ msgstr "Uporabi"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduli"
 
@@ -888,25 +887,25 @@ msgstr "Moduli"
 msgid "Extensions"
 msgstr ""
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Območje %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr ""
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Zaklep neuspešen"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 #, fuzzy
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
@@ -915,15 +914,15 @@ msgstr ""
 "Zaklep namizja ni uspel, ker je nek program<br>prevzel tipkovnico oziroma "
 "miško oziroma oboje<br>in se prevzem ne more prekiniti."
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Vnesite vaše geslo za odklep"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -931,22 +930,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -967,7 +966,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -1015,7 +1014,7 @@ msgstr ""
 msgid "Mime Types"
 msgstr "Datoteka:"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 #, fuzzy
 msgid "Options"
 msgstr "Opcije"
@@ -1053,24 +1052,24 @@ msgstr "Izberi okno"
 msgid "Select an Executable"
 msgstr "Izberi okno"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 #, fuzzy
 msgid "Cut"
 msgstr "Odreži"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 #, fuzzy
 msgid "Paste"
 msgstr "Hitro"
@@ -1080,24 +1079,24 @@ msgstr "Hitro"
 msgid "Select All"
 msgstr "Izbriši"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Napaka pri zagonu"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Napaka pri pogonu programa"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -1106,330 +1105,330 @@ msgstr ""
 "Enlightenment ni uspelo zagnati programa:<br><br>%s<br><br>Program se ni "
 "zagnal."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Napaka pri zagonu programa"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s se je nepričakovano zaustavil"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, 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:447
+#: src/bin/e_exec.c:480
 #, fuzzy, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s je bil prekinjen z \"Interrupt\" signalom"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, fuzzy, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s je bil prekinjen s \"Quit\" signalom"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, fuzzy, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s je bil prekinjen z \"Abort\" signalom"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, 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:461
+#: src/bin/e_exec.c:494
 #, 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:465
+#: src/bin/e_exec.c:498
 #, 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:469
+#: src/bin/e_exec.c:502
 #, 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:472
+#: src/bin/e_exec.c:505
 #, fuzzy, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s je bil prekinjen s \"Termination\" signalom"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, 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:479
+#: src/bin/e_exec.c:512
 #, 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:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Zapisniki Napak"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Ni bilo poročila o napaki"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Shrani to sporočilo"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Informacija o napaki"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Informacija o napaki signala"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Izhodni podatki"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Ni bilo izhodnih podatkov"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr ""
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "Napaka pri zagonu"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Napaka pri zagonu"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "Napaka"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, fuzzy, c-format
 msgid "%i Files"
 msgstr "%1.0f files"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 #, fuzzy
 msgid "Link"
 msgstr "Linearno"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 #, fuzzy
 msgid "Abort"
 msgstr "O"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "Namestitev izbire"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 #, fuzzy
 msgid "View Mode"
 msgstr "Urejevalni Način"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 #, fuzzy
 msgid "Refresh View"
 msgstr "Stopnja osveževanja"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr ""
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 #, fuzzy
 msgid "Remember Ordering"
 msgstr "Zapomni si uporabo"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr ""
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 #, fuzzy
 msgid "New Directory"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "Meni"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 #, fuzzy
 msgid "Use default"
 msgstr "Privzeto Namizje"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 #, fuzzy
 msgid "Grid Icons"
 msgstr "Informacije o Datoteki:"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 #, fuzzy
 msgid "Custom Icons"
 msgstr "Avtomatsko prilagodi ikone"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 #, fuzzy
 msgid "List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "Velikost ikon"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "Nastavi Ozadje za"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Nastavitve"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 #, fuzzy
 msgid "Clear"
 msgstr "Blizu"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr ""
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 #, fuzzy
 msgid "New Directory Name:"
 msgstr "Mapa"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, fuzzy, c-format
 msgid "Rename %s to:"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 #, fuzzy
 msgid "Rename File"
 msgstr "Preimenuj"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Napaka"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "Zaganjam %s"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Ste prepričani, da hočete pobrisati <br><b>%s</b> ?"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 #, fuzzy
 msgid "Confirm Delete"
 msgstr "Potrdi"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, 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:9303
+#: src/bin/e_fm.c:9266
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1441,153 +1440,157 @@ msgstr "Ste prepričani, da hočete pobrisati <br><b>%s</b> ?"
 msgid "File Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 #, fuzzy
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 #, fuzzy
 msgid "Last Modified:"
 msgstr "Zadnja sprememba:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 #, fuzzy
 msgid "File Type:"
 msgstr "Datoteka:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 #, fuzzy
 msgid "Permissions"
 msgstr "Dovoljenja:"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Lastnik:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 #, fuzzy
 msgid "Default"
 msgstr "Privzeto Namizje"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 #, fuzzy
 msgid "Custom"
 msgstr "Odreži"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 #, fuzzy
 msgid "Link Information"
 msgstr "Informacija o napaki"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 #, fuzzy
 msgid "Select an Image"
 msgstr "Izberi okno"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "Neznan"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 #, fuzzy
 msgid "Inset"
 msgstr "Ikone"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1597,7 +1600,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Zaklepi Oken"
 
@@ -1631,21 +1634,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Razvrščanje"
 
@@ -1654,12 +1657,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Zasenčenost"
 
@@ -1668,7 +1671,7 @@ msgid "Maximized state"
 msgstr "Maksimirano stanje"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Celozaslonsko stanje"
 
@@ -1676,7 +1679,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:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Stil Okvirjev"
 
@@ -1727,125 +1730,126 @@ msgstr "Pošlji na namizje"
 msgid "More..."
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimiraj"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 #, fuzzy
 msgid "Maximize vertically"
 msgstr "Maksimirano po vertikali"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 #, fuzzy
 msgid "Maximize horizontally"
 msgstr "Maksimirano po horizontali"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 #, fuzzy
 msgid "Unmaximize"
 msgstr "Maksimiraj"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 #, fuzzy
 msgid "To Favorites Menu"
 msgstr "Prikaži Ime v Meniju"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Okvir"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 #, fuzzy
 msgid "Window Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Vedno na vrhu"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Vedno spodaj"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 #, fuzzy
 msgid "Select Border Style"
 msgstr "Stil Okvirjev"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 #, fuzzy
 msgid "Use Application Provided Icon "
 msgstr "Uporabi privzeto programsko ikono"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 #, fuzzy
 msgid "Use User Defined Icon"
 msgstr "Ustvari ikono"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Zasenči"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Prilepi"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Celozaslonsko"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 #, fuzzy
 msgid "Window List"
 msgstr "Seznam Oken"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 #, fuzzy
 msgid "Pager"
 msgstr "Nevarno"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1862,7 +1866,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "Lastnosti"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Naslov"
 
@@ -1968,11 +1972,11 @@ msgstr "Lastnosti"
 msgid "Modal"
 msgstr "Moduli"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 #, fuzzy
 msgid "Skip Pager"
 msgstr "Nevarno"
@@ -1981,15 +1985,15 @@ msgstr "Nevarno"
 msgid "Hidden"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Zapomni si lasnosti Okna"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Lastnosti Okna se ne ujemajo popolno"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -2012,11 +2016,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:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Ni ujemajočih se lastnosti"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -2028,116 +2032,107 @@ 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:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Od Enlightenment zahtevate naj si zapomni<br>lastnosti (kot so velikost, "
-"lokacija, stil okvirjev, itd.) Okna<br>ki <hilight>nima edinstvenih "
-"lastnosti</hilight>.<br><br>To pomeni, da si deli Ime/Razred, Prehodnost, "
-"Vlogo, itd.<br>z enim ali več oken na zaslonu. Če si Enlightenment zapomni "
-"te lastnosti, bodo te lastnosti veljale za vsa Okna, ki si le-te delijo."
-"<br><br>Mogoče bi radi vklopili opcijo <hilight>Zapomni si le eno Okno</"
-"hilight>, če<br>bi radi spremenili lastnosti le enega okna medtem,<br>ko bi "
-"ostala okna ostala nespremenjena.<br><br>To je le opozorilo, če slučajno "
-"tega niste hoteli.<br>ÄŒe ste to hoteli preprosto pritisnite gumb "
-"<hilight>Uporabi</hilight> ali <hilight>V Redu</hilight><br>in vaše "
-"nastavitve bodo potrjene. V nasprotnem primeru pritisnite gumb "
-"<hilight>Pozabi</hilight>."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Nič"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Velikost in Lokacija"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Zaklepi"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Velikost, Lokacija in Zaklepi"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Zapomni si uporabo"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Ime in Razred Okna"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Ime Okna"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Razred Okna"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Vloga Okna"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Tip Okna"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Prehodnost"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Zapomni si Lastnosti"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Navidezno Namizje"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 #, fuzzy
 msgid "Current Screen"
 msgstr "Zaslonsko Območje"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Preskoči seznam oken"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Napaka pri pogonu programa"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Zapomni si le eno Okno"
 
-#: src/bin/e_int_border_remember.c:546
+#: src/bin/e_int_border_remember.c:756
+msgid "Always focus on start"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Lastnosti"
+
+#: src/bin/e_int_border_remember.c:766
 #, fuzzy
 msgid "Start this program on login"
 msgstr "Obnovi ločljivost pri vstopu v sistem"
 
-#: src/bin/e_int_border_remember.c:550
-msgid "Always focus on start"
-msgstr ""
-
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 #, fuzzy
 msgid "Settings"
@@ -2158,28 +2153,28 @@ msgstr ""
 msgid "Module Settings"
 msgstr "Nastavitve Modulov"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 #, fuzzy
 msgid "Available Modules"
 msgstr "Priljubljeni programi"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 #, fuzzy
 msgid "Load Module"
 msgstr "(Ni naloženih modulov)"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 #, fuzzy
 msgid "Loaded Modules"
 msgstr "(Ni naloženih modulov)"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 #, fuzzy
 msgid "Unload Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2218,8 +2213,8 @@ msgstr "Pripomočki"
 msgid "Toolbar Settings"
 msgstr "Nastavitve Ovijanja"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr ""
 
@@ -2247,13 +2242,13 @@ msgid "Favorite Applications"
 msgstr "Priljubljeni programi"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 #, fuzzy
 msgid "Applications"
 msgstr "(Ni Programov)"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2262,7 +2257,7 @@ msgstr "(Ni Programov)"
 msgid "Windows"
 msgstr "Okna"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Izgubljena Okna"
 
@@ -2301,140 +2296,139 @@ msgstr "(Ni Programov)"
 msgid "Set Virtual Desktops"
 msgstr "Navidezno Namizje"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Ni Oken)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Ni Imena!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 #, fuzzy
 msgid "Delete A Shelf"
 msgstr "Izbriši"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 #, fuzzy
 msgid "Shelf Settings"
 msgstr "Nastavitev velikosti"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Srednje"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Nastavitve"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 #, fuzzy
 msgid "Above Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 #, fuzzy
 msgid "Below Windows"
 msgstr "(Ni Oken)"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 #, fuzzy
 msgid "Below Everything"
 msgstr "Vse"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 #, fuzzy
 msgid "Allow windows to overlap the shelf"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pikslov"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 #, fuzzy
 msgid "Auto Hide"
 msgstr "Avtomatsko privzdigovanje"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 #, fuzzy
 msgid "Show on mouse in"
 msgstr "prikazi na zaslonski coni :"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, fuzzy, c-format
 msgid "%.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 #, fuzzy
 msgid "Hide duration"
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 #, fuzzy
 msgid "Show on all Desktops"
 msgstr "Prikaži ime namizja"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 #, fuzzy
 msgid "Show on specified Desktops"
 msgstr "Prikaži ime namizja"
@@ -2668,7 +2662,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment ne more nastaviti internacionalizacijskega sistema."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2676,11 +2670,11 @@ msgstr ""
 "Enlightenment ne more nastaviti zagonskega okna.\n"
 "Ste mogoče ostali brez spomina?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2688,7 +2682,7 @@ msgstr ""
 "Enlightenment je ugotovil, da Evas ne more ustvariti Buffer Canvas.\n"
 "Prepričajte se, da Evas podpira Software Buffer pogon.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2696,7 +2690,7 @@ msgstr ""
 "Enlightenment je ugotovil, da Evas ne more odpirati PNG datotek.\n"
 "Prepričajte se, da Evas podpira PNG vtič.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2704,7 +2698,7 @@ msgstr ""
 "Enlightenment je ugotovil, da Evas ne more odpirati JPEG datotek.\n"
 "Prepričajte se, da Evas podpira JPEG vtič.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2712,7 +2706,7 @@ msgstr ""
 "Enlightenment je ugotovil, da Evas ne more odpirati EET datotek.\n"
 "Prepričajte se, da Evas podpira EET vtič.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
@@ -2722,12 +2716,12 @@ msgstr ""
 "Enlightenment je ugotovil, da Evas ne more odpirati PNG datotek.\n"
 "Prepričajte se, da Evas podpira PNG vtič.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 #, fuzzy
 msgid "Setup Screens"
 msgstr "Zaslonsko Območje"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2736,214 +2730,214 @@ msgstr ""
 "vašega sistema in pri tem klavrno propadel. Mogoče uporabljate drug\n"
 "upravljalnik z okni?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 #, fuzzy
 msgid "Setup Screensaver"
 msgstr "Zaslonsko Območje"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 #, fuzzy
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 #, fuzzy
 msgid "Setup Desklock"
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment ne more nastaviti svojega sistema zaklepanja namizja."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 #, fuzzy
 msgid "Setting up Paths"
 msgstr "Nastavitve Fokusa"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 #, fuzzy
 msgid "Setup System Controls"
 msgstr "Nastavi nadzornika"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 #, fuzzy
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment ne more zagnati sistema za pomanjševanje slik.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 #, fuzzy
 msgid "Setup Actions"
 msgstr "Priljubljeni programi"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment ne more nastaviti svojega sistema akcij."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr ""
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 #, fuzzy
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment ne more nastaviti svojega exebuf sistema."
 
-#: src/bin/e_main.c:816
-#, fuzzy
-msgid "Setup Remembers"
-msgstr "Zapomni si"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment ne more nastaviti shranjevanja nastavitev."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment ne more zagnati upravitelja datotek.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment ne more nastaviti sistema sporočil."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment ne more nastaviti svojega sistema dnd."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment ne more nastaviti svojega sistema za delo z vnosi."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 #, fuzzy
 msgid "Setup Modules"
 msgstr "Moduli"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment ne more nastaviti modularnega sistema."
 
+#: src/bin/e_main.c:884
+#, fuzzy
+msgid "Setup Remembers"
+msgstr "Zapomni si"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment ne more nastaviti shranjevanja nastavitev."
+
+#: src/bin/e_main.c:894
 #, fuzzy
 msgid "Setup Color Classes"
 msgstr "Razred Ikone"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment ne more nastaviti svojega sistema barvnih razredov."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 #, fuzzy
 msgid "Setup Gadcon"
 msgstr "Poženi ukaz"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr ""
 "Enlightenment ne more nastaviti svojega sistema upravljanja s pripomočki."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 #, fuzzy
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment ne more nastaviti shranjevanja nastavitev."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 #, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment ne more nastaviti svojega Popup sistema."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 #, fuzzy
 msgid "Setup Wallpaper"
 msgstr "Preskok na namizje z miško"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 #, fuzzy
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment ne more nastaviti svojega sistema zaklepanja namizja."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 #, fuzzy
 msgid "Setup Mouse"
 msgstr "Izbriši"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment ne more nastaviti shranjevanja nastavitev."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 #, fuzzy
 msgid "Setup Bindings"
 msgstr "Naveze tipk"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment ne more nastaviti svojega sistema povezav."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 #, fuzzy
 msgid "Setup Popups"
 msgstr "Prikaži popup"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment ne more nastaviti svojega Popup sistema."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment ne more nastaviti svojega sistema razporejanja."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment ne more zagnati sistema za pomanjševanje slik.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 #, fuzzy
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment ne more nastaviti modularnega sistema."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 #, fuzzy
 msgid "Load Modules"
 msgstr "(Ni naloženih modulov)"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2951,11 +2945,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr ""
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2963,16 +2957,16 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 #, fuzzy
 msgid "Configure Shelves"
 msgstr "Nastavitve"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr ""
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2981,11 +2975,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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Napaka pri nalaganju modula"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2994,11 +2988,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:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modul ne vsebuje vseh potrebnih funkcij."
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -3008,12 +3002,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:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Bi radi razbremenili ta modul?<br>"
 
@@ -3024,12 +3018,12 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 #, fuzzy
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ste prepričani, da hočete pobrisati <br><b>%s</b> ?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 #, fuzzy
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
@@ -3037,20 +3031,20 @@ msgid ""
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr ""
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Nastavi nadzornika"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr ""
 
@@ -3068,132 +3062,132 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 #, fuzzy
 msgid "Logout now"
 msgstr "Izgubljena Okna"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 #, fuzzy
 msgid "Cancel Logout"
 msgstr "Pozabi"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr ""
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Neuspešno brisanje <br><b>%s</b>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 #, fuzzy
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment ne more nastaviti tematskega sistema."
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid "Reset failed."
 msgstr "Desktop"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid "Suspend failed."
 msgstr "Pošlji na namizje"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Neuspešno brisanje <br><b>%s</b>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 #, fuzzy
 msgid "Resetting"
 msgstr "Nastavitve Namizij"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Neuspešno brisanje <br><b>%s</b>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Neuspešno brisanje <br><b>%s</b>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 #, fuzzy
 msgid "Hibernating"
 msgstr "Brez Mehčanja"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -3212,11 +3206,11 @@ msgstr "O tej temi"
 msgid "Set Toolbar Contents"
 msgstr "Nastavitve"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Izhod nemogoč - nesmrtno okno"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3226,77 +3220,77 @@ msgstr ""
 "da izhod iz Enlightenment ne bo mogoč, dekler se ta<br>okna ne zaprejo "
 "oziroma se jim ne odstrani zaklep.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, fuzzy, c-format
 msgid "%'.0f Bytes"
 msgstr "%1.0f minut"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, fuzzy, c-format
 msgid "%'.0f KB"
 msgstr "%1.0f MB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, fuzzy, c-format
 msgid "%'.0f MB"
 msgstr "%1.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, fuzzy, c-format
 msgid "%'.1f GB"
 msgstr "%1.1f MB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr ""
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr ""
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr ""
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr ""
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr ""
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr ""
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Neznan"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3317,53 +3311,53 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 #, fuzzy
 msgid "Go up a Directory"
 msgstr "Mapa"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Dovoljenja:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 #, fuzzy
 msgid "Modified:"
 msgstr "Zadnja sprememba:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, fuzzy, c-format
 msgid "Protected"
 msgstr "Lastnosti"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, fuzzy, c-format
 msgid "Read Only"
 msgstr "Ime"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -3380,62 +3374,62 @@ msgstr "Osnovne nastavitve"
 msgid "Show alert when battery is low"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 #, fuzzy
 msgid "Check every:"
 msgstr "Preveri baterijo vsake:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f files"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 #, fuzzy
 msgid "Show alert on low battery"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 #, fuzzy
 msgid "Alert when at:"
 msgstr "Prikaži obvestilo ko je baterije še za:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f minut"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, fuzzy, c-format
 msgid "%1.0f %%"
 msgstr "%3.0f"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f sek"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 #, fuzzy
 msgid "Alert"
 msgstr "Pospeši"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 #, fuzzy
 msgid "Auto Detect"
 msgstr "Prilagodi"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3444,13 +3438,13 @@ msgstr "Prilagodi"
 msgid "Internal"
 msgstr "Pod oknom"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3458,25 +3452,25 @@ msgstr ""
 msgid "Battery"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "Prikaži obvestilo ob prazni bateriji"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 #, fuzzy
 msgid "Battery Meter"
 msgstr "Preveri baterijo vsake:"
@@ -3486,22 +3480,22 @@ msgstr "Preveri baterijo vsake:"
 msgid "Clock"
 msgstr "Zaklepi"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 #, fuzzy
 msgid "Settings Panel"
 msgstr "Nastavitve Namizij"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "Nastavitve Namizij"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "Moduli"
@@ -3532,7 +3526,7 @@ msgid "Restart Applications"
 msgstr "Priljubljeni programi"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 #, fuzzy
 msgid "All Applications"
 msgstr "(Ni Programov)"
@@ -3558,13 +3552,13 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 #, fuzzy
 msgid "Menus"
 msgstr "Meni"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 #, fuzzy
 msgid "Default Border Style"
 msgstr "Stil Okvirjev"
@@ -3573,14 +3567,14 @@ msgstr "Stil Okvirjev"
 msgid "Window Border Selection"
 msgstr "Izbira Okenskih Okvirjev"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Zapomni si Okvire tega Okna za naslednjič"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3609,7 +3603,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3901,9 +3895,9 @@ msgid "Desktop Name"
 msgstr "Desktop"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 #, fuzzy
 msgid "Name:"
 msgstr "Po imenu"
@@ -3977,10 +3971,10 @@ msgstr "%1.0f minut"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 #, fuzzy
 msgid "Personal"
@@ -4016,8 +4010,8 @@ msgstr "prikazi na zaslonski coni :"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -4149,50 +4143,55 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Navidezno Namizje"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 #, fuzzy
 msgid "Dialog Settings"
 msgstr "Nastavitve Pogovornega Okna"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Splošne nastavitve"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 #, fuzzy
 msgid "Disable Confirmation Dialogs"
 msgstr "Nastavitvena plošča"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 #, fuzzy
 msgid "Normal Windows"
 msgstr "(Ni Oken)"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 #, fuzzy
 msgid "Default Settings Dialogs Mode"
 msgstr "Privzet način pogovornega okna"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Osnovni način"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Napredni način"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Privzet način pogovornega okna"
 
@@ -4263,33 +4262,33 @@ msgstr "Upor"
 msgid "Screen Resolution Settings"
 msgstr "Ločljivost"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Ločljivost"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 #, fuzzy
 msgid "Restore on login"
 msgstr "Obnovi ločljivost pri vstopu v sistem"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 #, fuzzy
 msgid "Rotation"
 msgstr "Ločljivost"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -4298,11 +4297,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4361,7 +4360,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4371,87 +4370,92 @@ msgstr "<Nič>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Binding Settings"
 msgstr "Nastavitve vezave tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "Naveze tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 #, fuzzy
 msgid "Add Edge"
 msgstr "Pripomočki"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 #, fuzzy
 msgid "Delete Edge"
 msgstr "Izbriši"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 #, fuzzy
 msgid "Modify Edge"
 msgstr "Naveza tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 #, fuzzy
 msgid "Delete All"
 msgstr "Izbriši"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 #, fuzzy
 msgid "Restore Default Bindings"
 msgstr "Izbriši navezo tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Dejanje"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 #, fuzzy
 msgid "Action Params"
 msgstr "Parametri"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 #, fuzzy
 msgid "General Options"
 msgstr "Splošne nastavitve"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "Zaporedje naveze tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.1f sekund"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "Napaka naveze tipk"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4460,27 +4464,27 @@ msgstr ""
 "Zaporedje tipk, ki ste ga izbrali, je že v uporabi.<br>Izberite si novo "
 "zaporedje."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4798,20 +4802,19 @@ msgstr ""
 msgid "%d pixels"
 msgstr "%1.0f pikslov"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 #, fuzzy
 msgid "Enable Custom Font Classes"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4820,39 +4823,53 @@ msgstr ""
 msgid "Font Classes"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr ""
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Ikone"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Naslov"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 #, fuzzy
 msgid "Hinting"
 msgstr "Brez Mehčanja"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 #, fuzzy
 msgid "Bytecode"
 msgstr "\"Bytecode\" Mehčanje"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Avtomatsko"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4869,7 +4886,7 @@ msgstr "Ikone"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 #, fuzzy
 msgid "Icon Theme"
 msgstr "Velikost ikon"
@@ -4950,7 +4967,7 @@ msgid ""
 msgstr "Enlightenment ni uspel odcepiti hčerinskega procesa:<br><br>%s<br>"
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 #, fuzzy
 msgid "Language"
 msgstr "Upravitelj"
@@ -5137,7 +5154,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Meje Kazalca Avtomatskega Drsenja"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Različne Nastavitve"
 
@@ -5332,28 +5349,28 @@ msgstr "Velikost kazalca"
 msgid "Mouse Cursor"
 msgstr "Uporabi X kazalec"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 #, fuzzy
 msgid "Mouse Settings"
 msgstr "Nastavitve Modulov"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 #, fuzzy
 msgid "Mouse Hand"
 msgstr "Naveze tipk"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 #, fuzzy
 msgid "Mouse Acceleration"
 msgstr "Dejanja Modula"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 #, fuzzy
 msgid "Acceleration"
 msgstr "Pospeši"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -5372,7 +5389,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:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr ""
 
@@ -5477,39 +5494,39 @@ msgstr "%1.0f zbirk"
 msgid "Performance"
 msgstr "Nastavitve Zmogljivosti"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 #, fuzzy
 msgid "Profile Selector"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 #, fuzzy
 msgid "Available Profiles"
 msgstr "Lastnosti"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "Izberi okno"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 #, fuzzy
 msgid "Reset"
 msgstr "Upor"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, fuzzy, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 "Zahtevali ste izhod iz Enlightenment.<br><br>Ste prepričani, da bi to radi?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 #, fuzzy
 msgid "Delete OK?"
 msgstr "Izbriši"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr ""
 
@@ -5691,24 +5708,24 @@ msgstr "Ostro"
 msgid "Theme Selector"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 #, fuzzy
 msgid "Theme Categories"
 msgstr "Tematski izbirnik"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 #, fuzzy
 msgid "Clear All"
 msgstr "Izbriši"
@@ -5768,38 +5785,38 @@ msgid "Wallpaper Settings"
 msgstr "Nastavitve Ovijanja"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Vsa Namizja"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "To Namizje"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 #, fuzzy
 msgid "This Screen"
 msgstr "Zakleni zaslon"
@@ -5822,15 +5839,15 @@ msgid "Fill Options"
 msgstr "Opcije"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 #, fuzzy
 msgid "Horizontal"
 msgstr "Centriraj horizontalno"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 #, fuzzy
 msgid "Vertical"
 msgstr "Centriraj vertikalno"
@@ -5904,15 +5921,15 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr "%3.0f"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 #, fuzzy
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
@@ -5920,15 +5937,15 @@ 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:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 #, fuzzy
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
@@ -5936,14 +5953,14 @@ 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 #, fuzzy
 msgid "Exchange wallpapers"
 msgstr "Tematski izbirnik"
@@ -6058,15 +6075,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr "Uporabi privzeto programsko ikono"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-#, fuzzy
-msgid "Internal Windows"
-msgstr "(Ni Oken)"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Nastavitve Fokusa"
@@ -6204,17 +6212,12 @@ msgid "Window Maximize Policy"
 msgstr "Taktika Maksimiranja"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Pametno razširjanje"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Razširi Okno"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Zapolni prostor, ki je na voljo"
 
@@ -6222,21 +6225,20 @@ msgstr "Zapolni prostor, ki je na voljo"
 msgid "Maximize Policy"
 msgstr "Taktika Maksimiranja"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 #, fuzzy
 msgid "Maximize Directions"
 msgstr "Maksimirano po horizontali"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-#, fuzzy
-msgid "Allow window manipulation"
-msgstr "Rokovanje z Okni"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 #, fuzzy
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Avtomatsko privzdigni Okno pri prehodu s kazalcem"
@@ -6280,58 +6282,67 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr "Fokus na Klik"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: 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:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Zapomni si te zaklepe"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 #, fuzzy
 msgid "Delete Remember(s)"
 msgstr "Zapomni si"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 #, fuzzy
 msgid "Details"
 msgstr "Privzeto Namizje"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 #, fuzzy
 msgid "<No Name>"
 msgstr "Velikost ikon"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 #, fuzzy
 msgid "Class:"
 msgstr "Celzij"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 #, fuzzy
 msgid "<No Class>"
 msgstr "Razred Ikone"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 #, fuzzy
 msgid "Title:"
 msgstr "Naslov"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 #, fuzzy
 msgid "<No Title>"
 msgstr "Naslov"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 #, fuzzy
 msgid "Role:"
 msgstr "Datoteka:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 #, fuzzy
 msgid "<No Role>"
 msgstr "<Nič>"
@@ -6724,7 +6735,7 @@ msgid "Show Toolbar"
 msgstr "Prikaži sledilnik"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6741,99 +6752,99 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 #, fuzzy
 msgid "Specific Applications"
 msgstr "(Ni Programov)"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 #, fuzzy
 msgid "Custom Command"
 msgstr "Poženi ukaz"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Izbriši"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Desktop"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6860,17 +6871,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "Brez Mehčanja"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Preizkusi upravljalnika z datotekami"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6916,21 +6927,21 @@ msgstr "Nastavitve Ozadij"
 msgid "Gadgets"
 msgstr "Pripomočki"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 #, fuzzy
 msgid "Free"
 msgstr "Daleč"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 #, fuzzy
 msgid "Always on desktop"
 msgstr "Vedno na vrhu"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 #, fuzzy
 msgid "Add other gadgets"
 msgstr "Pripomočki"
@@ -6974,7 +6985,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr "Razred Ikone"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr ""
 
@@ -7043,52 +7054,52 @@ msgstr "Ustvari ikono"
 msgid "Add Application"
 msgstr "(Ni Programov)"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 #, fuzzy
 msgid "IBox Settings"
 msgstr "Nastavitve vstopnega okenca"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 #, fuzzy
 msgid "Display Name"
 msgstr "Prikaz"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 #, fuzzy
 msgid "Display Title"
 msgstr "Prikaži enote"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 #, fuzzy
 msgid "Display Class"
 msgstr "Prikaz"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 #, fuzzy
 msgid "Display Icon Name"
 msgstr "Prikaži enote"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 #, fuzzy
 msgid "Display Border Caption"
 msgstr "Podatki prikazovanja"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 #, fuzzy
 msgid "Show windows from all screens"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 #, fuzzy
 msgid "Show windows from current screen"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 #, fuzzy
 msgid "Show windows from all desktops"
 msgstr "Prikaži okna na drugih namizjih"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 #, fuzzy
 msgid "Show windows from active desktop"
 msgstr "Prikaži okna na drugih namizjih"
@@ -7112,12 +7123,12 @@ msgstr "Preskoči na naslednje namizje ko se kazalec dotakne roba zaslona"
 msgid "Show desktop names"
 msgstr "Prikaži ime namizja"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 #, fuzzy
 msgid "Popup Settings"
 msgstr "Nastavitev Popup"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "Prikaži minimirana okna"
@@ -7127,77 +7138,77 @@ msgstr "Prikaži minimirana okna"
 msgid "Show popup for urgent windows"
 msgstr "Prikaži minimirana okna"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 #, fuzzy
 msgid "Select and Slide button"
 msgstr "Izberi okno"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, fuzzy, c-format
 msgid "Click to set"
 msgstr "Fokus na Klik"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "Navidezno Namizje"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, fuzzy, c-format
 msgid "%.0f px"
 msgstr "%1.0f fps"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 #, fuzzy
 msgid "Resistance to dragging"
 msgstr "Upor med Okni:"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 #, fuzzy
 msgid "Popup pager height"
 msgstr "Hitrost popup-a"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 #, fuzzy
 msgid "Popup speed"
 msgstr "Hitrost popup-a"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekund"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "Nastavitve Seznama Oken"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "Prikaži minimirana okna"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 #, fuzzy
 msgid "Popup on urgent window sticks on the screen"
 msgstr "Prikaži okna na drugih zaslonih"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 #, fuzzy
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
@@ -7206,45 +7217,45 @@ msgstr ""
 "Pritisnite željeno zaporedje tipk,<br>ali <hilight>Izhod</hilight> za "
 "opustitev"
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 #, fuzzy
 msgid "Attetion"
 msgstr "Dejanje"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, fuzzy, c-format
 msgid "Button %i"
 msgstr "Spodaj"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "Nastavitev Popup"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "Vsa Namizja"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "To Namizje"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "Vsa Namizja"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "To Namizje"
@@ -7373,7 +7384,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 #, fuzzy
 msgid "Temperature"
 msgstr "Nizka temperatura"
@@ -7387,17 +7398,17 @@ msgstr ""
 msgid "Welcome to Enlightenment"
 msgstr "O Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 #, fuzzy
 msgid "Select one"
 msgstr "Izberi okno"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Profile"
 msgstr "Lastnosti"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7452,16 +7463,16 @@ msgstr "Fokus na Klik"
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 #, fuzzy
 msgid "Select Icons to Add"
 msgstr "Izberi okno"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 #, fuzzy
 msgid "Select Applications"
 msgstr "(Ni Programov)"
@@ -7602,18 +7613,60 @@ msgstr "(Ni Programov)"
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr ""
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Od Enlightenment zahtevate naj si zapomni<br>lastnosti (kot so velikost, "
+#~ "lokacija, stil okvirjev, itd.) Okna<br>ki <hilight>nima edinstvenih "
+#~ "lastnosti</hilight>.<br><br>To pomeni, da si deli Ime/Razred, Prehodnost, "
+#~ "Vlogo, itd.<br>z enim ali več oken na zaslonu. Če si Enlightenment "
+#~ "zapomni te lastnosti, bodo te lastnosti veljale za vsa Okna, ki si le-te "
+#~ "delijo.<br><br>Mogoče bi radi vklopili opcijo <hilight>Zapomni si le eno "
+#~ "Okno</hilight>, če<br>bi radi spremenili lastnosti le enega okna medtem,"
+#~ "<br>ko bi ostala okna ostala nespremenjena.<br><br>To je le opozorilo, če "
+#~ "slučajno tega niste hoteli.<br>Če ste to hoteli preprosto pritisnite gumb "
+#~ "<hilight>Uporabi</hilight> ali <hilight>V Redu</hilight><br>in vaše "
+#~ "nastavitve bodo potrjene. V nasprotnem primeru pritisnite gumb "
+#~ "<hilight>Pozabi</hilight>."
+
+#~ msgid "Window name and class"
+#~ msgstr "Ime in Razred Okna"
+
+#, fuzzy
+#~ msgid "Internal Windows"
+#~ msgstr "(Ni Oken)"
+
+#~ msgid "Expand the window"
+#~ msgstr "Razširi Okno"
+
+#, fuzzy
+#~ msgid "Allow window manipulation"
+#~ msgstr "Rokovanje z Okni"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "Naslov"
@@ -8455,9 +8508,6 @@ msgstr ""
 #~ msgid "Window"
 #~ msgstr "Okno"
 
-#~ msgid "Window Name"
-#~ msgstr "Ime Okna"
-
 #~ msgid "Window Title"
 #~ msgstr "Naslov Okna"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 1ff4cc5..a7a8e50 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 66d1e0c..b90ba06 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment E17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-03-08 02:01+0000\n"
 "Last-Translator: ersi <Unknown>\n"
 "Language-Team: Swedish\n"
@@ -19,28 +19,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Om Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Stäng"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -69,568 +69,568 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Är du säker på att du vill döda det här fönstret?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Ja"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Nej"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Är du säker på att du vill avsluta?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Du har valt att avsluta Enlightenment.<br><br>Är du säker på att du vill "
 "avsluta?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Vill du verkligen logga ut?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Är du säker på att du vill stänga av?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr ""
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Är du säker på att du vill starta om?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr ""
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Är du säker att du vill försätta datorn i viloläge?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Fönster : Händelser"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Flytta"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Ändra storlek"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Meny"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Fönstermeny"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Höj"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Sänk"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Döda"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Fönster : Tillstånd"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Gör klibbig"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Minimera"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Aktivera helskärmsläge"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Maximera vertikalt"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Maximera horisontalt"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Maximera helskärm"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Maximeringspolicy \"Smart\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Maximeringspolicy \"Expandera\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Maximeringspolicy \"Fyll\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Gör ramlös"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr ""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Vänd skrivbord åt vänster"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Vänd skrivbord åt höger"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Vänd skrivbord uppåt"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Vänd skrivbord nedåt"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Vänd skrivbord med..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Visa skrivbordet"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Visa hyllan"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Vänd skrivbord till..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Vänd skrivbord linjärt..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Byt till skrivbord 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Byt till skrivbord 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Byt till skrivbord 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Byt till skrivbord 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Byt till skrivbord 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Byt till skrivbord 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Byt till skrivbord 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Byt till skrivbord 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Byt till skrivbord 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Byt till skrivbord 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Byt till skrivbord 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Byt till skrivbord 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Byt till skrivbord..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Vänd skrivbord vänster (Alla skärmar)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Vänd skrivbord höger (Alla skärmar)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Vänd skrivbord uppåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Vänd skrivbord nedåt (Alla skärmar)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr ""
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Vänd skrivbord till... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Vänd skrivbort linjärt... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr ""
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Byt till skrivbord 0 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Byt till skrivbord 1 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Byt till skrivbord 2 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Byt till skrivbord 3 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Byt till skrivbord 4 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Byt till skrivbord 5 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Byt till skrivbord 6 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Byt till skrivbord 7 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Byt till skrivbord 8 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Byt till skrivbord 9 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Byt till skrivbord 10 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Byt till skrivbord 11 (Alla skärmar)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Byt till skrivbord... (Alla skärmar)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Skicka musen till skärm 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Skicka musen till skärm 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Skicka musen till skärm..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Skicka musen 1 skärm framåt"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Skicka musen 1 skärm bakåt"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Skicka musen till skärmen framför/bakom..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Fönster : Flytta"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "Till nästa skrivbord"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Till föregående skrivbord"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr ""
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Till skrivbord..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Visa huvudmenyn"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Visa favoritprogramsmenyn"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr ""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "Visa klientmeny"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Visa meny..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Kör"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Kommando"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Applikation"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Avsluta"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Avsluta nu"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "Aktivera helskärmsläge"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "Gör klibbig"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "System"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Logga ut"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Stäng av nu"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Stäng av"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Starta om"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Vänteläge"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Viloläge"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "LÃ¥s"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Städa upp fönster"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr ""
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr ""
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Sätt som bakgrund"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr ""
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr ""
 
@@ -638,41 +638,40 @@ msgstr ""
 msgid "Color Selector"
 msgstr "Färgväljare"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "OK"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -683,7 +682,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -692,11 +691,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Inställningar uppdaterade"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -704,7 +703,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -714,7 +713,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -723,7 +722,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -732,7 +731,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -740,11 +739,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr ""
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -752,12 +751,12 @@ msgstr ""
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Enkelt"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Verkställ"
 
@@ -765,7 +764,7 @@ msgstr "Verkställ"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Moduler"
 
@@ -774,39 +773,39 @@ msgstr "Moduler"
 msgid "Extensions"
 msgstr "Tillbehör"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Behållare %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Fel - Inget PAM-stöd"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Kan inte låsa"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Ange ditt lösenord för att låsa upp"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr ""
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -814,22 +813,22 @@ msgid ""
 "happening. Please report this bug."
 msgstr ""
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -850,7 +849,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr ""
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -895,7 +894,7 @@ msgstr "Kategorier"
 msgid "Mime Types"
 msgstr "Mimetyper"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Inställningar"
 
@@ -927,23 +926,23 @@ msgstr "Välj en ikon"
 msgid "Select an Executable"
 msgstr "Välj en körbar fil"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Klistra in"
 
@@ -951,24 +950,24 @@ msgstr "Klistra in"
 msgid "Select All"
 msgstr "Markera allt"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Körfel"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment kunde inte skapa en underprocess:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Programkörningsfel"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -977,314 +976,314 @@ msgstr ""
 "Enlightenment kunde inte köra programmet:<br><br>%s<br><br>Programmet "
 "startar inte."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Programexekveringsfel"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s stannade oväntat."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr ""
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr ""
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr ""
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr ""
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr ""
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr ""
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr ""
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Felloggar"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Det finns inget felmeddelande."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Spara detta meddelande"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr ""
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Felinformation"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Signalinformation"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Utdata"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Det finns ingen utdata."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr ""
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s existerar inte."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "Körfel"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "Körfel"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "Fel"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i filer"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Länk"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Avbryt"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Ärv förälderinställningar"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Visningsläge"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Uppdatera vy"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Visa dolda filer"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Kom ihåg ordning"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Sortera nu"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Ny katalog"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "Typsnitt"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr ""
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Rutnätsikoner"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr ""
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Lista"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Ikonstorlek (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "Sätt som bakgrund"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "Panelens innehåll"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Rensa"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Skapa ny mapp"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Namn på ny mapp:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "Döp om %s till:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Byt namn"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr ""
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Fel"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Nej till allt"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Ja till allt"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "Startar"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Är du säker på att du vill ta bort<br><hilight>%s</hilight?"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Ignorera"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ignorera alla"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Bekräfta borttagning"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "Är du säker på att du vill ta bort<br><hilight>%s</hilight?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1297,144 +1296,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Filegenskaper"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Fil:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Storlek:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Senast modifierad:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Filtyp:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "Andra kan läsa"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "Andra kan skriva"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Ägaren kan läsa"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Ägaren kan skriva"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Tumnagel"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr ""
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Använd denna ikon för alla filer av denna typ"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Länkinformation"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Välj en bild"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Okänd volym"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Ta bort denna modul"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Enkel"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Infälld"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Utseende"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "Rulla innehåll automatiskt"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Storlek kan ändras"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Ta bort denna modul"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr ""
 
@@ -1444,7 +1448,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Fönsterlås"
 
@@ -1478,21 +1482,21 @@ msgid "Lock program changing:"
 msgstr "Hindra program att ändra:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Storlek"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Stapla"
 
@@ -1501,12 +1505,12 @@ msgid "Iconified state"
 msgstr "Minimerad"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Klibbigt"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Skuggat"
 
@@ -1515,7 +1519,7 @@ msgid "Maximized state"
 msgstr "Maximerat"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Fullskärm"
 
@@ -1523,7 +1527,7 @@ msgstr "Fullskärm"
 msgid "Lock me from changing:"
 msgstr "Hindra mig att ändra:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Ramstil"
 
@@ -1571,115 +1575,116 @@ msgstr ""
 msgid "More..."
 msgstr "Mer..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "Minimera"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Maximerad vertikalt"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Maximerad horisontalt"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Ej Maximerad"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Tangentbordsgenväg"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Ram"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Tillstånd"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Minne"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Fönsteregenskaper"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Alltid överst"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Alltid underst"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr ""
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Skymt"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Klibbig"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Helskärm"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Fönsterlista"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Sökare"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr ""
 
@@ -1695,7 +1700,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Titel"
 
@@ -1787,11 +1792,11 @@ msgstr ""
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr ""
 
@@ -1799,15 +1804,15 @@ msgstr ""
 msgid "Hidden"
 msgstr "Dold"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Fönsterminne"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "Fönsteregenskaperna är inte unika"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1831,11 +1836,11 @@ msgstr ""
 "knapparna<br>och dina inställningar kommer att accepteras. Tryck "
 "<hilight>Avbryt</hilight> om du<br>inte är säker, då kommer inget att ändras."
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "Inga matchande egenskaper satta"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1847,115 +1852,105 @@ msgstr ""
 "specificera hur den ska minnas det</hilight>.<br><br>Du måste specificera "
 "minst ett sätt att minnas detta fönster."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"Du försöker få Enlightenment att minnas att konfigurera<br>egenskaper (så "
-"som storlek, plats, ramstil etc.) på<br>ett fönster <hilight>som inte "
-"harunika egenskaper</hilight>.<br><br>Detta betyder att det delar egenskaper "
-"för Namn/Klass, Transience, Roll etc.<br>med mer är ett annat fönster på "
-"skärmen och minnes<br>egenskaper för detta fönster kommer att alla andra "
-"fönster<br>som matchar dessa egenskaper.<br><br>Du vill kanske aktivera "
-"<hilight>Matcha bara ett fönster</hilight> om<br>du bara vill att "
-"dennainstansen av detta fönster ska ändras, och<br>ytterligare instanser "
-"inte ska beröras.<br><br>Detta är bara en varning föratt bekräfta att detta "
-"var det du ville skulle hända.<br>Om det var, tryck bara på "
-"<hilight>Verkställ</hilight> eller <hilight>OK</hilight> knapparna<br>och "
-"dina inställningar kommer att accepteras. Tryck <hilight>Avbryt</hilight> om "
-"du<br>inte är säker, då kommer inget att ändras."
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Inget"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Storlek och position"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "LÃ¥s"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Storlek, position och lås"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "Allt"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "Minns med hjälp av"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Fönsternamn och klass"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Fönsternamn"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Fönsterklass"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Fönsterroll"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Fönstertyp"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Transience"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Egenskaper att minnas"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Ikonegenskaper"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Virtuellt skrivbord"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Ignorera fönsterlista"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Programkörningsfel"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Matcha bara ett fönster"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Starta programmet vid uppstart"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Ändra ikonegenskaper"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Starta programmet vid uppstart"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Inställningar"
@@ -1974,24 +1969,24 @@ msgstr ""
 msgid "Module Settings"
 msgstr "Moduler"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Tillgängliga moduler"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Ladda modul"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Laddade moduler"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr ""
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2025,8 +2020,8 @@ msgstr "Ta bort"
 msgid "Toolbar Settings"
 msgstr ""
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Placering"
 
@@ -2053,12 +2048,12 @@ msgid "Favorite Applications"
 msgstr "Favoritprogram"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Applikationer"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2067,7 +2062,7 @@ msgstr "Applikationer"
 msgid "Windows"
 msgstr "Fönster"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Förlorade fönster"
 
@@ -2104,130 +2099,129 @@ msgstr "(Inga program)"
 msgid "Set Virtual Desktops"
 msgstr "Virtuella skrivbord"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Inga fönster)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Inget namn!!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr ""
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Panelinställningar"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Små"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Medium"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Stora"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "Panelens innehåll"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Alltid överst"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Under fönster"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Alltid nederst"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "Annpassa storlek efter innehåll"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f pixlar"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Tema"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Dölj automatiskt"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f seconds"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr ""
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Visa på alla skrivbord"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Visa på valda skrivbord"
 
@@ -2434,7 +2428,7 @@ msgstr ""
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kan inte konfigurera sitt intl system."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2442,11 +2436,11 @@ msgstr ""
 "Enlightenment kan inte ställa in init screen!\n"
 "Ditt minne kanske är slut?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2454,7 +2448,7 @@ msgstr ""
 "Enlightenment upptäckte att Evas inte kan skapa buffer canvas. Kontrollera\n"
 "att Evas har Software Buffer enginge support.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2462,7 +2456,7 @@ msgstr ""
 "Enlightenment upptäckte att Evas inte kan ladda PNG filer. Kontrollera\n"
 "att Evas har PNG loader support.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2470,7 +2464,7 @@ msgstr ""
 "Enlightenment upptäckte att Evas inte kan ladda JPEG filer. Kontrollera\n"
 "att Evas har JPEG loader support.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2478,18 +2472,18 @@ msgstr ""
 "Enlightenment upptäckte att Evas inte kan ladda EET filer. Kontrollera\n"
 "att Evas har EET loader support.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr ""
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2497,191 +2491,191 @@ msgstr ""
 "Enlightenment kan inte starta alla skärmarna på ditt system.\n"
 "Kanske en annan fönsterhanterare körs?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr ""
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr ""
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr ""
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment kan inte starta sitt desk locking system."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr ""
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr ""
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr ""
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr ""
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment kan inte starta sitt actions system."
 
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
-
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
+msgid "Setup Execution System"
 msgstr ""
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
+msgid "Enlightenment cannot set up its exec system."
 msgstr ""
 
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment kan inte starta komihåg inställningar."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr ""
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment kan inte starta Filhanteraren.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr ""
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kan inte starta sitt msg system."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr ""
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kan inte starta sitt dnd system."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr ""
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment kan inte starta sitt input grab handling system."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr ""
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment kan inte starta sitt modulsystem"
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr ""
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment kan inte starta komihåg inställningar."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr ""
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment kan inte starta sitt color·class system."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr ""
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment kan inte starta sitt gadget control system."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr ""
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr ""
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr ""
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr ""
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr ""
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr ""
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr ""
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr ""
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr ""
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kan inte starta sitt bindningssystem."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr ""
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment kan inte starta sitt popup system."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment kan inte starta sitt panel system."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr ""
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment kan inte starta Thumbnailing·systemet.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr ""
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr ""
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2689,11 +2683,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment kraschade tidigt vid uppstart och har startats om"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2701,15 +2695,15 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr ""
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Nästan klar"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2718,11 +2712,11 @@ msgstr ""
 "Det blev fel när modulen %s skulle laddas<br>Ingen modul med namnet %s kunde "
 "hittas i<br>sökvägarna för moduler.<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Fel vid öppnandet av modul"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2731,11 +2725,11 @@ msgstr ""
 "Det blev fel när modulen %s skulle laddas.<br>Den fulständiga sökvägen till "
 "denna modul är:<br> %s<br>Felet som rapporterades är:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modulen innehåller inte alla nödvändiga funktioner"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2746,12 +2740,12 @@ msgstr ""
 "%i av modul API<br>Versionen på API som rapporteras av Enlightenment är: %i."
 "<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s modul"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Vill du stänga av denna modulen?<br>"
 
@@ -2762,11 +2756,11 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort denna panelen?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
@@ -2774,20 +2768,20 @@ msgstr ""
 "Du har valt ta bort denna panelen.<br><br>Är du säker på att du vill ta bort "
 "den?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Sluta flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Flytta/ändra storlek på moduler"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "Panelens innehåll"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Ta bort denna panel"
 
@@ -2804,120 +2798,120 @@ msgstr ""
 msgid "System Check Done"
 msgstr ""
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr ""
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Logga ut nu"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr ""
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Avbryt utloggning"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Utloggning pågår"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Utloggning pågår.<br><hilight>Vänligen vänta.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr ""
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr ""
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr ""
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr ""
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr ""
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr ""
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr ""
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr ""
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr ""
 
@@ -2934,11 +2928,11 @@ msgstr ""
 msgid "Set Toolbar Contents"
 msgstr "Panelens innehåll"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Kan inte avsluta - odödliga fönster"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -2948,77 +2942,77 @@ msgstr ""
 "att<br>Enlightenment inte tillåter sig själv att avsluta förrän dessa "
 "fönster<br>är stängda eller livslängdslåset är borttaget.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bytes"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr ""
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr ""
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li år sedan"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li månader sedan"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li veckor sedan"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li dagar sedan"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li timmar sedan"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li minuter sedan"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Okänd"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3038,51 +3032,51 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Ned"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr ""
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "GÃ¥ upp en katalog"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Rättigheter:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "Modifierad:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Du"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "Skyddad"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Endast läsbar"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Förbjuden"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr ""
 
@@ -3098,57 +3092,57 @@ msgstr "Grundinställningar"
 msgid "Show alert when battery is low"
 msgstr "Visa varning vid låg batteri nivå"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Kolla varje:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Visa meddande vid låg batteritid"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Meddela vid:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f min"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sec"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3156,12 +3150,12 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "HÃ¥rdvara"
 
@@ -3169,24 +3163,24 @@ msgstr "HÃ¥rdvara"
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Batterimätare"
 
@@ -3194,21 +3188,21 @@ msgstr "Batterimätare"
 msgid "Clock"
 msgstr "Klocka"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Inställningspanel"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "Interaktion"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr ""
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "Moduler"
@@ -3235,7 +3229,7 @@ msgid "Restart Applications"
 msgstr ""
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr ""
 
@@ -3257,12 +3251,12 @@ msgstr ""
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menyer"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr ""
 
@@ -3270,14 +3264,14 @@ msgstr ""
 msgid "Window Border Selection"
 msgstr "Välj fönsterram"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "Kom ihåg ramen för detta fönster nästa gång det används"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3303,7 +3297,7 @@ msgstr "Gruppera efter"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3572,9 +3566,9 @@ msgid "Desktop Name"
 msgstr ""
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr ""
 
@@ -3642,10 +3636,10 @@ msgstr "%1.0f minuter"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "Personlig"
@@ -3677,8 +3671,8 @@ msgstr "Visa på skärmområde #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3801,46 +3795,51 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "Virtuella skrivbord"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Allmänt"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Enkelt"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "Avancerat"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Standardläge för dialoger"
 
@@ -3896,31 +3895,31 @@ msgstr ""
 msgid "Screen Resolution Settings"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Återställ vid inloggning"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotation"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "Spegla"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3929,11 +3928,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3988,7 +3987,7 @@ msgid "Power Management"
 msgstr ""
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3998,102 +3997,107 @@ msgstr "<Ingen>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Ta bort alla"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Händelse"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4389,18 +4393,17 @@ msgstr "Väldigt stor"
 msgid "%d pixels"
 msgstr "%d pixelar"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr ""
 
@@ -4408,37 +4411,51 @@ msgstr ""
 msgid "Font Classes"
 msgstr "Fontklasser"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Aktivera fontklass"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Typsnitt"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Tema"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4453,7 +4470,7 @@ msgstr "Ikontema"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Ikon tema"
 
@@ -4521,7 +4538,7 @@ msgid ""
 msgstr ""
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Språk"
 
@@ -4691,7 +4708,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "Muspekar marginal för Rulla automatiskt"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Övriga inställningar"
 
@@ -4867,24 +4884,24 @@ msgstr "Storlek på muspekare"
 msgid "Mouse Cursor"
 msgstr "Muspekare"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr ""
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Acceleration"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr ""
 
@@ -4901,7 +4918,7 @@ msgid "Images"
 msgstr "Bilder"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Teman"
 
@@ -5001,33 +5018,33 @@ msgstr "%1.0f kollektioner"
 msgid "Performance"
 msgstr "Prestanda"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profilväljare"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Tillgängliga profiler"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Borttagning OK?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Lägg till ny profil"
 
@@ -5194,23 +5211,23 @@ msgstr "Uppstart"
 msgid "Theme Selector"
 msgstr "Tema"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " Importera..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Temakategorier"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Tilldela"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Rensa alla"
 
@@ -5263,38 +5280,38 @@ msgid "Wallpaper Settings"
 msgstr "Bakgrundsinställningar"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Använd temats bakgrund"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Bild..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Var ska bakgrunden användas"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Alla skrivbord"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Detta skrivbord"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Denna skärm"
 
@@ -5315,14 +5332,14 @@ msgid "Fill Options"
 msgstr ""
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Horisontalt"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Vertikalt"
 
@@ -5388,40 +5405,40 @@ msgstr ""
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Välj en bild..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr ""
 
@@ -5533,14 +5550,6 @@ msgstr ""
 msgid "Prefer application provided icon"
 msgstr ""
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Interna fönster"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Fokus"
@@ -5673,17 +5682,12 @@ msgid "Window Maximize Policy"
 msgstr ""
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Expandera smart"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Expandera fönstret"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Fyll allt tillgängligt utrymme"
 
@@ -5691,19 +5695,19 @@ msgstr "Fyll allt tillgängligt utrymme"
 msgid "Maximize Policy"
 msgstr "Maximeringspolicy"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "BÃ¥da"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
 
@@ -5742,49 +5746,58 @@ msgstr ""
 msgid "Raise when clicking to focus"
 msgstr "Höj vid klick för fokus"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Fönster kommer ihåg"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Kom ihåg dessa lås"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Titel:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Roll:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr ""
 
@@ -6140,7 +6153,7 @@ msgid "Show Toolbar"
 msgstr ""
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Beteende"
 
@@ -6156,97 +6169,97 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "Lägg till applikation..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Öppna"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Öppna med..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "Applikationer"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Specifik applikation"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Välj en"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6273,17 +6286,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "Egenskaper"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Filhanterare"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6321,19 +6334,19 @@ msgstr "Bakgrund"
 msgid "Gadgets"
 msgstr "Moduler"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr ""
 
@@ -6370,7 +6383,7 @@ msgstr "Välj källa"
 msgid "Icon Labels"
 msgstr "Ikonbeskrivning"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Visa ikonetikett"
 
@@ -6431,43 +6444,43 @@ msgstr "Skapa ny ikon"
 msgid "Add Application"
 msgstr "Lägg till applikation"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Visa namn"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Visa titel"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Visa klass"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Visa ikonnamn"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Visa fönster från alla skärmar"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr ""
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Visa fönster från alla skrivbord"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Visa fönster från aktivt skrivbord"
 
@@ -6487,11 +6500,11 @@ msgstr ""
 msgid "Show desktop names"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Popup inställningar"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6499,108 +6512,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Dra hela skrivbordet"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f sekunder"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6724,7 +6737,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Temperatur"
 
@@ -6736,15 +6749,15 @@ msgstr "Nästa"
 msgid "Welcome to Enlightenment"
 msgstr "Välkommen till Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Välj en"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6791,15 +6804,15 @@ msgstr ""
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr ""
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Snabbstart"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr ""
 
@@ -6921,19 +6934,58 @@ msgstr ""
 msgid "Networks"
 msgstr "Nätverk"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 #, fuzzy
 msgid "Systray"
 msgstr "System"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "Du försöker få Enlightenment att minnas att konfigurera<br>egenskaper (så "
+#~ "som storlek, plats, ramstil etc.) på<br>ett fönster <hilight>som inte "
+#~ "harunika egenskaper</hilight>.<br><br>Detta betyder att det delar "
+#~ "egenskaper för Namn/Klass, Transience, Roll etc.<br>med mer är ett annat "
+#~ "fönster på skärmen och minnes<br>egenskaper för detta fönster kommer att "
+#~ "alla andra fönster<br>som matchar dessa egenskaper.<br><br>Du vill kanske "
+#~ "aktivera <hilight>Matcha bara ett fönster</hilight> om<br>du bara vill "
+#~ "att dennainstansen av detta fönster ska ändras, och<br>ytterligare "
+#~ "instanser inte ska beröras.<br><br>Detta är bara en varning föratt "
+#~ "bekräfta att detta var det du ville skulle hända.<br>Om det var, tryck "
+#~ "bara på <hilight>Verkställ</hilight> eller <hilight>OK</hilight> "
+#~ "knapparna<br>och dina inställningar kommer att accepteras. Tryck "
+#~ "<hilight>Avbryt</hilight> om du<br>inte är säker, då kommer inget att "
+#~ "ändras."
+
+#~ msgid "Window name and class"
+#~ msgstr "Fönsternamn och klass"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Interna fönster"
+
+#~ msgid "Expand the window"
+#~ msgstr "Expandera fönstret"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "Sida vid sida"
@@ -7041,9 +7093,6 @@ msgstr "System"
 #~ msgid "Window"
 #~ msgstr "Fönster"
 
-#~ msgid "Window Name"
-#~ msgstr "Fönsternamn"
-
 #~ msgid "Window Title"
 #~ msgstr "Fönstertitel"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index a6148dd..90117c0 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index f4f0517..c552007 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: E17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
 "PO-Revision-Date: 2009-06-22 14:33+0300\n"
 "Last-Translator: H. İbrahim Güngör <h.ibrahim.gungor at gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc at kde.org>\n"
@@ -22,28 +22,29 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "Enlightenment Hakkında"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Kapat"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
+#, fuzzy
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -79,57 +80,57 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "Bu pencereyi sonlandırmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Evet"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Hayır"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "Çıkmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
 "Enlightenment 'tan çıkmak istediniz.<br><br>Çıkmak istediğinizden emin "
 "misiniz?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "Oturumu Kapatmak istediÄŸinizden eminmisiniz?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
 "Oturmu kapatmak üzeresiniz<br><br>Bunu yapmak istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "Kapatmak istediÄŸinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "Bilgisayarınızı kapatmak istediniz.<br><br>Emin misiniz?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "Yeniden baÅŸlatmak istediÄŸinizden emin misiniz?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
@@ -137,7 +138,7 @@ msgstr ""
 "Bilgisayarınızı yeniden başlatmak istediniz.<br><br>Bilgisayarı yeniden "
 "baÅŸlatmak istediÄŸinize emin misiniz?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
@@ -145,11 +146,11 @@ msgstr ""
 "Bilgisayarınızı askıya almak istediniz.<br><br>Askıya lamak istediğinizden "
 "emin misiniz?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "Uyku moduna geçmek istediğinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
@@ -157,494 +158,494 @@ msgstr ""
 "Bilgisayarınızı uyku moduna almak istediniz<br><br>Diske askıya almak "
 "istediÄŸinizden emin misiniz?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Pencere : Eylemler"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Taşı"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "Boyutlandır"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Menü"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Pencere Menüsü"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "Üste Çıkar"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "Alta Gönder"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Sonlandır"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "Pencere : Durum"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "Yapışkan Mod Değiştir"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "Ä°con Modu DeÄŸiÅŸtir"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "Tam Ekran Modu DeÄŸiÅŸtir"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "Büyüt"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "Dikey Büyüt"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "Yatay Büyüt"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "Tam Ekran Büyüt"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "Büyüt \"Smart\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "Büyüt \"Expand\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "Büyüt \"Fill\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "Yukarı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "Aşağı Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "Sola Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "Sağa Gölgelendir Değiştir"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "Gölgelendirme Modu Değiştir"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "Çerçevesiz Durum Değiştir"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "Ä°ÄŸnelenmiÅŸ Durum DeÄŸiÅŸtir"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "Masaüstünü Sola Çevir"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "Masaüstünü Sağa Çevir"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "Masaüstünü Yukarı Çevir"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "Masaüstünü Aşagı Çevir"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "Masaüstünü ...ile Çevir"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "Masaüstünü Göster"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "Rafı Göster"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "Masaüstünü ...'e çevir"
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "Masaüstünü Doğrusal Olarak Çevir"
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "Masaüstü 0 'a geç"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "Masaüstü 1 'e geç"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "Masaüstü 2 'ye geç"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "Masaüstü 3 'e geç"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "Masaüstü 4 'e geç"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "Masaüstü 5 'e geç"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "Masaüstü 6 'ya geç"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "Masaüstü 7 'ye geç"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "Masaüstü 8 'e geç"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "Masaüstü 9 'a geç"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "Masaüstü 10 'a geç"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "Masaüstü 11 'e geç"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "Masaüstü ... geç"
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
 msgstr "Masaüstünü Sola Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
 msgstr "Masaüstünü Sağa Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
 msgstr "Masaüstünü Yukarı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
 msgstr "Masaüstünü Aşağı Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
 msgstr "Masaüstünü ... ile Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
 msgstr "Masaüstünü ... 'e Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "Masaüstünü Doğrusal Olarak Çevir (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "Masaüstünü Çevir..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "Masaüstü 0'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "Masaüstü 1'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "Masaüstü 2'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "Masaüstü 3'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "Masaüstü 4'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "Masaüstü 5'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "Masaüstü 6'ya geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "Masaüstü 7'ye geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "Masaüstü 8'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "Masaüstü 9'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "Masaüstü 10'a geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "Masaüstü 11'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "Masaüstü...'e geç (Tüm Ekranlar)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "Fareyi Ekran 0'a Gönder"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "Fareyi Ekran 1'e Gönder"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "Fareyi ekran... Gönder"
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "Fareyi 1 Ekran İleri Gönder"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "Fareyi 1 Ekran Geri Gönder"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Fareyi İleri/Geri Ekran... Göder"
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "Pencere : Taşı"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "İleri Masaüstüne"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "Geri Masaüstüne"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "Masaüstü ile #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "Masaüstüne..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "Ana Menüyü Göster"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "Favoriler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "Tüm Uygulamalar Menüsünü Göster"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "İstemciler Menüsünü Göster"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "Menüyü... Göster"
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "BaÅŸlat"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Komut"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Uygulama"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Yeniden BaÅŸlat"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Çık"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Şimdi Çık"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment : Mod"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "Sunum Modunu Aç/Kapa"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "Çevrimdışı Modu  Aç/Kapa"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Sistem"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "Oturumu Kapat"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Åžimdi Kapat"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Kapat"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Yeniden BaÅŸlat"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "Askıya Al"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "Uykuya Al"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "Kilitle"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "Pencereleri Temizle"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "Genel : Eylemler"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "ErtelenmiÅŸ Eylem"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "Masaüstü Arkaplanı Yap"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "Masaüstü dosya  araması bitti"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "Masaüstü dosya araması"
 
@@ -652,41 +653,40 @@ msgstr "Masaüstü dosya araması"
 msgid "Color Selector"
 msgstr "Renk Seçici"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Tamam"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -697,7 +697,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -706,11 +706,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "Ayarlar Yükseltildi"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -718,7 +718,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -728,7 +728,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -737,7 +737,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -746,7 +746,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -754,11 +754,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment Ayarları Yazma Sorunları"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -766,12 +766,12 @@ msgstr "Enlightenment Ayarları Yazma Sorunları"
 msgid "Advanced"
 msgstr "GeliÅŸmiÅŸ"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "Basit"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "Uygula"
 
@@ -779,7 +779,7 @@ msgstr "Uygula"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "Modüller"
 
@@ -788,39 +788,39 @@ msgstr "Modüller"
 msgid "Extensions"
 msgstr "Eklentiler"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "Taşıycı %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "Hata- PAM desteÄŸi yok"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "PAM desteği bulunamadı, <br>masaüstü kilitleme iptal edildi."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "Kilitleme Başarısız Oldu"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "Lütfen kilidi açma parolanızı giriniz"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "Yetkilendirme Sistem Hatası"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -831,11 +831,11 @@ msgstr ""
 "Hata kodu <hilight>%i</hilight>.<br>Bu kötü oldu ve böyle olmamalıydı. "
 "Lütfen bu hatayı bildirin."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "Sunum Modu EtkinleÅŸtirilsin mi?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
@@ -845,11 +845,11 @@ msgstr ""
 "etkinleştirip, ekran koruyucu, kilit ve güç koruma modlarının geçici olarak "
 "etkisiz kılınmasını ister misiniz?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "Hayır, fakat zaman aşımını arttır"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "Hayır, tekrar sorma"
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Masaüstü Girdisi Düzenleyici"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -915,7 +915,7 @@ msgstr "Kategoriler"
 msgid "Mime Types"
 msgstr "Mime Türleri"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -947,23 +947,23 @@ msgstr "Simge Seç"
 msgid "Select an Executable"
 msgstr "Çalıştırılabilir Dosya Seç"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "Sil"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Kes"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Yapıştır"
 
@@ -971,24 +971,24 @@ msgstr "Yapıştır"
 msgid "Select All"
 msgstr "Tümünü Seç"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "Yürütme Hatası"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
 msgstr "Enlightenment alt işlem yaratamadı:<br><br>%s<br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "Uygulama Yürütme Hatası"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
@@ -997,307 +997,307 @@ msgstr ""
 "Enlightenment uygulamayı çalıştıramadı:<br><br>%s<br><br>Uygulama "
 "çalıştırılamadı."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "Uygulama Çalıştırma Hatası"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s beklenmedik şekilde çalışmayı durdurdu."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "%2$s 'den %1$i çıkış kodu geldi."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s Kesme Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s Çık Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s Durdur Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s Ondalıklı Sayı Hatası ile durduruldu."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s Durdurulamaz Sonlandırma Sinyali ile durduruldu."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s Bölümleme Hatası tarafından durduruldu."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s Hatalı İletici tarafından duruduruldu."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s Bitirme Sinyali tarafından durudurldu."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s Veriyolu Hatası tarafından durdurldu."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s %i sinyal numarası tarafından durduruldu."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "***Kalan çıktı kesilmiş. Çıktıyı görünüme kaydet.***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "Hata Kayıtları"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "Hata mesajı yoktu"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "Mesajı Kaydet"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "Bu hata kaydı %s/%s.log olarak kaydedildi."
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "Hata Bilgsi"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "Hata Sinyali Bilgisi"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "Veri Çıktısı"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "Çıktı yok."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "Mevcut olmayan yol"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s mevcut deÄŸil."
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
 msgstr "Bağlama Hatası"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr "Aygıt Bağlanamıyor"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
 msgstr "Çıkarma Hatası"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr "Aygıt Çıkarılamıyor"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
 msgstr "Çıkarma Hatası"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr "Aygıt çıkarılamıyor"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i Dosya"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Bağlantı"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "Vazgeç"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "Ana ayarları miras al"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "Görünüm Kipi"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "Görünümü Yenile"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "Gizli Dosyaları Göster"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "Sıralamayı Hatırla"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "Şimdi Sırala"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "Yeni Dizin"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "Yeniden Adlandır"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr "Çıkarma"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
 msgstr "BaÄŸla"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr "Çıkarma"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "Özellikler"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "Öntanımlıyı kullan"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "Izgara Görünümü"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "Özel Simgeler"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Listele"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "Simge Boyutu (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "Arkaplanı ayarla..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "Katmanı ayarla..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Yeni Dizin OluÅŸtur"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "Yeni Dizin Adı:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "%s adını değiştir:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "Dosyayı Yeniden Adlandır"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "Hata"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "Tümüne hayır"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "Tümüne evet"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Uyarı"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "Dosya zaten mevcut, üzerine yazayım mı?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "Görmezden gel"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Tümünü görmezden gel"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "Bir işlem gerçekleştirilirken hata oluştu.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "Silme Ä°ÅŸlemini Onayla"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr ""
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1310,144 +1310,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "Dosya Özellikleri"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Dosya:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Boyut:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "Son DeÄŸiÅŸtirme:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "Dosya Türü:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "Ä°zinler"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Sahip:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "DiÄŸerleri okuyabilir"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "DiÄŸerleri yazabilir"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "Sahip okuyabilir"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "Sahip yazabilir"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "Önizleme"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "Parçacık"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "Özel"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "Bu türdeki dosyalar için bu simgeyi kullan"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Bağlantı Bilgisi"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "Resim Seç"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "Bilinmeyen Hacim"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "Kaldırılabilir Aygıt"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "Bu aleti kaldır"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "Düz"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "Çerçeve"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "Görünüm"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "İçeriği otomatik kaydır"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "Yeniden boyutlandırılabilir"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "Aleti oynat/yeniden boyutlandır"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "Bu aleti kaldır"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "Aleti taşımayı/boyutlandırmayı durdur"
 
@@ -1459,7 +1464,7 @@ msgstr ""
 "Bu ekranda daha önce açılmış bir Enlightenment\n"
 "hâlâ aktif. Açılış iptal ediliyor.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "Pencere Kilitleri"
 
@@ -1494,21 +1499,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:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
 msgstr "Konum"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
 msgstr "Boyut"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "Kümeleme"
 
@@ -1517,12 +1522,12 @@ msgid "Iconified state"
 msgstr "Simge durumu"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
 msgstr "Yapışkan"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "Gölgelenmiş durum"
 
@@ -1531,7 +1536,7 @@ msgid "Maximized state"
 msgstr "Büyütülmüş durum"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "Tamekran durumu"
 
@@ -1539,7 +1544,7 @@ msgstr "Tamekran durumu"
 msgid "Lock me from changing:"
 msgstr "Beni şunları değiştirirken engelle:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "Kenarlık biçemi"
 
@@ -1587,115 +1592,116 @@ msgstr "Masaüstünden Çıkar"
 msgid "More..."
 msgstr "Daha çok..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "SimgeleÅŸtir"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "Dikey Büyüt"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "Yatay Büyüt"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "Tam Ekrandan Çık"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "Klavye Kısayolu"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "Favoriler Menüsüne"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "Başlatıcıya"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "Çerçeve"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "Atla"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "Durum"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "Hatırla"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "Pencere Özellikleri"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "Herzaman Ãœstte"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "Normal"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "Herzaman Altta"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "Çerçeve Stilini Seç"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "Öntanımlı E17 İkon Ayarlarını Kullan"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "Uygulamanın İkonunu Kullan"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "Kullanıcı Tanımlı İkonu Kullan"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "Gölgelenmiş"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "Yapışkan"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "Tam Ekran"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "Pencere Listesi"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "Sayfalayıcı"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "Görev Çubuğu"
 
@@ -1711,7 +1717,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM Özellikleri"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Başlık"
 
@@ -1803,11 +1809,11 @@ msgstr "NetWM Özellikleri"
 msgid "Modal"
 msgstr "Kipsel"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "Görev Çubuğunu Geç"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "Sayfalayıcıyı Geç"
 
@@ -1815,15 +1821,15 @@ msgstr "Sayfalayıcıyı Geç"
 msgid "Hidden"
 msgstr "Gizli"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "Pencere Hatırlamaları"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1837,11 +1843,11 @@ msgid ""
 "sure and nothing will be affected."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1849,102 +1855,105 @@ msgid ""
 "way of remembering this window."
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "Hiçbirşey"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "Boyut ve Konum"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "Kilitler"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "Boyut, Konum ve Kilitler"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "HerÅŸey"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "Pencere adı ve sınıfı"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "Pencere Yöneticisi"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "Pencere Sınıfı"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "Pencere Rolü"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "Pencere tipi"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "Geçici Durum"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "Hatırlanacak özellikler"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "Simge Tercihleri"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "Sanal Masaüstü"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "Mevcut Ekran"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "Pencere Listesini Atla"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "Uygulama Yürütme Hatası"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "Tek pencereyle eÅŸleÅŸ"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "Bu programı açılışta başlat"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "Açılışta her zaman odakla"
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "Simge Özelliklerini Değiştir"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Bu programı açılışta başlat"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Ayarlar"
@@ -1963,24 +1972,24 @@ msgstr "Raf"
 msgid "Module Settings"
 msgstr "Modül Ayarları"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "Kullanılabilir Modüller"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "Modülü Yükle"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "Yüklenmiş Modüller"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "Modülü Kaldır"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2014,8 +2023,8 @@ msgstr "Aleti Kaldır"
 msgid "Toolbar Settings"
 msgstr "Araç Çubugu Ayarları"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "Yerleşim Planı"
 
@@ -2043,12 +2052,12 @@ msgid "Favorite Applications"
 msgstr "Favori Uygulamalar"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Uygulamalar"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2057,7 +2066,7 @@ msgstr "Uygulamalar"
 msgid "Windows"
 msgstr "Pencereler"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "Kayıp Pencereler"
 
@@ -2093,129 +2102,128 @@ msgstr "(Uygulama Yok)"
 msgid "Set Virtual Desktops"
 msgstr "Sanal Masaüstlerini Ayarla"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(Pencere Yok)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "Ad yok!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(Raf Yok)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "Raf #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "Raf Ekle"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "Rafı Sil"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "Raf Ayarları"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Ufak"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "Küçük"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Orta"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "GeniÅŸ"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "Kocaman"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "İçeriği Ayarla..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "Herşeyin Üstünde"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "Pencerelerin Altında"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "Herşeyin Altında"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "Pencerelerin rafı kaplamasına izin ver"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "İçeriğin Boyutuna Göre Küçült"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f piksel"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Biçemler"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "Otomatik Gizle"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "Rafı otomatik gizle"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "Fare üzerine gelince göster"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "Fare tıklanınca göster"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "Gizlenme zamanaşımı"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f saniye"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "Gizli kalma süresi"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "Tüm masaüstlerinde göster"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "Belirli masaüstlerinde göster"
 
@@ -2422,7 +2430,7 @@ msgstr "Uluslararasılaştırma Desteği Başlatılıyor"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment kendi intls sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2430,11 +2438,11 @@ msgstr ""
 "Enlightenment açılış ekranını ayarlayamadı.\n"
 "Belleğiniz tükenmiş olabilir mi?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr ""
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2442,7 +2450,7 @@ msgstr ""
 "Enlightenment Evas'ın tampon kanvası oluşturamadığını algıladı. Evas'ın\n"
 "Software Buffer motoru destei olduÄŸunu kontrol edin.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2450,7 +2458,7 @@ msgstr ""
 "Enlightenment Evas'ın PNG dosyalarını yükleyemediğini algıladı. Evas'ın PNG\n"
 "yükleme desteğini olduğunu kontrol edin.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2459,7 +2467,7 @@ msgstr ""
 "JPEG\n"
 "yükleme desteğini olduğunu kontrol edin.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2467,7 +2475,7 @@ msgstr ""
 "Enlightenment Evas'ın EET dosyalarını yükleyemediğini algıladı. Evas'ın EET\n"
 "yükleme desteğini olduğunu kontrol edin.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
@@ -2478,11 +2486,11 @@ msgstr ""
 "desteği olduğunu ve fontconfig'in 'Sans' yazıtipini tanımladığını kontrol "
 "edin.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "Ekranları Ayarla"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2490,191 +2498,191 @@ msgstr ""
 "Enlightenment sisteminizdeki tüm ekranlardaki pencere yönetimini ayarlamada\n"
 "başarısız oldu. Başka bir pencere yöneticisi çalışıyor olabilir mi?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "Ekran Koruyucuyu Ayarla"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment X ekran koruyucuyu yapılandıramıyor."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "Masaüstü Kilidini Ayarla"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment kendi masaüstü kilitleme sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "Yollar Ayarlanıyor"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "Sistem Kontrollerini Ayarla"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment Sistem Komutu sistemini başlatamadı.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "Eylemleri Ayarla"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment eylem sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "Çalıştırma Sistemini Ayarla"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment kendi çalıştırma sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "Hatırlamaları Ayarla"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment hatırlama ayarlarını ayarlamayadı."
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "Dosya Yöneticisini Ayarla"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment Dosya yöneticisini başlatamadı.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "Mesaj Sistemini Ayarla"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment kendi mesaj sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "DND Ayarla"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment kendi dnd sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
 msgstr "Girdi Yakalama İşleyiciyi Yapılandır"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment girdi yakalama işleyici sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "Modülleri Ayarla"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment modül sistemini ayarlayamadı."
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Hatırlamaları Ayarla"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment hatırlama ayarlarını ayarlamayadı."
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "Renk Sınıflarını Ayarla"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment renk sınıfı sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "Gadcon Yapılandırma"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment alet kontrol sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "DPMS Ayarla "
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment DPMS ayarlarını yapılandıramadı."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "Güç Koruma Kiplerini Ayarla"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment güç koruma modlarını ayarlayamadı."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "Arkaplanı Ayarla"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment masaüstü arkaplanı sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "Fareyi Ayarla"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment fae ayarlarını yapılandıramadı."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "Kısayolları Ayarla"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment kısayol sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "Açılır Pencereleri Ayarla"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment açılır pencere sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "Rafları Ayarla"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment raf sistemini ayarlayamadı."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "Önizlemeyi Ayarla"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment Önizleme sistemini başlatamadı.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "Dosya Sıralamasını Ayarla"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr ""
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "Modülleri Yükle "
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2682,11 +2690,11 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment açılamadan çöktü ve yeniden başlatıldı"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2694,26 +2702,26 @@ msgid ""
 "should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "Rafları Yapılandır"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "Neredeyse Bitti"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "Modül yükleme hatası"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2722,11 +2730,11 @@ msgstr ""
 "Şu isimli modül yüklenirken hata oluştu: %s<br>Bu modülün tam yolu: <br>%"
 "s<br>Bildirilen hata ÅŸuydu:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "Modül tüm gereken fonksiyonları içermiyor"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2736,12 +2744,12 @@ msgstr ""
 "Modül API hatası<br>Modül başlatılırken hata: %s<br>Asgari modül API sürümü "
 "gerekiyor: %i.<br>Enlightenment tarafından önerilen modül API sürümü: %i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s Modülü"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "Bu modülü çıkarmak istiyor musunuz?<br>"
 
@@ -2755,29 +2763,29 @@ msgstr ""
 "etkinleştirmek ve ekran koruyucuyu, kilidi ve güç koruma modunu geçici "
 "olarak kapatmak istiyor musunuz?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Bu rafı silmek istediğinizden emin misiniz?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "Bu rafı silmek istediniz.<br><..."
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "Nesneleri Taşımayı/Boyutlandırmayı Durdur"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "Nesneleri Taşımaya/Boyutlandırmaya Başla"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "Raf İçeriğini Ayarla"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "Bu Rafı Sil"
 
@@ -2794,11 +2802,11 @@ msgstr "Sistem Ä°zinleri Kontrol Ediliyor"
 msgid "System Check Done"
 msgstr "Sistem Kontrolü Tamam"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "Oturum kapatma sorunları"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2807,31 +2815,31 @@ msgstr ""
 "Oturumu kapatma çok uzun sürüyor. Bazı<br>uygulamalar kapanmayı reddediyor."
 "<br>Oturumu bu uygulamaları kapatmadan<br>bitirmeyi istiyor musunuz?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "Oturumu kapat"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "Biraz daha bekle"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "Oturumu Kapatmayı İptal Et"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "Oturum Kapatma İşlemi Sürüyor"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "Çıkış işlemi sürüyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlighenment baÅŸka bir istekle meÅŸgul"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
@@ -2839,7 +2847,7 @@ msgstr ""
 "Oturum kapatılıyor.<br>Oturum kapatma işlemi başladığında<br>sistem "
 "işlemlerini gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
@@ -2847,7 +2855,7 @@ msgstr ""
 "Kapatılıyor.<br>Kapatma işlemi başladığında<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
@@ -2855,7 +2863,7 @@ msgstr ""
 "Yeniden başlatılıyor.<br>Yeniden başlatma işlemi başladığında<br>sistem "
 "işlemlerini gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
@@ -2863,7 +2871,7 @@ msgstr ""
 "Askıya alınıyor.<br>Askıya alma şlemi bitene kadar<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
@@ -2871,55 +2879,55 @@ msgstr ""
 "Uykuya alınıyor.<br>Uykuya alma işlemi bitene kadar<br>sistem işlemlerini "
 "gerçekleştiremezsiniz."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "OYY! Bu olmamalıydı"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "Kapatma başarısız."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "Sıfırlama başarısız."
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "Askıya alma başarısız."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "Uykuya alma başarısız."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "Kapat"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "Kapatılıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "Sıfırlıyor"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "Sıfırlanıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "Askıya Alınıyor"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "Askıya alınıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "Uykuya Alınıyor"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "Uykuya alınıyor.<br><hilight>Lütfen bekleyin.</hilight>"
 
@@ -2935,11 +2943,11 @@ msgstr "Tema Olarak Ayarla"
 msgid "Set Toolbar Contents"
 msgstr "Araç Çubuğu İçeriğini Ayarla"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "Çıkamıyor - Ölümsüz Pencereler."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -2949,77 +2957,77 @@ msgstr ""
 "nedenle<br>Enlightenment bu pencereler<br>kapatılana ya da Lifespan lock "
 "kaldırılana kadar çıkmaya izin vermeyecek.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f Bayt"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "Gelecekte"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "Geçen dakika içinde"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li Yıl önce"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li Ay önce"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li Hafta önce"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li Gün önce"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li Saat önce"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li Dakika önce"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3039,51 +3047,51 @@ msgstr "Yukarı"
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Favorilere Ekle"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "Bir Dizin Yukarı"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "Ä°zinler:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "DeÄŸiÅŸtirilme:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Kullanıcı"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "KorunmuÅŸ"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "Salt Okunur"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "Yasaklı"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "Oku-Yaz"
 
@@ -3099,57 +3107,57 @@ msgstr "Temel Ayarlar"
 msgid "Show alert when battery is low"
 msgstr "Pil zayıf olduğunda uyar"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "Kontrol et:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f tik"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr "Taranıyor"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "Pil zayıfken uyarı göster"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "Åžunda olunca uyar:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f dk"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "Otomatik kaybol..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f sn"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "Uyarı"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "Otomatik Algıla"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3157,12 +3165,12 @@ msgstr "Otomatik Algıla"
 msgid "Internal"
 msgstr "Dahili"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "Donanım"
 
@@ -3170,24 +3178,24 @@ msgstr "Donanım"
 msgid "Battery"
 msgstr "Pil"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "Pil zayıf!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "AC güce geçmeniz önerilir."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "HATA"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "Pil Göstergesi"
 
@@ -3195,20 +3203,20 @@ msgstr "Pil Göstergesi"
 msgid "Clock"
 msgstr "Saat"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "Ayarlar Paneli"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "Sunum"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "Modlar"
 
@@ -3234,7 +3242,7 @@ msgid "Restart Applications"
 msgstr "Uygulamaları Yeniden Başlat"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "Tüm Uygulamalar"
 
@@ -3256,12 +3264,12 @@ msgstr "IBAR DiÄŸerleri"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "Menüler"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "Öntanımlı Kenarlık Biçemi"
 
@@ -3269,14 +3277,14 @@ msgstr "Öntanımlı Kenarlık Biçemi"
 msgid "Window Border Selection"
 msgstr "Pencere Kenarlık Seçimi"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr ""
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3302,7 +3310,7 @@ msgstr "Grupla"
 #: 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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3570,9 +3578,9 @@ msgid "Desktop Name"
 msgstr "Masaüstü Adı"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "Ad:"
 
@@ -3638,10 +3646,10 @@ msgstr "%1.0f dakika"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "KiÅŸisel"
@@ -3673,8 +3681,8 @@ msgstr "# Numaralı ekran bölgesinde göster:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3795,46 +3803,51 @@ msgstr "%.2f Y-ekseni pan faktörü"
 msgid "Virtual Desktops"
 msgstr "Sanal Masaüstleri"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "Diyalog Ayarları"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "Genel Ayarlar"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "Onaylama Diyaloglarını İptal Et"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "Normal Pencereler"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
 msgstr "Öntanımlı Ayarlar Pencereleri Modu"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "Temel Mod"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "GeliÅŸmiÅŸ Mod"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "Öntanımlı Diyalog Modu"
 
@@ -3902,31 +3915,31 @@ msgstr "Geri Yükle"
 msgid "Screen Resolution Settings"
 msgstr "Ekran Çözünürlük Ayarları"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "Açılışta Geri Yükle"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "Rotasyon"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "Eksik Özellikler"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3935,11 +3948,11 @@ msgid ""
 "XRandR support detected."
 msgstr ""
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "Yenileme Oranları Bulunamadı"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3994,7 +4007,7 @@ msgid "Power Management"
 msgstr "Güç Yönetimi"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4002,80 +4015,86 @@ msgid "<None>"
 msgstr "<Yok>"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
+#, fuzzy
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 "Lütfen bir kenar seçin,<br>ya da çıkmak için <hilight>Kapat</hilight> "
 "düğmesine tıklayın. <br><br>Bu eylemin gecikmesini değiştirmek için,"
 "<br>kaydırıcıyı kullanın:"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
 msgstr "Kenar Bağlayıcı Ayarları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
 msgstr "Kenar Bağlayıcıları"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
 msgstr "Kenar Ekle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
 msgstr "Kenarı Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
 msgstr "Kenarı Düzenle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "Tümünü Sil"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "Öntanımlı Bağlayıcıları Geri Yükle"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "Eylem"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "Eylem Parametreleri"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "Genel Seçenekler"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr "Tam ekran pencerelerde kısayol etkinleştirimine izin ver"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
 msgstr "Kenar Kısayol Dizisi"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
 msgstr "%.2f saniye"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
 msgstr "Kenar Kısayolu Hatası"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4084,27 +4103,27 @@ msgstr ""
 "Seçtiğiniz kısayol tuş dizisi, zaten <br><hilight>%s </hilight> eylemi "
 "tarafından kullanılıyor.<br>Lütfen farklı bir kısyol tuşu dizisi seçin."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4402,18 +4421,17 @@ msgstr "Çok Büyük"
 msgid "%d pixels"
 msgstr "%d piksel"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "Özel Yazı Tipi Sınıflarını Etkinleştir"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basit önizleme metni: 123: 我的天空!"
 
@@ -4421,38 +4439,52 @@ msgstr "Basit önizleme metni: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "Yazı Tipi Sınıfları"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "Yazı Tipi Sınıflarını Etkinleştir"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "Yazı Tipleri"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "Biçemler"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Gelişmiş Önizleme Metni.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr ""
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Gelişmiş Önizleme Metni.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4466,7 +4498,7 @@ msgstr "Simge Temaları"
 msgid "Icon theme overrides general theme"
 msgstr "Simge teması genel temayı bastırır"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "Simge Teması"
 
@@ -4538,7 +4570,7 @@ msgstr ""
 "aktaramadı."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "Dil"
 
@@ -4712,7 +4744,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr ""
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "Çeşitli Seçenekler"
 
@@ -4888,24 +4920,24 @@ msgstr "İmleç Boyutu"
 msgid "Mouse Cursor"
 msgstr "Fare Ä°mleci"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "Fare Ayarları"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "Fareyi Tutan El"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "Fare Hızlandırması"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "Hızlandırma"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "EÅŸik"
 
@@ -4922,7 +4954,7 @@ msgid "Images"
 msgstr "Resimler"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "Temalar"
 
@@ -5022,33 +5054,33 @@ msgstr "%1.0f koleksiyon"
 msgid "Performance"
 msgstr "Performans"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profil Seçici"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "Mevcut Profiller"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "Bir profil seç"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "\"%s\" profilini silmek istediniz.<br><br>Emin misiniz?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "Sileyim mi?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "Yeni Profil Ekle"
 
@@ -5213,23 +5245,23 @@ msgstr "Açılış"
 msgid "Theme Selector"
 msgstr "Tema Seçici"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr "İçe Aktar..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " Çevrimiçi..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "Tema Kategorileri"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "Ata"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "Tümünü Temizle"
 
@@ -5284,38 +5316,38 @@ msgid "Wallpaper Settings"
 msgstr "Duvarkağıdı Ayarları"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "Tema Duvarkağıdını Kullan"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "Resim..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "Gradyan..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "Çevrimiçi..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "Arkaplanın yerleştirileceği yer"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "Tüm Masaüstleri"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "Bu Masaüstü"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "Bu Ekran"
 
@@ -5336,14 +5368,14 @@ msgid "Fill Options"
 msgstr "Doldurma Seçenekleri"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "Yatay"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "Dikey"
 
@@ -5408,36 +5440,36 @@ msgstr "Özgün dosyayı kullan"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "Resim Seç..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "Resim İçe Aktarma Hatası"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr "Enlightenment çevrim hataları nedeniyle<br>resmi içe aktaramadı."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "Duvarkağıdı İçe Aktarma Hatası"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
 msgstr ""
 "Enlightenment bir kopyalama hatası nedeniyle<br>duvar kağıdını içe "
 "aktaramadı."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
@@ -5445,7 +5477,7 @@ msgstr ""
 "Enlightenmetn duvar kağıdını içe aktaramadı.<br><br>Bu duvar kağıdının "
 "geçerli olduğundan emin misiniz?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "Exchange duvarkağıtları"
 
@@ -5558,14 +5590,6 @@ msgstr "Kullanıcı tanımlı simgeyi tercih et"
 msgid "Prefer application provided icon"
 msgstr "Uygulamanın sağladığı simgeyi tercih et"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "Dahili Pencereler"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "Her zaman dahili pencereleri hatırla"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "Odaklama Ayarları"
@@ -5698,17 +5722,12 @@ msgid "Window Maximize Policy"
 msgstr "Pencere Ekranı Kaplama Politikası"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "Akıllı genişletme"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "Pencereyi geniÅŸlet"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "Mevcut boÅŸluÄŸu doldur"
 
@@ -5716,19 +5735,19 @@ msgstr "Mevcut boÅŸluÄŸu doldur"
 msgid "Maximize Policy"
 msgstr "Ekranı Kaplama Politikası"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "Ekranı Kaplama Yönleri"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "Ä°kisi"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "Pencere manipülasyonuna izin ver"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "Raf otomatik gizlenmesinde pencereleri otomatik oynat/boyutlandır"
 
@@ -5767,49 +5786,59 @@ msgstr "Hareket edince ya da boyutlandırılınca yükselt"
 msgid "Raise when clicking to focus"
 msgstr "Odaklamak için tıklandığında yükselt"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "Pencere Hatırlamaları"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "Her zaman dahili pencereleri hatırla"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "Her zaman dahili pencereleri hatırla"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "Hatırlamaları Sil"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<Ad Yok>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "Sınıf:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<Sınıf Yok>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "Başlık:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<Başlık Yok>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "Rol:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<Rol Yok>"
 
@@ -6162,7 +6191,7 @@ msgid "Show Toolbar"
 msgstr "Araç Çubuğunu Göster"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "Davranış"
 
@@ -6178,95 +6207,95 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr "Bağlandığında dosya yöneticisini aç"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "Ãœst Dizine Git"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "DÄ°ÄŸer uygulama..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "Aç"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "Şununla Aç..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "Bilinen Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "Belirli Uygulamalar"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "Özel Komut"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "Kenarı Sil"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "Sıfırlama başarısız."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6293,17 +6322,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "%d iÅŸlem"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "Dosya yöneticisi"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr "EFM Ä°ÅŸlem Bilgisi"
 
@@ -6341,19 +6370,19 @@ msgstr "Arkaplan"
 msgid "Gadgets"
 msgstr "Aletler"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "BoÅŸ"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "Daima masaüstünde"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "BaÅŸka bir alet ekle"
 
@@ -6390,7 +6419,7 @@ msgstr ""
 msgid "Icon Labels"
 msgstr "Simge Etiketleri"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "Simge Etiketini Göster"
 
@@ -6449,43 +6478,43 @@ msgstr "Yeni Simge OluÅŸtur"
 msgid "Add Application"
 msgstr "Uygulama Ekle"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBox Ayarları"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "Adı Görüntüle"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "Başlığı Görüntüle"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "Sınıfı Görüntüle"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "Simge Adını Görüntüle"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "Kenarlık Başlığını Görüntüle"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "Tüm ekranlardaki pencereleri göster"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "Mevcut ekrandaki pencereleri göster"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "Tüm masaüstlerindeki pencereleri göster"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "Etkin masaüstündeki pencereleri göster"
 
@@ -6505,11 +6534,11 @@ msgstr "Fare tekeriyle masaüstlerini değiştir"
 msgid "Show desktop names"
 msgstr "Masaüstü adlarını göster"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "Açılır Ayarları"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr ""
 
@@ -6517,108 +6546,108 @@ msgstr ""
 msgid "Show popup for urgent windows"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "Seç ve Kaydır düğmesi"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "Ayarlamak için tıkla"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "Sürükle ve Bırak düğmesi"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "Tüm masaüstünü sürükle"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f px"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "Sürüklemeye karşı direnç"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "Açılır hızı"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f saniye"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "Dikkat"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "%i Düğmesi"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr "Sayfalayıcı Açılırını Göster"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr ""
 
@@ -6742,7 +6771,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Sıcaklık"
 
@@ -6754,15 +6783,15 @@ msgstr "Sonraki"
 msgid "Welcome to Enlightenment"
 msgstr "Enlightenment'a HoÅŸgeldiniz"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "Birini seç"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "Profil"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -6812,15 +6841,15 @@ msgstr "Pencereleri odaklamak için tıkla"
 msgid "Mouse over focuses windows"
 msgstr "Fare üzerine geldiğinde pencereler odaklanır"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "Eklenecek Simge Seç"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "Hızlı Başlat"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "Uygulama Seç"
 
@@ -6944,20 +6973,32 @@ msgstr "Belirli Aygıt"
 msgid "Networks"
 msgstr "AÄŸlar"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr "Başka bir sistem çekmecesi mevcut"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 "Sadece bir tane sistem çekmecesi aleti olabilir ve şu anda bir tanesi zaten "
 "mevcut."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
 msgstr "Sistem Çekmecesi"
 
+#~ msgid "Window name and class"
+#~ msgstr "Pencere adı ve sınıfı"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Dahili Pencereler"
+
+#~ msgid "Expand the window"
+#~ msgstr "Pencereyi geniÅŸlet"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Pencere manipülasyonuna izin ver"
+
 #~ msgid "idle"
 #~ msgstr "boÅŸta"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 600f7be..8111f69 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index d6b4b4b..d80f199 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,43 +5,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e.HEAD\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-06-07 22:51+0300\n"
-"Last-Translator: Daniel Korostil <ted.korostiled at gmail.com>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-09-29 04:52+0000\n"
+"Last-Translator: Sergio Gavrylov <sergiovana at bigmir.net>\n"
 "Language-Team: Ukrainian <translation at linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:13+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "Про Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "Закрити"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -50,19 +49,19 @@ 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-2008, by the Enlightenment Development Team.<br><br>Ми "
-"сподіваємось, що ви отримаєте таку ж насолоду від використання цього "
-"програмного забезпечення, яку ж ми отримували при її написані.<br><br>Це "
-"програмне забезпечеея This software is provided as-is with no explicit or "
-"implied warranty. This software is governed by licensing conditions, so "
-"please see the COPYING and COPYING-PLAIN licence files installed on your "
-"system.<br><br>Enlightenment is under <hilight>HEAVY DEVELOPMENT</hilight> "
-"and it is not stable. Many features are incomplete or even non-existant yet "
-"and may have many bugs. You have been <hilight>WARNED!</hilight>"
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>Ми "
+"сподіваємось Вам сподобаєтся користуватись цією програмою так само як нам "
+"подобалось її писати.<br><br>Це програмне забезпечення надається \"як є\" "
+"без будь-якої явної або неявної гарантії та регулюється умовами "
+"ліцензування, дивіться COPYING and COPYING-PLAIN ліцензії файлів, "
+"встановлених в вашій системі.<br><br>Enlightenment знаходится<hilight>В "
+"АКТИВНІЙ РОЗРОБЦІ</ Hilight>, і не є стабільним. Багато функцій не існують "
+"або є неповними та можуть мати багато помилок. Ми Вас<hilight>ПОПЕРЕДИЛИ!</ "
+"Hilight>"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
-msgstr ""
+msgstr "<title>Команда</title>"
 
 #: src/bin/e_actions.c:345
 #, c-format
@@ -71,610 +70,616 @@ msgid ""
 "window,<br>which has not been saved yet will be lost!<br><br>Are you sure "
 "you want to kill this window?"
 msgstr ""
+"Ви збираєтеся примусово зачинити%s.<br><br>Будь ласка, майте на увазі, що "
+"всі не збережені дані з цього вікна,<br>будуть втрачені!<br><br>Ви впевнені, "
+"що бажаєте примусово зачинити це вікно?"
 
 #: src/bin/e_actions.c:357
 msgid "Are you sure you want to kill this window?"
-msgstr "Ви впевнені, що бажаєте вбити це вікно?"
+msgstr "Ви впевнені, що бажаєте примусово зачинити це вікно?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "Так"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "Ні"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
-msgstr ""
+msgstr "Ви впевнені? Вийти?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr ""
+"Ви запросили вихід з Enlightenment.<br><br>Ви впевнені, що бажаєте вийти?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
-msgstr ""
+msgstr "Ви впевнені, що бажаєте завершити сесію?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr ""
+"Ви запросили завершення сесії.<br><br>Ви впевнені, що бажаєте зробити це?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
-msgstr ""
+msgstr "Ви впевнені, що бажаєте вимкнути комп'ютер?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
-msgstr ""
+msgstr "Ви попросили вимкнути Ваш комп'ютер.<br><br>Ви впевнені? Вимкнути?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
-msgstr ""
+msgstr "Ви впевнені? Перезавантажити?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr ""
+"Ви хочете перезавантажити комп'ютер.<br><br>Ви впевнені? Перезавантажити?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
-msgstr ""
+msgstr "Ви запросили режим очікування.<br><br>Ви впевнені?Зробити це?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
-msgstr ""
+msgstr "Ви впевнені що хочете \"заморозити\" систему?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr ""
+"Ви запросили \"заморозити\" ваш комп'ютер.<br><br>Ви дійсно цього хочете?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "Вікно : дії"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "Пересунути"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
-msgstr ""
+msgstr "Змінити розмір"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "Меню"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "Меню вікна"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
-msgstr ""
+msgstr "Підняти"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
-msgstr ""
+msgstr "Знизити"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "Вбити"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
-msgstr "Вікна : стан"
+msgstr "Вікно : стан"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
-msgstr ""
+msgstr "Ввімкнути \"Липкий\" Режим Вікна"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
-msgstr ""
+msgstr "Перемкнути Режим Іконки"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
-msgstr ""
+msgstr "Перемкнути на Повний Екран"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
-msgstr ""
+msgstr "Розгорнути"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
-msgstr ""
+msgstr "Розгорнути по Вертикалі"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
-msgstr ""
+msgstr "Розгорнути по Горизонталі"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
-msgstr ""
+msgstr "Розгорнути на Весь Екран"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
-msgstr ""
+msgstr "\"Інтелектуальний\" Режим Розгортання"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
-msgstr ""
+msgstr "Розгорнути в Режимі \"Розтягування\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
-msgstr ""
+msgstr "Розгорнути в Режимі \"Заповнити\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
-msgstr ""
+msgstr "Перемкнути Режим Згорнути Догори"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
-msgstr ""
+msgstr "Перемкнути Режим \"Згорнути Донизу\""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
-msgstr ""
+msgstr "Перемкнути Режим \"Згорнути Ліворуч\""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
-msgstr ""
+msgstr "Перемкнути Режим \"Згорнути Праворуч\""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
-msgstr ""
+msgstr "Перемкнути \"Згорнутий Режим\""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
-msgstr ""
+msgstr "Перемкнути \"Режим Без Бордюрів\""
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
-msgstr ""
+msgstr "Перемкнути \"Режим Пришпилювання\""
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "Стільниця"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
-msgstr ""
+msgstr "Перенести Стільницю Ліворуч"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
-msgstr ""
+msgstr "Перенести Стільницю Праворуч"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
-msgstr ""
+msgstr "Перенести Стільницю Догори"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
-msgstr ""
+msgstr "Перенести Стільницю Донизу"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
-msgstr ""
+msgstr "Перенести Стільницю До..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
-msgstr ""
+msgstr "Показати Стільницю"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
-msgstr ""
+msgstr "Показати Полицю"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
-msgstr ""
+msgstr "Перенести Стільницю На..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
-msgstr ""
+msgstr "Перенести Стільницю Лінійно..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
-msgstr ""
+msgstr "Перемкнути на Стільницю 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
-msgstr ""
+msgstr "Перемкнути на Стільницю 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
-msgstr ""
+msgstr "Перемкнути на Стільницю 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
-msgstr ""
+msgstr "Перемкнути на Стільницю 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
-msgstr ""
+msgstr "Перемкнути на Стільницю 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
-msgstr ""
+msgstr "Перемкнути на Стільницю 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
-msgstr ""
+msgstr "Перемкнути на Стільницю 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
-msgstr ""
+msgstr "Перемкнути на Стільницю 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
-msgstr ""
+msgstr "Перемкнути на Стільницю 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
-msgstr ""
+msgstr "Перемкнути на Стільницю 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
-msgstr ""
+msgstr "Перемкнути на Стільницю 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
-msgstr ""
+msgstr "Перемкнути на Стільницю 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
-msgstr ""
+msgstr "Перемкнути на Стільницю..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Ліворуч (Всі Екрани)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Праворуч (Всі Екрани)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Догори (Всі Екрани)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Донизу (Всі Екрани)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Через... (Всі Екрани)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю На... (Всі Екрани)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr ""
+msgstr "Перенести Стільницю Лінійно... (Всі Екрани)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
-msgstr ""
+msgstr "Развернути Стільницю в напрямку ..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 0 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 1 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 2 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 3 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 4 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 5 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 6 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 7 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 8 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 9 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 10 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю 11 (Всі Екрани)"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
-msgstr ""
+msgstr "Перемкнути на Стільницю... (Всі Екрани)"
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "Екран"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
-msgstr ""
+msgstr "Переслати Мишку До Екрану 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
-msgstr ""
+msgstr "Переслати Мишку До Екрану 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
-msgstr ""
+msgstr "Переслати Мишку До Екрану..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
-msgstr ""
+msgstr "Переслати Мишку Вперед До 1 Екрану"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
-msgstr ""
+msgstr "Переслати Мишку Назад До 1 Екрану"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
-msgstr ""
+msgstr "Переслати Мишку Вперед/Назад..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
-msgstr ""
+msgstr "Вікно: Переміщення"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
-msgstr ""
+msgstr "До Наступної Стільниці"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
-msgstr ""
+msgstr "До Попередньої Стільниці"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
-msgstr ""
+msgstr "По # Стільниці..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
-msgstr ""
+msgstr "На Стільницю..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
-msgstr ""
+msgstr "Показати Головне Меню"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
-msgstr ""
+msgstr "Показати Меню \"Вибране\""
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
-msgstr ""
+msgstr "Показати Меню \"Всі Додатки\""
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
-msgstr ""
+msgstr "Показати Меню Клієнта"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
-msgstr ""
+msgstr "Показати Меню..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "Запустити"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "Команду"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "Програму"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "Перезапустити"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "Вийти"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "Вийти зараз"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
-msgstr ""
+msgstr "Enlightenment : Режим"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
-msgstr ""
+msgstr "Enlightenment : Режим"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
-msgstr ""
+msgstr "Автономний Режим Перемикання"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "Система"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
-msgstr "Вийти"
+msgstr "Завершити сеанс"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "Вимкнути зараз"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "Вимкнути"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "Перезавантажити"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
-msgstr ""
+msgstr "Призупинити"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
-msgstr ""
+msgstr "Режим сну"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
-msgstr ""
+msgstr "Заблокувати"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
-msgstr ""
+msgstr "Розчистити Вікна"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
-msgstr ""
+msgstr "Загальне : Дії"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
-msgstr ""
+msgstr "Відкладене Виконання"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
-msgstr ""
+msgstr "Зробити фоновим малюнком"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
-msgstr ""
+msgstr "Сканування файлів запуску програм завершено"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
-msgstr ""
+msgstr "Сканування файлів запуску програм"
 
 #: src/bin/e_color_dialog.c:29
 msgid "Color Selector"
-msgstr ""
-
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+msgstr "Діалог вибору кольору"
+
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "Гаразд"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -684,8 +689,16 @@ msgid ""
 "adding it in. You can re-configure things now to your<br>liking. Sorry for "
 "the hiccup in your settings.<br>"
 msgstr ""
+"Дані налаштування потребують оновлення. Ваші старі налаштування <br> були "
+"знищені, а нові встановлено за замовчуванням. Таке <br> відбуватиметься "
+"регулярно під час розробки, тому не повідомляйте <br> про помилку. Це просто "
+"означає, що Enlightenment потребує нових налаштувань <br> за замовчуванням "
+"з  прийнятною функціональністю, а ваших старих налаштувань <br> просто не "
+"вистачає. Ці нові налаштування за замовчуванням буде зафіксовано <br>, щоб "
+"додати їх до нових виправлень. Ви можете повторно налаштувати це тепер до "
+"вашого <br> смаку. Вибачте за незручності <br>."
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -693,20 +706,29 @@ msgid ""
 "This is bad and<br>as a precaution your settings have been now restored "
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
+"Ваша конфігурація НОВІША ніж конфігурація Enlightenment. Це дуже <br> дивно. "
+"Цього не повинно було трапитися, якщо тільки Ви не занизили <br> версію "
+"Enlightenment, або скопіювали конфігурацію <br> з місця з більш новою "
+"версією Enlightenment. <br> Це неправильно, тому ваша конфігурація була <br "
+"> відновлена на стандартну. Вибачте за незручності. <br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
-msgstr ""
+msgstr "Параметри оновлено"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings 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 ""
+"Під час збереження налаштувань Enlightenment на диск <br> виникла помилка, "
+"яка не може бути <br> визначена. <br> <br> Файл в якому виникла помилка: <br>"
+"% s <br> <br> Цей файл був видалений з метою запобігання пошкодження даних. "
+"<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -715,8 +737,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 ""
+"Файли параметрів Enlightenment занадто великі <br> для того, щоб зберегти їх "
+"в цій файловій системі. <br> Ця помилка є дуже підозрілою, тому що <br> "
+"файли не повинні бути дуже великими. Будь ласка, <br> перевірте налаштування "
+"домашнього <br> <br> каталогу. Файл, в якому виникла помилка: <br>% s <br> "
+"<br> Цей файл був видалений з метою запобігання пошкодження даних. <br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -724,8 +751,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 ""
+"Під час запису файлів параметрів Enlightenment виникла <br> помилка виводу. "
+"Ваш диск має проблеми, можливо, його <br> треба замінити. Файл в якому <br> "
+"<br> виникла помилка: <br>% s <br> <br> Цей файл був видалений з метою "
+"запобігання пошкодження даних. <br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -733,111 +764,129 @@ msgid ""
 "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 ""
+"Enlightenment не може зберегти налаштування <br> через нестачу місця на "
+"диску. Причиною <br> може бути або фізична вада диску, <br> або ви вичерпали "
+"свою квоту дискового <br> <br> простору. Файл в якому <br> <br> виникла "
+"помилка: <br>% s <br> <br> Цей файл був видалений з метою запобігання "
+"пошкодження даних. <br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings 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 ""
+"Enlightenment несподівано отримав файл параметрів<br>і це було записано в "
+"ньому. Це дуже дивно.<br><br>Файл, в якому сталася помилка:<br>%s<br><br>Цей "
+"файл був видалений, щоб уникнути недостовірних даних.<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
-msgstr ""
+msgstr "Проблеми під час збереження параметрів Enlightenment"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
 #: src/modules/conf_performance/e_mod_main.c:34
 msgid "Advanced"
-msgstr ""
+msgstr "Додатково"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
-msgstr ""
+msgstr "Базове"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
-msgstr ""
+msgstr "Застосувати"
 
 #: src/bin/e_configure.c:25 src/bin/e_configure.c:34 src/bin/e_configure.c:37
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
-msgstr ""
+msgstr "Модулі"
 
 #: src/bin/e_configure.c:33 src/modules/conf_shelves/e_mod_main.c:38
 #: src/modules/gadman/e_mod_main.c:25 src/modules/mixer/e_mod_main.c:1079
 msgid "Extensions"
-msgstr ""
+msgstr "Додатки"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
-msgstr ""
+msgstr "Контейнер %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
-msgstr ""
+msgstr "Помилка - немає підтримки PAM"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr ""
+"Підтримка PAM не була вибрана в Enlightenment, тому <br> замикання екрану "
+"відключено."
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
-msgstr ""
+msgstr "Замкнути Не Вдалося"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
+"Не вдалося замкнути стільницю, бо мишка і / або клавіатура <br> утримуються "
+"якимось додатком, це утримування неможливо розірвати"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
-msgstr ""
+msgstr "Будь ласка, введіть Ваш пароль розблокування"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
-msgstr ""
+msgstr "Помилка Системи Авторизації"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
 "The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
 "happening. Please report this bug."
 msgstr ""
+"Авторизації засобами PAM не вдалося налаштувати сесію. <br> Код помилки "
+"<hilight>% i </ hilight>. <br> Це погано, такого не повинно бути. <br> Будь "
+"ласка, повідомте про цю помилку."
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
-msgstr ""
+msgstr "Активувати Режим Презентації?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Ви відкрили Стільницю занадто швидко. <br> <br> Бажаєте активувати режим <b> "
+"презентації </ B> та тимчасово відключити заставку екрану, блокування та "
+"енергозбереження?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
-msgstr ""
+msgstr "Ні, але при цьому збільшити перерву"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
-msgstr ""
+msgstr "Ні, і більше не питати"
 
 #: src/bin/e_eap_editor.c:158
 msgid "Incomplete Window Properties"
-msgstr ""
+msgstr "Неповні Властивості Вікна"
 
 #: src/bin/e_eap_editor.c:159
 msgid ""
@@ -847,12 +896,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 ""
+"Вікно, для якого Ви створюєте іконку, <br> не має назви та класу. <br> Таким "
+"чином, необхідних властивостей для того, <br> щоб ця ікона використовувалась "
+"для <br> вікна надалі, не має. <br> Використовуйте назву вікна замість "
+"цього. <br> Це спрацює якщо тільки назва вікна буде такою самою під <br> час "
+"запуску вікна, та не зміниться надалі."
 
 #: src/bin/e_eap_editor.c:215
 msgid "Desktop Entry Editor"
-msgstr ""
+msgstr "Редактор Програм"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -870,939 +924,946 @@ msgstr "Назва"
 
 #: src/bin/e_eap_editor.c:479
 msgid "Executable"
-msgstr ""
+msgstr "Виконуваний"
 
 #: src/bin/e_eap_editor.c:487
 msgid "Comment"
-msgstr ""
+msgstr "Коментар"
 
 #: src/bin/e_eap_editor.c:512
 msgid "General"
-msgstr ""
+msgstr "Загальні"
 
 #: src/bin/e_eap_editor.c:515
 msgid "Generic Name"
-msgstr ""
+msgstr "Загальна назва"
 
 #: src/bin/e_eap_editor.c:520
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:105
 msgid "Window Class"
-msgstr ""
+msgstr "Клас вікна"
 
 #: src/bin/e_eap_editor.c:524 src/modules/conf_mime/e_int_config_mime.c:179
 msgid "Categories"
-msgstr ""
+msgstr "Категорії"
 
 #: src/bin/e_eap_editor.c:528
 msgid "Mime Types"
-msgstr ""
+msgstr "MIME-типи"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
-msgstr ""
+msgstr "Опції"
 
 #: src/bin/e_eap_editor.c:535
 msgid "Startup Notify"
-msgstr ""
+msgstr "Повідомлення про Запуск"
 
 #: src/bin/e_eap_editor.c:537
 msgid "Run in Terminal"
-msgstr ""
+msgstr "Запустити в Терміналі"
 
 #: src/bin/e_eap_editor.c:539
 msgid "Show in Menus"
-msgstr ""
+msgstr "Показувати в Меню"
 
 #: src/bin/e_eap_editor.c:543
 msgid "Desktop file"
-msgstr ""
+msgstr "Файл Desktop"
 
 #: src/bin/e_eap_editor.c:544
 msgid "Filename"
-msgstr ""
+msgstr "Назва файлу"
 
 #: src/bin/e_eap_editor.c:573
 msgid "Select an Icon"
-msgstr ""
+msgstr "Виберіть Іконку"
 
 #: src/bin/e_eap_editor.c:642
 msgid "Select an Executable"
-msgstr ""
+msgstr "Виберіть Виконуваний Файл"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
-msgstr "Вилучити"
+msgstr "Видалити"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "Вставити"
 
 #: src/bin/e_entry.c:529
 msgid "Select All"
-msgstr "Вибрати всі"
+msgstr "Вибрати Все"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
-msgstr "Запустити помилку"
+msgstr "Помилка запуску"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s<br>"
-msgstr ""
+msgstr "Enlightenment не зміг запустити дочірній процес: <br> <br>% s <br>"
 
-#: src/bin/e_exec.c:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
-msgstr ""
+msgstr "Помилка запуску програми"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
 msgstr ""
+"Enlightenment не зміг запустити додаток: <br> <br>% s <br> <br> програма не "
+"запустилась."
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
-msgstr ""
+msgstr "Помилка Виконання Програми"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
-msgstr ""
+msgstr "% s несподівано закінчив виконання."
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
-msgstr ""
+msgstr "Код виходу %i був повернутий з %s."
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
-msgstr ""
+msgstr "%s перервав Сигналом Переривання."
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr ""
+msgstr "%s перервав Сигналом Виходу."
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr ""
+msgstr "%s перервав Сигналом Аварійного припинення роботи."
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
-msgstr ""
+msgstr "%s було перервано Помилкою Плаваючої Коми."
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
-msgstr ""
+msgstr "%s було перервано Сигналом Uninterruptable Kill."
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
-msgstr ""
+msgstr "%s було перервано Помилкою сегментації."
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
-msgstr ""
+msgstr "%s було перервано Помилкою Broken Pipe."
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
-msgstr ""
+msgstr "%s було перервано Сигналом Завершення."
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
-msgstr ""
+msgstr "%s було перервано Помилкою Bus Error."
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
-msgstr ""
+msgstr "%s було перервано сигналом номер %i."
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
-msgstr ""
+msgstr "*** Залишок виведення був обрізаний. Збережіть для перегляду. ***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
-msgstr ""
+msgstr "Лог Помилки"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
-msgstr ""
+msgstr "Не було повідомлення про помилку."
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
-msgstr ""
+msgstr "Зберегти Це Повідомлення"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
-msgstr ""
+msgstr "Цей лог про помилку буде збережений як %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
-msgstr ""
+msgstr "Інформація про Помилку"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
-msgstr ""
+msgstr "Інформація Сигналу про Помилку"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
-msgstr ""
+msgstr "Вихід Даних"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
-msgstr ""
+msgstr "Не було ніяких даних."
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
-msgstr ""
+msgstr "Неіснуючий шлях"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
-msgstr ""
+msgstr "%s не існує."
 
-#: src/bin/e_fm.c:3039
-#, fuzzy
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr "Запустити помилку"
+msgstr "Помилка підключення"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "Не вдається підключити пристрій"
 
-#: src/bin/e_fm.c:3055
-#, fuzzy
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr "Запустити помилку"
+msgstr "Помилка відключення"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "Не вдається відключити пристрій"
 
-#: src/bin/e_fm.c:3070
-#, fuzzy
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr "Запустити помилку"
+msgstr "Помилка вилучення"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "Не вдається витягти пристрій"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
-msgstr ""
+msgstr "%i Файли"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "Посилання"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
-msgstr "Про"
+msgstr "Відмінити"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
-msgstr ""
+msgstr "Успадковувати батьківські налаштування"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
-msgstr ""
+msgstr "Режим Відображення"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
-msgstr ""
+msgstr "Оновити Вид"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
-msgstr ""
+msgstr "Показати Приховані Файли"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
-msgstr ""
+msgstr "Запам'ятати Черговість"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
-msgstr ""
+msgstr "Сортуванти"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
-msgstr ""
+msgstr "Нова Тека"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
-msgstr ""
+msgstr "Перейменувати"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "Розмонтувати"
 
-#: src/bin/e_fm.c:8112
-#, fuzzy
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr "Про"
+msgstr "Змонтувати"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
-msgstr ""
+msgstr "Витягти"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
-msgstr ""
+msgstr "Властивості"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
-msgstr ""
+msgstr "Використовувати параметри за замовчуванням"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
-msgstr ""
+msgstr "Сітка Іконок"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
-msgstr ""
+msgstr "Свої Іконки"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "Список"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
-msgstr ""
+msgstr "Розмір Іконки (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
-msgstr ""
+msgstr "Встановити фон ..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
-msgstr ""
+msgstr "Налаштувати накладання ..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "Очистити"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "Створити нову теку"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
-msgstr ""
+msgstr "Назва Нової Теки:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
-msgstr ""
+msgstr "Перейменувати %s до:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
-msgstr "Змінити назву файла"
+msgstr "Перейменувати Файл"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
-msgstr ""
+msgstr "Спробувати ще раз"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
-msgstr ""
+msgstr "Помилка"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
-msgstr "Ні для всіх"
+msgstr "Ні для всього"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
-msgstr "Так для всіх"
+msgstr "Так для всього"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "Попередження"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
-msgstr ""
+msgstr "Файл вже існує, перезаписати?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
-msgstr "Проігнорувати це"
+msgstr "Пропустити це"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "Ігнорувати все"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
-msgstr ""
+msgstr "Сталася помилка під час виконання операції.<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
-msgstr ""
+msgstr "Підтвердіть вилучення"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
-msgstr ""
+msgstr "Ви впевнені, що хочете видалити<br><hilight>%s</hilight> ?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
 "hilight> ?"
 msgstr ""
+"Ви впевнені, що хочете видалити<br>the %d вибраних файлів з:<br><hilight>%s</"
+"hilight> ?"
 
 #: src/bin/e_fm_prop.c:108
 msgid "File Properties"
-msgstr ""
+msgstr "Властивості Файлу"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "Файл:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "Розмір:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
-msgstr ""
+msgstr "Остання Зміна:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
-msgstr ""
+msgstr "Тип Файлу:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
-msgstr ""
+msgstr "Дозволи"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "Власник:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
-msgstr ""
+msgstr "Інші можуть читати"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
-msgstr ""
+msgstr "Інші можуть писати"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
-msgstr ""
+msgstr "Власник може читати"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
-msgstr ""
+msgstr "Власник може писати"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: 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 "Попередній перегляд"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
-msgstr ""
+msgstr "За замовчуванням"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
-msgstr ""
+msgstr "Мініатюра"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
-msgstr ""
+msgstr "Власні"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
-msgstr ""
+msgstr "Використовувати цю іконку для всіх файлів такого типу"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
-msgstr ""
+msgstr "Інформація про посилання"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
-msgstr ""
+msgstr "Вибрати зображення"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
-msgstr ""
+msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
-msgstr ""
+msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
-msgstr ""
+msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
-msgstr ""
+msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
-msgstr ""
+msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
-msgstr ""
+msgstr "Невідомий Носій"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
-msgstr ""
+msgstr "Змінний пристрій"
+
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr "Рухати цей ґаджет до"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
-msgstr ""
+msgstr "Гладко"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
-msgstr ""
+msgstr "Вкладка"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
-msgstr ""
+msgstr "Вигляд"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
-msgstr ""
+msgstr "Автоматична прокрутка вмісту"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
-msgstr ""
+msgstr "Може змінювати розмір"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
-msgstr ""
+msgstr "Почати рух/змінити розмір цього гаджету"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
-msgstr ""
+msgstr "Видалити цей гаджет"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
-msgstr ""
+msgstr "Завершити рух/зміну розміру цього гаджету"
 
 #: src/bin/e_hints.c:151
 msgid ""
 "A previous instance of Enlightenment is still active\n"
 "on this screen. Aborting startup.\n"
 msgstr ""
+"Попередня субстанція Enlightenment ще працює\n"
+"на цьому екрані. Відміняю запуск.\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
-msgstr ""
+msgstr "Замки Вікна"
 
 #: src/bin/e_int_border_locks.c:285
 msgid "Generic Locks"
-msgstr ""
+msgstr "Звичайні Замки"
 
 #: src/bin/e_int_border_locks.c:286
 msgid "Lock the Window so it does only what I tell it to"
-msgstr ""
+msgstr "Обмежити це вікно  тільки тим, що я скажу робити"
 
 #: src/bin/e_int_border_locks.c:288
 msgid "Protect this window from me accidentally changing it"
-msgstr ""
+msgstr "Захистити це вікно від випадкової зміни мною"
 
 #: src/bin/e_int_border_locks.c:290
 msgid ""
 "Protect this window from being accidentally closed because it is important"
-msgstr ""
+msgstr "Захистити це вікно від випадкового закриття - Важливе Вікно"
 
 #: src/bin/e_int_border_locks.c:292
 msgid "Do not allow the border to change on this window"
-msgstr ""
+msgstr "Не дозволяти зміну меж цього вікна"
 
 #: src/bin/e_int_border_locks.c:295
 msgid "Remember these Locks for this window next time it appears"
-msgstr ""
+msgstr "Запам'ятати Замки для цього вікна якщо воно з'явиться наступного разу"
 
 #: src/bin/e_int_border_locks.c:308
 msgid "Lock program changing:"
-msgstr ""
+msgstr "Заборона програмам змінювати:"
 
 #: src/bin/e_int_border_locks.c:309 src/bin/e_int_border_locks.c:328
-#: src/bin/e_int_border_remember.c:511
+#: src/bin/e_int_border_remember.c:702
 msgid "Position"
-msgstr ""
+msgstr "Позицію"
 
 #: src/bin/e_int_border_locks.c:311 src/bin/e_int_border_locks.c:330
-#: src/bin/e_int_border_remember.c:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 msgid "Size"
-msgstr ""
+msgstr "Кегль"
 
 #: src/bin/e_int_border_locks.c:313 src/bin/e_int_border_locks.c:332
-#: src/bin/e_int_border_menu.c:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
-msgstr ""
+msgstr "Позиціювання"
 
 #: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334
 msgid "Iconified state"
-msgstr ""
+msgstr "Згорнутий стан"
 
 #: src/bin/e_int_border_locks.c:317 src/bin/e_int_border_locks.c:336
-#: src/bin/e_int_border_remember.c:523
+#: src/bin/e_int_border_remember.c:720
 msgid "Stickiness"
-msgstr ""
+msgstr "Стан прилипання"
 
 #: src/bin/e_int_border_locks.c:319 src/bin/e_int_border_locks.c:338
-#: src/bin/e_int_border_remember.c:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
-msgstr ""
+msgstr "Згорнутий стан"
 
 #: src/bin/e_int_border_locks.c:321 src/bin/e_int_border_locks.c:340
 msgid "Maximized state"
-msgstr ""
+msgstr "Збільшений стан"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
-msgstr ""
+msgstr "На повний екран"
 
 #: src/bin/e_int_border_locks.c:327
 msgid "Lock me from changing:"
-msgstr ""
+msgstr "Заборонити мені змінювати:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
-msgstr ""
+msgstr "Стиль бордюра"
 
 #: src/bin/e_int_border_locks.c:348
 msgid "Stop me from:"
-msgstr ""
+msgstr "Не дозволяти мені:"
 
 #: src/bin/e_int_border_locks.c:349
 msgid "Closing the window"
-msgstr ""
+msgstr "Закрити це вікно"
 
 #: src/bin/e_int_border_locks.c:351
 msgid "Exiting my login with this window open"
-msgstr ""
+msgstr "Вийти з сесії коли це вікно відкрите"
 
 #: src/bin/e_int_border_locks.c:355
 msgid "Remember these Locks"
-msgstr ""
+msgstr "Запам'ятати ці Замки"
 
 #: src/bin/e_int_border_menu.c:73
 msgid "Edit Icon"
-msgstr ""
+msgstr "Редагувати Іконку"
 
 #: src/bin/e_int_border_menu.c:78
 msgid "Add Application..."
-msgstr ""
+msgstr "Додати Додаток ..."
 
 #: src/bin/e_int_border_menu.c:89
 msgid "Create Icon"
-msgstr ""
+msgstr "Створити Іконку"
 
 #: src/bin/e_int_border_menu.c:99
 msgid "Send to Desktop"
-msgstr ""
+msgstr "Переслати на Стільницю"
 
 #: src/bin/e_int_border_menu.c:111
 msgid "Pin to Desktop"
-msgstr ""
+msgstr "Прикріпити до Стільниці"
 
 #: src/bin/e_int_border_menu.c:122
 msgid "Unpin from Desktop"
-msgstr ""
+msgstr "Відкріпити від Стільниці"
 
 #: src/bin/e_int_border_menu.c:131
 msgid "More..."
-msgstr ""
+msgstr "Ще..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
-msgstr ""
+msgstr "Опустити"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
-msgstr ""
+msgstr "Збільшити вертикально"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
-msgstr ""
+msgstr "Збільшити горизонтально"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
-msgstr ""
+msgstr "Звичайний розмір"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
-msgstr ""
+msgstr "Комбінація Клавіш"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
-msgstr ""
+msgstr "До Меню Вибраного"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
-msgstr ""
+msgstr "До Панелі Запуску"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
-msgstr ""
+msgstr "Бордюр"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
-msgstr ""
+msgstr "Пропустити"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
-msgstr ""
+msgstr "Стан"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
-msgstr ""
+msgstr "Запам'ятати"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
-msgstr ""
+msgstr "Властивості Вікна"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
-msgstr ""
+msgstr "Завжди Зверху"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
-msgstr ""
+msgstr "Нормально"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
-msgstr ""
+msgstr "Завжди Знизу"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
-msgstr ""
+msgstr "Вибір Стилю Бордюру"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
-msgstr ""
+msgstr "Піктограма від Е17"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
-msgstr ""
+msgstr "Піктограма від Додатку "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
-msgstr ""
+msgstr "Піктограма від Користувача"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
-msgstr ""
+msgstr "Згорнутий"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
-msgstr ""
+msgstr "Липкий"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
-msgstr ""
+msgstr "Повний Екран"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
-msgstr ""
-
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+msgstr "Перелік Вікон"
+
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
-msgstr ""
+msgstr "Пейджер"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
-msgstr ""
+msgstr "Панель завдань"
 
 #: 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
 msgid "ICCCM Properties"
-msgstr ""
+msgstr "Властивості ICCCM"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "Заголовок"
 
 #: src/bin/e_int_border_prop.c:421
 msgid "Class"
-msgstr ""
+msgstr "Клас"
 
 #: src/bin/e_int_border_prop.c:422 src/bin/e_int_border_prop.c:468
 msgid "Icon Name"
-msgstr ""
+msgstr "Назва Іконки"
 
 #: src/bin/e_int_border_prop.c:423
 msgid "Machine"
-msgstr ""
+msgstr "Машина"
 
 #: src/bin/e_int_border_prop.c:424
 msgid "Role"
-msgstr ""
+msgstr "Role"
 
 #: src/bin/e_int_border_prop.c:426
 msgid "Minimum Size"
-msgstr ""
+msgstr "Мінімальний розмір"
 
 #: src/bin/e_int_border_prop.c:427
 msgid "Maximum Size"
-msgstr ""
+msgstr "Максимальний розмір"
 
 #: src/bin/e_int_border_prop.c:428
 msgid "Base Size"
-msgstr ""
+msgstr "Базовий Розмір"
 
 #: src/bin/e_int_border_prop.c:429
 msgid "Resize Steps"
-msgstr ""
+msgstr "Крок Зміни Розміру"
 
 #: src/bin/e_int_border_prop.c:431
 msgid "Aspect Ratio"
-msgstr ""
+msgstr "Співвідношення Сторін"
 
 #: src/bin/e_int_border_prop.c:432
 msgid "Initial State"
-msgstr ""
+msgstr "Початковий стан"
 
 #: src/bin/e_int_border_prop.c:434
 msgid "Window ID"
-msgstr ""
+msgstr "ID Вікна"
 
 #: src/bin/e_int_border_prop.c:435
 msgid "Window Group"
-msgstr ""
+msgstr "Група Вікна"
 
 #: src/bin/e_int_border_prop.c:436
 msgid "Transient For"
-msgstr ""
+msgstr "Перехідний процес"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr ""
+msgstr "Лідер Клієнта"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
-msgstr ""
+msgstr "Гравітація"
 
 #: src/bin/e_int_border_prop.c:441
 msgid "Take Focus"
-msgstr ""
+msgstr "Забирає Фокус"
 
 #: src/bin/e_int_border_prop.c:442
 msgid "Accepts Focus"
-msgstr ""
+msgstr "Приймає Фокус"
 
 #: src/bin/e_int_border_prop.c:443
 msgid "Urgent"
-msgstr ""
+msgstr "Термінове"
 
 #: src/bin/e_int_border_prop.c:444
 msgid "Request Delete"
-msgstr ""
+msgstr "Запит на видалення"
 
 #: src/bin/e_int_border_prop.c:445
 msgid "Request Position"
-msgstr ""
+msgstr "Запросив Позицію"
 
 #: src/bin/e_int_border_prop.c:466
 msgid "NetWM Properties"
-msgstr ""
+msgstr "Властивості NetWM"
 
 #: src/bin/e_int_border_prop.c:471
 msgid "Modal"
-msgstr ""
+msgstr "Модульне"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
-msgstr ""
+msgstr "Пропускає Taskbar"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
-msgstr ""
+msgstr "Пропускає Пейджер"
 
 #: src/bin/e_int_border_prop.c:476
 msgid "Hidden"
-msgstr ""
+msgstr "Приховане"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
-msgstr ""
+msgstr "Запам'ятати Вікно"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
-msgstr ""
+msgstr "Властивості цього вікна не є унікальним збігом"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1815,107 +1876,121 @@ msgid ""
 "settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
 "sure and nothing will be affected."
 msgstr ""
-
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+"Ви просите щоб Enlightenment запам'ятав застосування<br>властивостей (типу "
+"розміру, місця розташування, стиль межі і т.д.)<br>до вікна, яке<hilight>не "
+"має унікальних властивостей</ hilight>.<br> <br>Це означає, що це вікно "
+"поділяє властивості<br>(типу Назва / Клас, Швидкоплинність, Роль і т.д.)"
+"<br>більш ніж з 1 вікном на екрані, властивості запам'ятовування<br>для "
+"цього вікна так-само застосовуються для всіх інших вікон,<br>що відповідають "
+"цим властивостям.<br><br>Це повідомлення - лише попередження на випадок, "
+"якщо Ви<br>не хотіли щоб таке трапилося.<br>Якщо ж Ви дійсно хочете це "
+"зробити, просто натисніть<hilight>Застосувати</ hilight>або<hilight>Так</ "
+"hilight><br>і ваш вибір буде прийнятий. Якщо ви не впевнені,"
+"<br>натисніть<hilight>Скасувати</ hilight>, і нічого не буде порушено."
+
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
-msgstr ""
+msgstr "Не визначено властивості збігу"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window <hilight>without "
 "specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
 "way of remembering this window."
 msgstr ""
+"Ви просите Enlightenment запам'ятати застосування властивостей<br>(типу "
+"розміру, розташування, стилю межі, і т.д.) для<br>вікна<hilight>без вказівки "
+"способу запам'ятовування</ hilight>.<br><br>Ви маєте визначити принаймні 1 "
+"спосіб запам'ятати це вікно."
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
-msgstr ""
+msgstr "Нічого"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
-msgstr ""
+msgstr "Розмір та Позицію"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
-msgstr ""
+msgstr "Замки"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
-msgstr ""
+msgstr "Розмір, Позицію та Замки"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
-msgstr ""
+msgstr "Все"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
-msgstr ""
+msgstr "Запам'ятати використовуючи"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr ""
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr "Назва Вікна"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr "Клас Вікна"
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
-msgstr ""
+msgstr "Роль вікна"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
-msgstr ""
+msgstr "Тип Вікна"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr "wildcard matches are allowed"
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
-msgstr ""
+msgstr "Швидкоплинність"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
-msgstr ""
+msgstr "Запам'ятати властивості"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
-msgstr ""
+msgstr "Перевага Іконки"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
-msgstr ""
+msgstr "Віртуальна Стільниця"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
-msgstr ""
+msgstr "Поточний екран"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
-msgstr ""
+msgstr "Пропуск Вікна"
 
-#: src/bin/e_int_border_remember.c:541
-msgid "Match only one window"
-msgstr ""
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr "Файл додатку або назва (.desktop)"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr ""
+#: src/bin/e_int_border_remember.c:752
+msgid "Match only one window"
+msgstr "Співпадає тільки одне вікно"
 
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
-msgstr ""
+msgstr "Автоматично фокусувати під час запуску"
+
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr "Зберегти поточні властивості"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "Запустити цю програму під час логіну"
 
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
@@ -1923,7 +1998,7 @@ msgstr ""
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "Налаштування"
@@ -1932,75 +2007,75 @@ msgstr "Налаштування"
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 #: src/modules/wizard/page_050.c:26
 msgid "File Manager"
-msgstr ""
+msgstr "Файловий менеджер"
 
 #: src/bin/e_int_config_modules.c:44
 msgid "Shelf"
-msgstr ""
+msgstr "Поличка"
 
 #: src/bin/e_int_config_modules.c:120
 msgid "Module Settings"
-msgstr ""
+msgstr "Налаштування Модулів"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
-msgstr ""
+msgstr "Доступні Модулі"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
-msgstr ""
+msgstr "Завантажити Модуль"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
-msgstr ""
+msgstr "Завантажені Модулі"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
-msgstr ""
+msgstr "Вивантажити Модуль"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
-msgstr ""
+msgstr "Опис: Недоступно"
 
 #: src/bin/e_int_gadcon_config.c:36
 msgid "Shelf Contents"
-msgstr ""
+msgstr "Вміст Полички"
 
 #: src/bin/e_int_gadcon_config.c:42
 msgid "Toolbar Contents"
-msgstr ""
+msgstr "Вміст Панелі Інструментів"
 
 #: src/bin/e_int_gadcon_config.c:120 src/modules/gadman/e_mod_config.c:106
 msgid "Available Gadgets"
-msgstr ""
+msgstr "Доступні Гаджети"
 
 #: src/bin/e_int_gadcon_config.c:127 src/modules/gadman/e_mod_config.c:117
 msgid "Add Gadget"
-msgstr ""
+msgstr "Додати Гаджет"
 
 #: src/bin/e_int_gadcon_config.c:133
 msgid "Selected Gadgets"
-msgstr ""
+msgstr "Вибрані Гаджети"
 
 #: src/bin/e_int_gadcon_config.c:140
 msgid "Remove Gadget"
-msgstr ""
+msgstr "Прибрати Гаджет"
 
 #: src/bin/e_int_toolbar_config.c:30 src/bin/e_toolbar.c:335
 msgid "Toolbar Settings"
-msgstr ""
+msgstr "Налаштування панелі інструментів"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
-msgstr ""
+msgstr "Розташування"
 
 #: src/bin/e_intl.c:361
 msgid "Input Method Error"
-msgstr ""
+msgstr "Помилка Методу Введення"
 
 #: src/bin/e_intl.c:362
 msgid ""
@@ -2008,22 +2083,25 @@ msgid ""
 "input<br>method configuration is correct and<br>that your "
 "configuration's<br>executable is in your PATH<br>"
 msgstr ""
+"Помилка запуску виконуваного файлу методів введення<br><br>будь ласка "
+"переконайтесь, що конфігурація<br>методів введення вірна і файл "
+"вказаний<br>в конфігурації методів введення знаходиться в PATH<br>"
 
 #: src/bin/e_int_menus.c:89
 msgid "Main"
-msgstr ""
+msgstr "Головне"
 
 #: src/bin/e_int_menus.c:106
 msgid "Favorite Applications"
 msgstr "Улюблені програми"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "Програми"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2032,13 +2110,13 @@ msgstr "Програми"
 msgid "Windows"
 msgstr "Вікна"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
-msgstr ""
+msgstr "Загублені Вікна"
 
 #: src/bin/e_int_menus.c:170
 msgid "About"
-msgstr "Про"
+msgstr "Про..."
 
 #: src/bin/e_int_menus.c:175 src/modules/conf_theme/e_mod_main.c:39
 #: src/modules/conf_theme/e_mod_main.c:40
@@ -2048,151 +2126,150 @@ msgstr "Тема"
 
 #: src/bin/e_int_menus.c:262
 msgid "Virtual"
-msgstr ""
+msgstr "Віртуальний"
 
 #: src/bin/e_int_menus.c:269 src/modules/conf_shelves/e_mod_main.c:39
 #: src/modules/conf_shelves/e_mod_main.c:41
 #: src/modules/conf_shelves/e_mod_main.c:85
 msgid "Shelves"
-msgstr ""
+msgstr "Полички"
 
 #: src/bin/e_int_menus.c:278
 msgid "Show/Hide All Windows"
-msgstr ""
+msgstr "Показати/Сховати Всі Вікна"
 
 #: src/bin/e_int_menus.c:575
 msgid "(No Applications)"
-msgstr ""
+msgstr "(Немає додатків)"
 
 #: src/bin/e_int_menus.c:709
 msgid "Set Virtual Desktops"
-msgstr ""
+msgstr "Налаштувати Віртуальні Стільниці"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
-msgstr ""
+msgstr "(Немає Вікон)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
-msgstr "Нема назви!!"
+msgstr "Немає назви!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
-msgstr ""
+msgstr "(Немає Поличок)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
-msgstr ""
+msgstr "Поличка #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
-msgstr ""
+msgstr "Додати Поличку"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
-msgstr ""
+msgstr "Видалити Поличку"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
-msgstr ""
+msgstr "Налаштування Полички"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "Крихітний"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
-msgstr "Малий"
+msgstr "Маленький"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "Середній"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "Великий"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
-msgstr "Громадний"
+msgstr "Величезний"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
-msgstr ""
+msgstr "Налаштувати вміст..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
-msgstr ""
+msgstr "Над Усім"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
-msgstr ""
+msgstr "Під Вікнами"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
-msgstr ""
+msgstr "Під Усім"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
-msgstr ""
+msgstr "Дозволяти вікнам перекривати поличку"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
-msgstr ""
+msgstr "Стискати до Обсягу вмісту"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f пікселів"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "Стилі"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
-msgstr ""
+msgstr "Автоматично ховати"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
-msgstr ""
+msgstr "Автоматично ховати поличку"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
-msgstr ""
+msgstr "Показувати коли мишка в"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
-msgstr ""
+msgstr "Показувати коли клацнути мишкою"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
-msgstr ""
+msgstr "Час затримки до приховування"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
-msgstr ""
+msgstr "%.1f секунд"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
-msgstr ""
+msgstr "Час приховування"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
-msgstr ""
+msgstr "Показувати на всіх Стільницях"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
-msgstr ""
+msgstr "Показувати на зазначених Стільницях"
 
 #: src/bin/e_ipc.c:47
 #, c-format
@@ -2204,6 +2281,12 @@ msgid ""
 "or is not owned by you. Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"Можлива Спроба Зламти IPC. Каталог гнізда IPC\n"
+"вже існує, АЛЕ має помилкові взаємозв'язки\n"
+"(повинно бути читабельним та перезаписуваним\n"
+"тільки власником, і більше ніким), або не\n"
+" належить Вам. Будь ласка, перевірте:\n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:57
 #, c-format
@@ -2213,6 +2296,10 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"Каталог IPC гнізда не може бути створений або\n"
+"досліджений.\n"
+"Будь ласка, перевірте: \n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
 #, c-format
@@ -2242,66 +2329,110 @@ msgid ""
 "\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
 "\t\tIf you need this help, you don't need this option.\n"
 msgstr ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+"\t-profile CONF_PROFILE\n"
+"\t\tUse the configuration profile CONF_PROFILE instead of the user selected "
+"default or just \"default\".\n"
+"\t-good\n"
+"\t\tBe good.\n"
+"\t-evil\n"
+"\t\tBe evil.\n"
+"\t-psychotic\n"
+"\t\tBe psychotic.\n"
+"\t-locked\n"
+"\t\tStart with desklock on, so password will be asked.\n"
+"\t-i-really-know-what-i-am-doing-and-accept-full-responsibility-for-it\n"
+"\t\tIf you need this help, you don't need this option.\n"
 
 #: src/bin/e_main.c:385
 msgid ""
 "Enlightenment cannot Initialize Ecore!\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати Ecore!\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:411
 msgid ""
 "Enlightenment cannot initialize the File system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати файлову систему.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:424
 msgid ""
 "Enlightenment cannot set up an exit signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може налаштувати вказівник сигналу виходу.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:430
 msgid ""
 "Enlightenment cannot set up a HUP signal handler.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може налаштувати вказівник сигналу HUP.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:442
 msgid ""
 "Enlightenment cannot initialize its X connection.\n"
 "Have you set your DISPLAY variable?"
 msgstr ""
+"Enlightenment не може ініціалізувати підключення до X.\n"
+"Ви налаштували перемінну DISPLAY?"
 
 #: src/bin/e_main.c:450
 msgid ""
 "Enlightenment cannot initialize its emergency alert system.\n"
 "Have you set your DISPLAY variable?"
 msgstr ""
+"Enlightenment не може ініціалізувати аварійну систему повідомлень.\n"
+"Ви налаштували перемінну DISPLAY?"
 
 #: src/bin/e_main.c:473
 msgid ""
 "Enlightenment cannot initialize the connections system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати систему підключень.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:481
 msgid ""
 "Enlightenment cannot initialize the IPC system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати систему IPC.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:490
 msgid ""
 "Enlightenment cannot setup xinerama wrapping.\n"
 "This should not happen."
 msgstr ""
+"Enlightenment не може налаштувати оболонку xinerama.\n"
+"Таке не може траплятися."
 
 #: src/bin/e_main.c:509
 msgid ""
 "Enlightenment cannot initialize the Evas system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати систему Evas.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:515
 msgid ""
@@ -2309,6 +2440,9 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software X11 rendering engine."
 msgstr ""
+"Enlightenment виявив, що ecore_evas не підтримує Software X11\n"
+"надання в Evas. Будь ласка, перевірте вашу установку Evas і Ecore\n"
+"та переконайтеся, що вони підтримують надання Software X11."
 
 #: src/bin/e_main.c:522
 msgid ""
@@ -2316,358 +2450,400 @@ msgid ""
 "rendering in Evas. Please check your installation of Evas and\n"
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
+"Enlightenment виявив, що ecore_evas не підтримує Software Buffer\n"
+"надання в Evas. Будь ласка, перевірте вашу установку Evas та\n"
+"Ecore і переконайтеся, що вони підтримують надання Software Buffer."
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
 msgid ""
 "Enlightenment cannot initialize the FDO desktop system.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може ініціалізувати FDO систему столу.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:559
 msgid ""
 "Enlightenment cannot create directories in your home directory.\n"
 "Perhaps you have no home directory or the disk is full?"
 msgstr ""
+"Enlightenment не може створити каталоги у вашому домашньому каталозі.\n"
+"Можливо, у вас немає домашнього катологу або диск заповнений?"
 
 #: src/bin/e_main.c:569
 msgid "Enlightenment cannot set up its file registry system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему реєстру файлів."
 
 #: src/bin/e_main.c:578
 msgid "Enlightenment cannot set up its config system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему налаштувань."
 
 #: src/bin/e_main.c:592
 msgid "Enlightenment cannot set up its scale system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему числення."
 
 #: src/bin/e_main.c:600
 msgid "Enlightenment cannot set up the pointer system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати систему покажчиків."
 
 #: src/bin/e_main.c:609
 msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може налаштувати шляхи для пошуку файлів.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
 #: src/bin/e_main.c:627
 msgid "Enlightenment cannot set up its font system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему шрифтів."
 
 #: src/bin/e_main.c:638
 msgid "Enlightenment cannot set up its theme system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему тем."
 
 #: src/bin/e_main.c:643
 msgid "Starting International Support"
-msgstr ""
+msgstr "Запускається Багатомовна Підтримка"
 
 #: src/bin/e_main.c:648
 msgid "Enlightenment cannot set up its intl system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему мов."
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
 msgstr ""
+"Enlightenment не може налаштувати екран ініціалізації.\n"
+"Можливо, у вас недостатньо пам'яті?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
-msgstr ""
+msgstr "Перевірка Підтримки Форматів"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
+"Enlightenment виявив, що Evas не може створити буферний шар. Будь ласка, "
+"перевірте,\n"
+"чи Evas підтримує двигунець Software Buffer.\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли PNG. Перевірте,\n"
+"чи Evas має підтримку завантажувача PNG.\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли JPEG. Перевірте,\n"
+"чи Evas має підтримку завантажувача JPEG.\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment виявив, що Evas не може завантажувати файли EET. Перевірте,\n"
+"чи Evas має підтримку завантажувача EET.\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
+"Enlightenment виявив, що Evas не може завантажити шрифт 'Sans'. Перевірте,\n"
+"чи має Evas підтримку в fontconfig, та чи розпізнає fontconfig шрифт "
+"'Sans'.\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
-msgstr ""
+msgstr "Налаштування Екранів"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
+"Налаштування управління вікнами для всіх екранів у вашій системі не "
+"вдалася.\n"
+"Може запущений інший менеджер вікон?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
-msgstr ""
+msgstr "Налаштування Зберігача Екрану"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
-msgstr ""
+msgstr "Enlightenment не може налаштувати зберігач екрану."
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
-msgstr ""
+msgstr "Налаштування Замикання Стільниці"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему замикання Стільниці"
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
-msgstr ""
+msgstr "Іде Налаштування Шляхів"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
-msgstr ""
+msgstr "Налаштування Системи Управління"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
-msgstr ""
+msgstr "Enlightenment не може налаштувати систему Системних Команд.\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
-msgstr ""
+msgstr "Налаштування Дій"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
-msgstr ""
-
-#: src/bin/e_main.c:806
-msgid "Setup Execution System"
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему дій"
 
 #: src/bin/e_main.c:811
-msgid "Enlightenment cannot set up its exec system."
-msgstr ""
+msgid "Setup Execution System"
+msgstr "Налаштування Системи Запуску"
 
 #: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr ""
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr ""
+msgid "Enlightenment cannot set up its exec system."
+msgstr "Enlightenment не може налаштувати свою систему запуску."
 
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
-msgstr ""
+msgstr "Налаштування FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
-msgstr ""
+msgstr "Enlightenment не може ініціалізувати менеджер файлів.\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
-msgstr ""
+msgstr "Налаштування Системи Повідомлень"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему повідомлень."
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
-msgstr ""
+msgstr "Налаштування DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему DND."
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr ""
+msgstr "Налаштування Grab Input Handling"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr ""
+"Enlightenment не може налаштувати свою систему обробки захоплення вводу."
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
-msgstr ""
+msgstr "Налаштування Модулів"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему модулів."
+
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "Налаштування Запам'ятовуваннь"
 
 #: src/bin/e_main.c:889
-msgid "Setup Color Classes"
-msgstr ""
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment не може налаштувати запам'ятовування налаштувань."
 
 #: src/bin/e_main.c:894
-msgid "Enlightenment cannot set up its color class system."
-msgstr ""
+msgid "Setup Color Classes"
+msgstr "Налаштування Класів Кольорів"
 
 #: src/bin/e_main.c:899
-msgid "Setup Gadcon"
-msgstr ""
+msgid "Enlightenment cannot set up its color class system."
+msgstr "Enlightenment не може налаштувати свою систему класів кольорів."
 
 #: src/bin/e_main.c:904
-msgid "Enlightenment cannot set up its gadget control system."
-msgstr ""
+msgid "Setup Gadcon"
+msgstr "Налаштування Контейнера Гаджетів"
 
 #: src/bin/e_main.c:909
-msgid "Setup DPMS"
-msgstr ""
+msgid "Enlightenment cannot set up its gadget control system."
+msgstr "Enlightenment не може налаштувати свою систему управління гаджетами."
 
 #: src/bin/e_main.c:914
+msgid "Setup DPMS"
+msgstr "Налаштування DPMS"
+
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
-msgstr ""
+msgstr "Enlightenment не може налаштувати DPMS."
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
-msgstr ""
+msgstr "Налаштувати Енергозбереження"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
-msgstr ""
+msgstr "Enlightenment не може налаштувати систему енергозбереження."
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
-msgstr ""
+msgstr "Налаштування Фону Стільниці"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему фону стільниці."
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
-msgstr ""
+msgstr "Налаштування Мишки"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
-msgstr ""
+msgstr "Enlightenment не може налаштувати параметри мишки."
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
-msgstr ""
+msgstr "Налаштування Призначень"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему прив'язок."
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
-msgstr ""
+msgstr "Налаштування Підказок"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему підказок."
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
-msgstr ""
+msgstr "Налаштування Поличок"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему поличок."
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
-msgstr ""
+msgstr "Налаштування Thumbnailer"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
-msgstr ""
+msgstr "Enlightenment не може налаштувати систему Thumbnailing.\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
-msgstr ""
+msgstr "Налаштувати Черговість Файлів"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
-msgstr ""
+msgstr "Enlightenment не може налаштувати свою систему черг."
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
-msgstr ""
+msgstr "Завантажити Модулі"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
 "problem<br>modules from your configuration. The module<br>configuration "
 "dialog should let you select your<br>modules again."
 msgstr ""
+"Enlightenment дав збій на ранній стадії запуску і був перезавантажений."
+"<br>Всі модулі вимкнені і не будуть завантажені, щоб допомогти<br>усунути "
+"будь-яку проблему з модулями у Вашій конфігурації.<br>Діалог конфігурації "
+"модулів дозволить Вам вибрати потрібні<br>модулі заново."
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
-msgstr ""
+msgstr "Enlightenment дав збій на старті і був перезавантажений"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
+"Enlightenment дав збій на ранній стадії запуску і був перезавантажений."
+"<br>Всі модулі вимкнені і не будуть завантажені, щоб допомогти<br>усунути "
+"будь-яку проблему з модулями у Вашій конфігурації.<br>Діалог конфігурації "
+"модулів дозволить Вам вибрати потрібні<br>модулі заново."
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
-msgstr ""
+msgstr "Параметри поличок"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
-msgstr ""
+msgstr "Майже готове"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, 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 ""
+"Виникла помилка завантаження модуля з ім'ям:%s<br>Модуль з ім'ям%s не був "
+"знайдений в<br>каталогах пошуку модулів<br>."
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
-msgstr ""
+msgstr "Помилка завантаження модуля"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, 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 ""
+"Виникла помилка завантаження модуля з ім'ям:%s<br>Повний шлях до цього "
+"модуля:<br>%s<br>Повідомлення про помилку було:<br>%s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
-msgstr ""
+msgstr "Модуль не має всіх необхідних функцій"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
 "module API version of: %i.<br>The module API advertized by Enlightenment is: "
 "%i.<br>"
 msgstr ""
+"Помилка API Модуля<br>Помилка ініціалізації Модуля:%s<br>Він вимагає "
+"мінімальну версію API модуля:%i.<br>Версія API модуля оголошена для "
+"Enlightenment Ñ”:%i.<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
-msgstr ""
+msgstr "Модуль%s для Enlightenment"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
-msgstr ""
+msgstr "Хочете вивантажити цей модуль?<br>"
 
 #: src/bin/e_screensaver.c:99
 msgid ""
@@ -2675,162 +2851,178 @@ msgid ""
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
+"Ви відключили зберігач екрану занадто швидко.<br><br>Чи Ви хочете ввімкнути "
+"режим<b>презентації</ B> та тимчасово відключити екранну заставку, "
+"блокування Стільниці та енергозбереження?"
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
-msgstr ""
+msgstr "Ви дійсно хочете видалити цю поличку?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
-msgstr ""
+msgstr "Ви запросили видалити цю поличку.<br><br>Ви дійсно хочете видалити її?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
-msgstr ""
+msgstr "Закінчити Переміщення/Зміну Розміру Елементів"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
-msgstr ""
+msgstr "Почати Переміщення/Зміну Розміру Елементів"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
-msgstr ""
+msgstr "Налаштувати Вміст Полички"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
-msgstr ""
+msgstr "Видалити цю Поличку"
 
 #: src/bin/e_startup.c:66
 msgid "Starting"
-msgstr ""
+msgstr "Запускається"
 
 #: src/bin/e_sys.c:170
 msgid "Checking System Permissions"
-msgstr ""
+msgstr "Перевірка Системних Взаємозв'язків"
 
 #: src/bin/e_sys.c:208 src/bin/e_sys.c:219 src/bin/e_sys.c:228
 #: src/bin/e_sys.c:237
 msgid "System Check Done"
-msgstr ""
+msgstr "Перевірка Системи Закінчена"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
-msgstr ""
+msgstr "Проблеми виходу з сессії"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
 "first?"
 msgstr ""
+"Вихід із сесії займає дуже багато часу.<br>Деякі програми відмовляються "
+"закриватись.<br>Ви хочете вийти так чи інакше, не закриваючи ці<br>програми?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
-msgstr ""
+msgstr "Вийти зараз"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
-msgstr ""
+msgstr "Чекайте"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
-msgstr ""
+msgstr "Скасувати вихід із сесії"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
-msgstr ""
+msgstr "Виконується вихід із сесії"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr ""
+"Виконується вихід із сесії.<br><hilight>Будь ласка, почекайте.</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
-msgstr ""
+msgstr "Enlightenment зайнятий іншим зверненням"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr ""
+"Завершення сеансу.<br>Ви не можете виконувати інші дії<br>після завершення "
+"сеансу."
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr ""
+"Вимкнення.<br>Ви не можете виконувати інші дії<br>під час початку вимкнення."
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr ""
+"Перезавантаження.<br>Ви не можете виконувати інші дії<br>під час початку "
+"перезавантаження."
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr ""
+"Перехід в режим очікування.<br>Доки перехід не завершиться ви не можете "
+"виконувати<br>будь-які інші дії."
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr ""
+"Перехід в режим сну.<br>Ви не можете виконувати інші дії<br>доки перехід не "
+"закінчеться."
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
-msgstr ""
+msgstr "Отакої! Такого не має бувати!"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
-msgstr ""
+msgstr "Помилка під час виключення."
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
-msgstr ""
+msgstr "Помилка під час перезавантаження"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
-msgstr ""
+msgstr "Помилка під час переходу в режим очікування."
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
-msgstr ""
+msgstr "Помилка під час переходу в режим сну."
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
-msgstr ""
+msgstr "Вимкнути комп'ютер"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "Вимкнення.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
-msgstr ""
+msgstr "Перезавантаження"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "Перезавантаження.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
-msgstr ""
+msgstr "Призупинка"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr ""
+"Перехід в режим очікування.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
-msgstr ""
+msgstr "Не активний"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
-msgstr ""
+msgstr "Перехід в режим сну.<br><hilight>Будь ласка, зачекайте.</ Hilight>"
 
 #: src/bin/e_theme_about.c:17
 msgid "About Theme"
@@ -2838,98 +3030,101 @@ msgstr "Про тему"
 
 #: src/bin/e_theme.c:42
 msgid "Set As Theme"
-msgstr ""
+msgstr "Встановити Як Тему"
 
 #: src/bin/e_toolbar.c:340
 msgid "Set Toolbar Contents"
-msgstr ""
+msgstr "Налаштувати вміст панелі інструментів"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
-msgstr ""
+msgstr "Не можу вийти - безсмертні вікна."
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
 "windows have<br>been closed or have the lifespan lock removed.<br>"
 msgstr ""
+"Деякі вікна залишаються з включеним прапорцем захисту від закриття. Це "
+"означає,<br>що Enlightenment не дасть собі вийти, доки ці вікна не будуть "
+"закриті,<br>або Ви не приберете прапорці захисту.<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
-msgstr ""
+msgstr "%'.0f Байт"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
-msgstr ""
+msgstr "%'.0f Кб"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
-msgstr ""
+msgstr "%'.0f Мб"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
-msgstr ""
+msgstr "%'.1f Гб"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
-msgstr ""
+msgstr "В майбутньому"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
-msgstr ""
+msgstr "В останню хвилину"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
-msgstr ""
+msgstr "%li Років тому"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
-msgstr ""
+msgstr "%li Місяців тому"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
-msgstr ""
+msgstr "%li Тижнів тому"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
-msgstr ""
+msgstr "%li Днів тому"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
-msgstr ""
+msgstr "%li Годин тому"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
-msgstr ""
+msgstr "%li Хвилин тому"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
-msgstr "Невідомо"
+msgstr "Невідомий"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
-msgstr "Долучити"
+msgstr "Додати"
 
 #: src/bin/e_widget_config_list.c:69
 msgid "Remove"
@@ -2938,251 +3133,251 @@ msgstr "Вилучити"
 #: src/bin/e_widget_config_list.c:83
 #: src/modules/conf_applications/e_int_config_apps.c:258
 msgid "Up"
-msgstr "Уверх"
+msgstr "Вверх"
 
 #: src/bin/e_widget_config_list.c:89
 #: src/modules/conf_applications/e_int_config_apps.c:263
 msgid "Down"
-msgstr "Униз"
+msgstr "Вниз"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "Долучити до улюблених"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
-msgstr ""
+msgstr "Каталогом Вище"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
-msgstr ""
+msgstr "Взаємозв'язки"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
-msgstr ""
+msgstr "Змінено:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "Ви"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
-msgstr ""
+msgstr "Захищено"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
-msgstr ""
+msgstr "Лише читання"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
-msgstr ""
+msgstr "Заборонено"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
-msgstr ""
+msgstr "Читання-Запис"
 
 #: src/modules/battery/e_mod_config.c:41
 msgid "Battery Monitor Settings"
-msgstr ""
+msgstr "Параметри монітора батарей"
 
 #: src/modules/battery/e_mod_config.c:93
 msgid "Basic Settings"
-msgstr ""
+msgstr "Основні налаштування"
 
 #: src/modules/battery/e_mod_config.c:94
 msgid "Show alert when battery is low"
-msgstr ""
+msgstr "Попереджати коли низький заряд батареї"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
-msgstr ""
+msgstr "Перевіряти кожні:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
-msgstr ""
+msgstr "%1.0f ticks"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
-msgstr ""
+msgstr "Оновлення інформації"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
-msgstr ""
+msgstr "Показувати попередження якщо низький заряд"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
-msgstr ""
+msgstr "Попереджати якщо:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
-msgstr ""
+msgstr "%1.0f хв."
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
-msgstr ""
+msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
-msgstr ""
+msgstr "Авто-звільнення в..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
-msgstr ""
+msgstr "%1.0f сек"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
-msgstr ""
+msgstr "Попередження"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
-msgstr ""
+msgstr "Автовизначення"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
 msgid "Internal"
-msgstr ""
+msgstr "Вбудований"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
-msgstr ""
+msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
-msgstr ""
+msgstr "Обладнання"
 
 #: src/modules/battery/e_mod_main.c:135
 msgid "Battery"
 msgstr "Батарея"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
-msgstr ""
+msgstr "Низький заряд батареї!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
-msgstr ""
+msgstr "Рекомендоване мережеве живлення."
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
-msgstr ""
+msgstr "Н/Д"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
-msgstr ""
+msgstr "ПОМИЛКА"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
-msgstr ""
+msgstr "Індикатор Батареї"
 
 #: src/modules/clock/e_mod_main.c:98
 msgid "Clock"
-msgstr ""
+msgstr "Годинник"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
-msgstr ""
+msgstr "Панель параметрів"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
-msgstr ""
+msgstr "Презентація"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
-msgstr ""
+msgstr "Поза мережею"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
-msgstr ""
+msgstr "Режими"
 
 #: src/modules/conf_applications/e_int_config_apps.c:50
 #: src/modules/conf_applications/e_mod_main.c:42
 msgid "Favorites Menu"
-msgstr ""
+msgstr "Меню Вибраних Додатків"
 
 #: src/modules/conf_applications/e_int_config_apps.c:104
 #: src/modules/conf_applications/e_int_config_apps.c:119
 #: src/modules/conf_applications/e_mod_main.c:36
 msgid "IBar Applications"
-msgstr ""
+msgstr "Програми IBar"
 
 #: src/modules/conf_applications/e_int_config_apps.c:135
 #: src/modules/conf_applications/e_mod_main.c:38
 msgid "Startup Applications"
-msgstr ""
+msgstr "Стартові Програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:151
 #: src/modules/conf_applications/e_mod_main.c:37
 msgid "Restart Applications"
-msgstr ""
+msgstr "Рестарт-програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
-msgstr ""
+msgstr "Всі Програми"
 
 #: src/modules/conf_applications/e_int_config_apps.c:250
 msgid "Selected Applications"
-msgstr ""
+msgstr "Вибрані Програми"
 
 #: src/modules/conf_applications/e_mod_main.c:34
 msgid "Apps"
-msgstr ""
+msgstr "Програми"
 
 #: src/modules/conf_applications/e_mod_main.c:35
 msgid "New Application"
-msgstr ""
+msgstr "Нова Програма"
 
 #: src/modules/conf_applications/e_mod_main.c:40
 msgid "IBar Other"
-msgstr ""
+msgstr "Інший IBar"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
-msgstr ""
+msgstr "Стиль рамки"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
-msgstr ""
+msgstr "Стиль бордюра за замовчуванням"
 
 #: src/modules/conf_borders/e_int_config_borders.c:50
 msgid "Window Border Selection"
-msgstr ""
+msgstr "Вибір Бордюра"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
-msgstr ""
+msgstr "Запам'ятати Бордюр для цього вікна на майбутнє"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3191,239 +3386,239 @@ msgstr ""
 #: src/modules/conf_wallpaper/e_mod_main.c:28
 #: src/modules/dropshadow/e_mod_main.c:89
 msgid "Look"
-msgstr ""
+msgstr "Перегляд"
 
 #: src/modules/conf_borders/e_mod_main.c:35
 msgid "Borders"
-msgstr ""
+msgstr "Бордюри"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:40
 msgid "Client List Settings"
-msgstr ""
+msgstr "Налаштування Списку Клієнта"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:99
 msgid "Group By"
-msgstr ""
+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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
 #: src/modules/conf_transitions/e_int_config_transitions.c:236
 msgid "None"
-msgstr ""
+msgstr "Жоден"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:107
 msgid "Include windows from other screens"
-msgstr ""
+msgstr "Разом з вікнами з інших екранів"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:111
 msgid "Separate Groups By"
-msgstr ""
+msgstr "Розділяти Групи"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:116
 msgid "Using separator bars"
-msgstr ""
+msgstr "Використовуючи лінії поділу"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:118
 msgid "Using menus"
-msgstr ""
+msgstr "Використовуючи меню"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:122
 msgid "Client Sort Order"
-msgstr ""
+msgstr "Порядок Сортування Клієнта"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:126
 msgid "Alphabetical"
-msgstr ""
+msgstr "За алфавітом"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:128
 msgid "Window stacking layer"
-msgstr ""
+msgstr "Рівень розташування вікна"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:130
 msgid "Most recently used"
-msgstr ""
+msgstr "Використані нещодавно"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:134
 msgid "Iconified Windows"
-msgstr ""
+msgstr "Згорнуті Вікна"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:136
 msgid "Group with owning desktop"
-msgstr ""
+msgstr "Групувати з власною Стільницею"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:138
 msgid "Group with current desktop"
-msgstr ""
+msgstr "Групувати з поточним столом"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:140
 msgid "Separate group"
-msgstr ""
+msgstr "Окрема група"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:142
 msgid "Warp to owning desktop"
-msgstr ""
+msgstr "Переміщати на власну Стільницю"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:146
 msgid "Menu Item Captions"
-msgstr ""
+msgstr "Підписи Елементів Меню"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:147
 msgid "Limit caption length"
-msgstr ""
+msgstr "Обмежити довжину підпису"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:149
 #, c-format
 msgid "%1.0f Chars"
-msgstr ""
+msgstr "%1.0f Символів"
 
 #: src/modules/conf_clientlist/e_mod_main.c:35
 msgid "Client List Menu"
-msgstr ""
+msgstr "Меню Списку Клієнта"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:47
 msgid "Window Manager"
-msgstr ""
+msgstr "Менеджер Вікон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:48
 msgid "About Dialog Title"
-msgstr ""
+msgstr "Заголовок Діалогу \"Про\""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:49
 msgid "About Dialog Version"
-msgstr ""
+msgstr "Версія в Діалозі \"Про\""
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:50
 msgid "Border Title"
-msgstr ""
+msgstr "Заголовок Меж"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:51
 msgid "Settings Dialog Title"
-msgstr ""
+msgstr "Налаштування Dialog Title"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:52
 msgid "Error Text"
-msgstr ""
+msgstr "Текст Помилки"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:53
 #: src/modules/conf_fonts/e_int_config_fonts.c:63
 msgid "Menu Title"
-msgstr ""
+msgstr "Заголовок Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:54
 msgid "Menu Title Active"
-msgstr ""
+msgstr "Активний Заголовок Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:55
 #: src/modules/conf_fonts/e_int_config_fonts.c:62
 msgid "Menu Item"
-msgstr ""
+msgstr "Пункт Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:56
 msgid "Menu Item Active"
-msgstr ""
+msgstr "Активний Пункт Меню"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:57
 #: src/modules/conf_fonts/e_int_config_fonts.c:67
 msgid "Move Text"
-msgstr ""
+msgstr "Пересувати Текст"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:58
 #: src/modules/conf_fonts/e_int_config_fonts.c:68
 msgid "Resize Text"
-msgstr ""
+msgstr "Текст під час зміни розміру"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:59
 msgid "Winlist Item"
-msgstr ""
+msgstr "Записи Списку Вікон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:60
 msgid "Winlist Label"
-msgstr ""
+msgstr "Мітка Списку Вікон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:61
 #: src/modules/conf_fonts/e_int_config_fonts.c:69
 msgid "Winlist Title"
-msgstr ""
+msgstr "Заголовок Списку Вікон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:67
 #: src/modules/conf_fonts/e_int_config_fonts.c:82
 msgid "Widgets"
-msgstr ""
+msgstr "Візуальні Елементи"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:68
 msgid "Button Text"
-msgstr ""
+msgstr "Текст на Кнопках"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:69
 msgid "Button Text Disabled"
-msgstr ""
+msgstr "Відключений Текст на Кнопках"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:70
 msgid "Check Text"
-msgstr ""
+msgstr "Текст Прапорця"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:71
 msgid "Check Text Disabled"
-msgstr ""
+msgstr "Відключений Текст Прапорця"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:72
 msgid "Entry Text"
-msgstr ""
+msgstr "Ввід Тексту"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:73
 msgid "Label Text"
-msgstr ""
+msgstr "Текст Мітки"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:74
 msgid "List Item Text"
-msgstr ""
+msgstr "Текст Пункту в Списку"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:75
 msgid "List Item Odd Text"
-msgstr ""
+msgstr "Додатковий Текст Пункту в Списку"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:76
 #: src/modules/conf_fonts/e_int_config_fonts.c:92
 msgid "List Header"
-msgstr ""
+msgstr "Заголовок Списку"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
 msgid "Radio Text"
-msgstr ""
+msgstr "Текст Радіобоксу"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "Відключений Текст Радіобоксу"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
 msgid "Slider Text"
-msgstr ""
+msgstr "Текст Бігунця"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "Відключений Текст Бігунця"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
 msgid "Module Label"
-msgstr ""
+msgstr "Мітка Модуля"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:130
 #: src/modules/conf_colors/e_mod_main.c:35
 msgid "Colors"
-msgstr ""
+msgstr "Кольори"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:251
 msgid "Other"
-msgstr ""
+msgstr "Інші"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:435
 msgid "Window Manager Colors"
-msgstr ""
+msgstr "Кольори Менеджера Вікон"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:437
 #: src/modules/conf_colors/e_int_config_color_classes.c:445
@@ -3441,79 +3636,79 @@ msgstr "Вимкнутий"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:443
 msgid "Widget Colors"
-msgstr ""
+msgstr "Кольори віджету"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:451
 msgid "Module Colors"
-msgstr ""
+msgstr "Кольори Модуля"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:501
 msgid "Color Classes"
-msgstr ""
+msgstr "Класи Кольору"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:529
 msgid "Object Color"
-msgstr ""
+msgstr "Колір Об'єкту"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:538
 msgid "Outline Color"
-msgstr ""
+msgstr "Колір обведення"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:547
 msgid "Shadow Color"
-msgstr ""
+msgstr "Колір тіні"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:556
 msgid "Defaults"
-msgstr ""
+msgstr "Типові значення"
 
 #: src/modules/conf_desk/e_int_config_desk.c:52
 msgid "Desk Settings"
-msgstr ""
+msgstr "Налаштування Стільниці"
 
 #: src/modules/conf_desk/e_int_config_desk.c:149
 msgid "Desktop Name"
-msgstr ""
+msgstr "Назва Стільниці"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
-msgstr ""
+msgstr "Ім'я:"
 
 #: src/modules/conf_desk/e_int_config_desk.c:156
 msgid "Desktop Wallpaper"
-msgstr ""
+msgstr "Шпалери Стільниці"
 
 #: src/modules/conf_desk/e_int_config_desk.c:162
 #: src/modules/conf_mime/e_int_config_mime.c:193
 msgid "Set"
-msgstr ""
+msgstr "Встановити"
 
 #: src/modules/conf_desk/e_mod_main.c:35
 msgid "Desk"
-msgstr ""
+msgstr "Стільниця"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:96
 msgid "Screen Lock Settings"
-msgstr ""
+msgstr "Налаштування Замикання Екрану"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:199
 msgid "Automatic Locking"
-msgstr ""
+msgstr "Автоматичне Замикання"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:201
 msgid "Lock when Enlightenment starts"
-msgstr ""
+msgstr "Заблокувати під час старту Enlightenment"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:205
 msgid "Lock when X screensaver activates"
-msgstr ""
+msgstr "Замикати коли зберігач екрану активний"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
 msgid "Time after screensaver activated"
-msgstr ""
+msgstr "Час після того, як зберігача екрану активовано"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3521,15 +3716,15 @@ msgstr ""
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:207
 #, c-format
 msgid "%1.0f seconds"
-msgstr ""
+msgstr "%1.0f секунд"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:218
 msgid "Lock when idle time exceeded"
-msgstr ""
+msgstr "Замикати якщо перевищений час бездіяльності"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:222
 msgid "Idle time to exceed"
-msgstr ""
+msgstr "Час перевищеня бездіяльності"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:225
 #: src/modules/conf_dpms/e_int_config_dpms.c:208
@@ -3539,34 +3734,34 @@ msgstr ""
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:181
 #, c-format
 msgid "%1.0f minutes"
-msgstr ""
+msgstr "%1.0f хвилин"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
-msgstr ""
+msgstr "Особистий"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:391
 msgid "Login Box Settings"
-msgstr ""
+msgstr "Налаштування Login"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:394
 msgid "Show on all screen zones"
-msgstr ""
+msgstr "Показувати на всіх екранах"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:398
 msgid "Show on current screen zone"
-msgstr ""
+msgstr "Показувати на поточному екрані"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:402
 msgid "Show on screen zone #:"
-msgstr ""
+msgstr "Показувати на екрані #:"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:406
 #: src/modules/conf_desks/e_int_config_desks.c:247
@@ -3579,174 +3774,179 @@ msgstr ""
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
-msgstr ""
+msgstr "%1.0f"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:414
 msgid "Wallpaper Mode"
-msgstr ""
+msgstr "Режим Шпалер"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:416
 #: src/modules/gadman/e_mod_config.c:149
 msgid "Theme Defined"
-msgstr ""
+msgstr "Визначено Темою"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:419
 msgid "Theme Wallpaper"
-msgstr ""
+msgstr "Шпалери з Теми"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:422
 msgid "User Wallpaper"
-msgstr ""
+msgstr "Шпалери Користувача"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:433
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:195
 msgid "Enter Presentation Mode"
-msgstr ""
+msgstr "Включити Режим Презентації"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:435
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:197
 msgid "Suggest entering presentation mode"
-msgstr ""
+msgstr "Запропонувати вхід до режиму презентації"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:439
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:202
 msgid "If deactivated before"
-msgstr ""
+msgstr "Якщо відключити раніше"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:457
 msgid "Custom Screenlock"
-msgstr ""
+msgstr "Особливе Запирання Екрану"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:458
 msgid "Use custom screenlock"
-msgstr ""
+msgstr "Використовувати особливе замикання екрану"
 
 #: src/modules/conf_desklock/e_mod_main.c:35
 msgid "Screen Lock"
-msgstr ""
+msgstr "Замкнути Екран"
 
 #: src/modules/conf_desks/e_int_config_desks.c:62
 #: src/modules/pager/e_mod_main.c:822
 msgid "Virtual Desktops Settings"
-msgstr ""
+msgstr "Налаштування Віртуальних Стільниць"
 
 #: src/modules/conf_desks/e_int_config_desks.c:239
 msgid "Number of Desktops"
-msgstr ""
+msgstr "Кількість Стільниць"
 
 #: src/modules/conf_desks/e_int_config_desks.c:258
 #: src/modules/conf_desks/e_int_config_desks.c:295
 msgid "Desktop Mouse Flip"
-msgstr ""
+msgstr "Перехід до Стільниці Клацанням Мишкою"
 
 #: src/modules/conf_desks/e_int_config_desks.c:259
 msgid "Animated flip"
-msgstr ""
+msgstr "Анімація переходу"
 
 #: src/modules/conf_desks/e_int_config_desks.c:277
 msgid "Desktops"
-msgstr ""
+msgstr "Стільниці"
 
 #: src/modules/conf_desks/e_int_config_desks.c:296
 msgid "Flip when dragging objects to the screen edge"
-msgstr ""
+msgstr "Перехід під час перетягування об'єктів мишкою за край екрану"
 
 #: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
-msgstr ""
+msgstr "Безперервне обертання Стільниць під час переходу"
 
 #: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
-msgstr ""
+msgstr "Анімація Переходу"
 
 #: src/modules/conf_desks/e_int_config_desks.c:304
 msgid "Off"
-msgstr ""
+msgstr "Вимкнути"
 
 #: src/modules/conf_desks/e_int_config_desks.c:307
 msgid "Pane"
-msgstr ""
+msgstr "Гладко"
 
 #: src/modules/conf_desks/e_int_config_desks.c:310
 msgid "Zoom"
-msgstr ""
+msgstr "Збільшення"
 
 #: src/modules/conf_desks/e_int_config_desks.c:313
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:163
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:146
 #, c-format
 msgid "%1.1f sec"
-msgstr ""
+msgstr "%1.1f сек"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
 msgid "Background panning"
-msgstr ""
+msgstr "Панорамування Фону"
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
 msgid "%.2f X-axis pan factor"
-msgstr ""
+msgstr "%.2f X-axis pan factor"
 
 #: src/modules/conf_desks/e_int_config_desks.c:325
 #, c-format
 msgid "%.2f Y-axis pan factor"
-msgstr ""
+msgstr "%.2f Y-axis pan factor"
 
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
-msgstr ""
+msgstr "Віртуальні стільниці"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
-msgstr ""
+msgstr "Налаштування Діалогу"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
-msgstr ""
+msgstr "Загальні налаштування"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
-msgstr ""
+msgstr "Вимкнути Діалоги Підтвердження"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
-msgstr ""
+msgstr "Звичайні Вікна"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr ""
+msgstr "Режим діалогу стандартних налаштувань"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
-msgstr ""
+msgstr "Базовий Режим"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
+msgstr "Розширений Режим"
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
 msgstr ""
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
-msgstr ""
+msgstr "Режим Діалогу за Замовчуванням"
 
 #: src/modules/conf_dialogs/e_mod_main.c:35
 msgid "Dialogs"
-msgstr ""
+msgstr "Діалоги"
 
 #: src/modules/conf_display/e_int_config_display.c:129
 #, c-format
@@ -3755,6 +3955,9 @@ 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 ""
+"Все виглядає чудово? <hilight>Зберегти</hilight> якщо так, або Повернути "
+"якщо ні.<br>Якщо Ви не натиснете кнопку, старі параметри<br>%dx%d на %d Hz "
+"будуть повернуті через %d секунд."
 
 #: src/modules/conf_display/e_int_config_display.c:136
 #, c-format
@@ -3763,6 +3966,9 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
+"Все виглядає чудово? <hilight>Зберегти</hilight> якщо так, або Повернути "
+"якщо ні.<br>Якщо Ви не натиснете кнопку, старі параметри<br>%dx%d будуть "
+"повернуті через %d секунд."
 
 #: src/modules/conf_display/e_int_config_display.c:146
 #, c-format
@@ -3771,6 +3977,9 @@ 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 ""
+"Все виглядає чудово? <hilight>Зберегти</hilight> якщо так, або Повернути "
+"якщо ні.<br>Якщо Ви не натиснете кнопку, старі параметри<br>%dx%d на %d Hz "
+"будуть повернуті<hilight>НЕГАЙНО</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:153
 #, c-format
@@ -3779,10 +3988,13 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
+"Все виглядає чудово? <hilight>Зберегти</hilight> якщо так, або Повернути "
+"якщо ні.<br>Якщо Ви не натиснете кнопку, старі параметри<br>%dx%d будуть "
+"повернуті <hilight>НЕГАЙНО</hilight>."
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
-msgstr ""
+msgstr "Зміна роздільної здатності"
 
 #: src/modules/conf_display/e_int_config_display.c:194
 msgid "Save"
@@ -3790,37 +4002,37 @@ msgstr "Зберегти"
 
 #: src/modules/conf_display/e_int_config_display.c:195
 msgid "Restore"
-msgstr ""
+msgstr "Відновити"
 
 #: src/modules/conf_display/e_int_config_display.c:228
 msgid "Screen Resolution Settings"
-msgstr ""
+msgstr "Налаштування Роздільної здатністі екрану"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
-msgstr ""
+msgstr "Роздільна здатність"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
-msgstr ""
+msgstr "Відновлювати під час входу"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
-msgstr ""
+msgstr "Частота Кадрів"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
-msgstr ""
+msgstr "Оборот"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
-msgstr ""
+msgstr "Дзеркально"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
-msgstr ""
+msgstr "Особливості які Відсутні"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3828,12 +4040,16 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
+"Ваш X Display Server не має підтримки для<br><hilight>XRandR</hilight> (X "
+"Resize and Rotate) додаток.<br>Ви не можете змінити роздільну здатність "
+"екрану<br> без підтримки цього додатку. Також це може бути<br>тому що, під "
+"час побудови <hilight>ecore</hilight> не було<br>виявлено підтримку XRandR."
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
-msgstr ""
+msgstr "Не Знайдено Частоти Екрану"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3841,161 +4057,173 @@ msgid ""
 "setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
 "screen."
 msgstr ""
+"Ваш X сервер не повідомив про частоти екрану.<br>Якщо nested X сервер "
+"запущений, то цього слід було очікувати.<br>Однак, якщо це не так, то "
+"поточна частота буде використана під час<br>виставлення роздільності екрану, "
+"і це може< hilight>пошкодити</ hilight>ваш екран."
 
 #: src/modules/conf_display/e_mod_main.c:35
 msgid "Screen Resolution"
-msgstr ""
+msgstr "Роздільність екрану"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 msgid "Display Power Management Signaling"
-msgstr ""
+msgstr "Управління Живленням екрану (DPMS)"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:61
 msgid "The current display server is not <br>DPMS capable."
-msgstr ""
+msgstr "Поточний сервер екрану не підтримує<br>DPMS."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:82
 msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
+msgstr "Поточний сервер екрану<br>не має розширень DPMS."
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
-msgstr ""
+msgstr "Налаштування Управління Живленням екрану (DPMS)"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:198
 msgid "Enable Display Power Management"
-msgstr ""
+msgstr "Включити Управління Живленням Екрану"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:202
 msgid "Timers"
-msgstr ""
+msgstr "Таймери"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:204
 msgid "Standby time"
-msgstr ""
+msgstr "Час очікування"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:216
 msgid "Suspend time"
-msgstr ""
+msgstr "Час призупинки"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:228
 msgid "Off time"
-msgstr ""
+msgstr "Час вимикання"
 
 #: src/modules/conf_dpms/e_mod_main.c:35
 msgid "Power Management"
-msgstr ""
+msgstr "Керування Живленням"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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 ""
+msgstr "<Немає>"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr ""
+msgstr "Налаштування прив'язок до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
-msgstr ""
+msgstr "Прив'язки до Країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr ""
+msgstr "Додати Межу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr ""
+msgstr "Видалити Межу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr ""
+msgstr "Змінити Межу"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
-msgstr ""
+msgstr "Видалити все"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
-msgstr ""
+msgstr "Повернути Прив'язки за Замовчуванням"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
-msgstr ""
+msgstr "Дія"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
-msgstr ""
+msgstr "Параметри Дії"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
-msgstr ""
+msgstr "Загальні Параметри"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
-msgstr ""
+msgstr "Дозволити активувати прив'язки в вікнах на повний екран"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr ""
+msgstr "Послідовність прив'язок до країв"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
+msgstr "%.2f секунд"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr ""
+msgstr "Помилка прив'язки до краю"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
+"Послідовність прив'язок до країв, яку Ви вибрали вже використовується "
+"<br><hilight>%s</hilight> дією.<br>Будь ласка, виберіть іншу послідовність "
+"прив'язок до країв."
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
-msgstr ""
+msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
-msgstr ""
+msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
-msgstr ""
+msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
-msgstr ""
+msgstr "WIN"
 
 #: src/modules/conf_edgebindings/e_mod_main.c:34
 #: src/modules/conf_interaction/e_mod_main.c:34
@@ -4004,23 +4232,23 @@ msgstr ""
 #: src/modules/conf_mouse/e_mod_main.c:34 src/modules/mixer/app_mixer.c:283
 #: src/modules/mixer/app_mixer.c:301
 msgid "Input"
-msgstr ""
+msgstr "Ввід"
 
 #: src/modules/conf_engine/e_int_config_engine.c:38
 msgid "Engine Settings"
-msgstr ""
+msgstr "Налаштування двигунця"
 
 #: src/modules/conf_engine/e_int_config_engine.c:95
 msgid "Enable Composite"
-msgstr ""
+msgstr "Ввімкнути Композицію"
 
 #: src/modules/conf_engine/e_int_config_engine.c:102
 msgid "Default Engine"
-msgstr ""
+msgstr "Двигунець за замовчуванням"
 
 #: src/modules/conf_engine/e_int_config_engine.c:131
 msgid "Enable Composite Support ?"
-msgstr ""
+msgstr "Ввімкнути Підтримку Композиції?"
 
 #: src/modules/conf_engine/e_int_config_engine.c:133
 msgid ""
@@ -4028,48 +4256,50 @@ msgid ""
 "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
 msgid "Engine"
-msgstr ""
+msgstr "Двигунець"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:49
 msgid "Run Command Settings"
-msgstr ""
+msgstr "Налаштування виконання команди"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:115
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:168
 msgid "Maximum Number of Matched Apps to List"
-msgstr ""
+msgstr "Найбільша Кількість Знайдених Програм для Показу"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:119
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:172
 msgid "Maximum Number of Matched Exes to List"
-msgstr ""
+msgstr "Найбільша Кількість Знайдених Exe для Показу"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:123
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:176
 msgid "Maximum History to List"
-msgstr ""
+msgstr "Максимум Історії для Показу"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:129
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:182
 #: src/modules/conf_winlist/e_int_config_winlist.c:183
 #: src/modules/conf_winlist/e_int_config_winlist.c:269
 msgid "Scroll Settings"
-msgstr ""
+msgstr "Налаштування Прокрутки"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:130
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:183
 #: src/modules/conf_winlist/e_int_config_winlist.c:184
 #: src/modules/conf_winlist/e_int_config_winlist.c:270
 msgid "Scroll Animate"
-msgstr ""
+msgstr "Анімація Прокрутки"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:185
 #: src/modules/conf_winlist/e_int_config_winlist.c:272
 msgid "Scroll Speed"
-msgstr ""
+msgstr "Швидкість прокрутки"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:189
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:228
@@ -4080,25 +4310,25 @@ msgstr ""
 #: src/modules/conf_winlist/e_int_config_winlist.c:291
 #, c-format
 msgid "%1.2f"
-msgstr ""
+msgstr "%1.2f"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:197
 msgid "Terminal Settings"
-msgstr ""
+msgstr "Налаштування Терминалу"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr ""
+msgstr "Команда Виклику Терміналу (використовуйте CTRL+RETURN)"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
 msgid "Size Settings"
-msgstr ""
+msgstr "Налаштування Розміру"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:207
 #: src/modules/conf_winlist/e_int_config_winlist.c:296
 msgid "Minimum Width"
-msgstr ""
+msgstr "Мінімальна Ширина"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:209
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:213
@@ -4110,417 +4340,433 @@ msgstr ""
 #: src/modules/conf_winlist/e_int_config_winlist.c:310
 #, c-format
 msgid "%4.0f"
-msgstr ""
+msgstr "%4.0f"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:211
 #: src/modules/conf_winlist/e_int_config_winlist.c:300
 msgid "Minimum Height"
-msgstr ""
+msgstr "Мінімальна Висота"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:215
 #: src/modules/conf_winlist/e_int_config_winlist.c:304
 msgid "Maximum Width"
-msgstr ""
+msgstr "Максимальна Ширина"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:219
 #: src/modules/conf_winlist/e_int_config_winlist.c:308
 msgid "Maximum Height"
-msgstr ""
+msgstr "Максимальна Висота"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:225
 #: src/modules/conf_winlist/e_int_config_winlist.c:284
 msgid "Position Settings"
-msgstr ""
+msgstr "Налаштування Позиціонування"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:226
 #: src/modules/conf_winlist/e_int_config_winlist.c:285
 msgid "X-Axis Alignment"
-msgstr ""
+msgstr "Вирівнюванння X-Координат"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:230
 #: src/modules/conf_winlist/e_int_config_winlist.c:289
 msgid "Y-Axis Alignment"
-msgstr ""
+msgstr "Вирівнюванння Y-Координат"
 
 #: src/modules/conf_exebuf/e_mod_main.c:35 src/modules/exebuf/e_mod_main.c:52
 #: src/modules/exebuf/e_mod_main.c:129
 msgid "Run Command"
-msgstr ""
+msgstr "Запуск Команди"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:60
 msgid "Core"
-msgstr ""
+msgstr "Ядро"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:61
 msgid "Title Bar"
-msgstr ""
+msgstr "Простір Заголовка"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
-msgstr ""
+msgstr "Простий Блок Тексту"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
-msgstr ""
+msgstr "Малий Блок Тексту"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
-msgstr ""
+msgstr "Великий Блок Тексту"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Settings Heading"
-msgstr ""
+msgstr "Налаштування Заголовоку"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
-msgstr ""
+msgstr "Заголовок в \"Про\""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:72
 msgid "About Version"
-msgstr ""
+msgstr "Версія в \"Про\""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:73
 msgid "About Text"
-msgstr ""
+msgstr "Текст в \"Про\""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:74
 msgid "Desklock Title"
-msgstr ""
+msgstr "Заголовок в \"Замкнути Екран\""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:75
 msgid "Desklock Password"
-msgstr ""
+msgstr "Пароль в \"Замкнути Екран\""
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:76
 msgid "Dialog Error"
-msgstr ""
+msgstr "Помилка Діалогу"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
-msgstr ""
+msgstr "Команда Exebuf"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
-msgstr ""
+msgstr "Заголовок в Заставці"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:79
 msgid "Splash Text"
-msgstr ""
+msgstr "Текст в Заставці"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:80
 msgid "Splash Version"
-msgstr ""
+msgstr "Версія в Заставці"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:83
 msgid "Entry"
-msgstr ""
+msgstr "Запис"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:84
 msgid "Frame"
-msgstr ""
+msgstr "Рамка"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:85
 msgid "Label"
-msgstr ""
+msgstr "Мітка"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:86
 msgid "Buttons"
-msgstr ""
+msgstr "Кнопки"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:87
 msgid "Slider"
-msgstr ""
+msgstr "Повзунок"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:88
 msgid "Radio Buttons"
-msgstr ""
+msgstr "Кнопки Радіобокс"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:89
 msgid "Check Buttons"
-msgstr ""
+msgstr "Кнопки Чекбокс"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:90
 msgid "Text List Item"
-msgstr ""
+msgstr "Текст Пункту в Списку"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:91
 msgid "List Item"
-msgstr ""
+msgstr "Пункт Списку"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:94
 msgid "Filemanager"
-msgstr ""
+msgstr "Керування Файлами"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:95
 msgid "Typebuf"
-msgstr ""
+msgstr "Typebuf"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:97
 msgid "Desktop Icon"
-msgstr ""
+msgstr "Піктограма Стільниці"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:103
 msgid "Small Styled"
-msgstr ""
+msgstr "Зменшений Стиль"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:104
 msgid "Normal Styled"
-msgstr ""
+msgstr "Звичайний Стиль"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:105
 msgid "Large Styled"
-msgstr ""
+msgstr "Збільшений Стиль"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:168
 msgid "Font Settings"
-msgstr ""
+msgstr "Налаштування Шрифту"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:271
 msgid "Big"
-msgstr ""
+msgstr "Великий"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:277
 msgid "Really Big"
-msgstr ""
+msgstr "Дуже Великий"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:292
 #, c-format
 msgid "%d pixels"
-msgstr ""
+msgstr "%d пікселів"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
-msgstr ""
+msgstr "Використовувати Свої Класи Шрифту"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: src/modules/conf_fonts/e_mod_main.c:35
 #: src/modules/conf_paths/e_int_config_paths.c:77
 msgid "Fonts"
-msgstr ""
+msgstr "Шрифти"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
-msgstr ""
+msgstr "Базовий Тестовий Рядок: 123: 我的天空!"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:604
 msgid "Font Classes"
-msgstr ""
+msgstr "Класи Шрифту"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
-msgstr ""
+msgstr "Вмикнути Класи Шрифту"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr "Шрифт"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr "Стиль"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Розширений Тестовий Рядок.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
-msgstr ""
+msgstr "Підказки"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
-msgstr ""
+msgstr "Байткод"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
-msgstr ""
+msgstr "Автоматично"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
-msgstr ""
+msgstr "Запасні Шрифти"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
-msgstr ""
+msgstr "Запасне Ім'я"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
-msgstr ""
+msgstr "Ввімкнути Запасні"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr ""
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
+msgstr "Hinting / Fallbacks"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
-msgstr ""
+msgstr "Налаштування Теми Піктограми"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:190
 msgid "Icon Themes"
-msgstr ""
+msgstr "Теми Піктограм"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
-msgstr ""
+msgstr "Тема піктограм відкидає основну тему"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
-msgstr ""
+msgstr "Тема Піктограми"
 
 #: src/modules/conf_imc/e_int_config_imc.c:109
 #: src/modules/conf_imc/e_mod_main.c:35
 msgid "Input Method Settings"
-msgstr ""
+msgstr "Налаштування Методу Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc.c:297
 msgid "Input Method Selector"
-msgstr ""
+msgstr "Вибір Методу Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc.c:300
 #: src/modules/conf_imc/e_int_config_imc.c:894
 msgid "Use No Input Method"
-msgstr ""
+msgstr "Не Використовувати Метод Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:961
 msgid "Setup Selected Input Method"
-msgstr ""
+msgstr "Налаштувати Вибраний Метод Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc.c:901
 msgid "New"
-msgstr ""
+msgstr "Новий"
 
 #: src/modules/conf_imc/e_int_config_imc.c:903
 msgid "Import..."
-msgstr ""
+msgstr "Імпортувати..."
 
 #: src/modules/conf_imc/e_int_config_imc.c:908
 msgid "Input Method Parameters"
-msgstr ""
+msgstr "Параметри Методу Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc.c:918
 msgid "Execute Command"
-msgstr ""
+msgstr "Виконати Команду"
 
 #: src/modules/conf_imc/e_int_config_imc.c:925
 msgid "Setup Command"
-msgstr ""
+msgstr "Налаштувати Команди"
 
 #: src/modules/conf_imc/e_int_config_imc.c:934
 msgid "Exported Environment Variables"
-msgstr ""
+msgstr "Експортовані Змінні Середовища"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:66
 msgid "Select an Input Method Settings..."
-msgstr ""
+msgstr "Виберіть параметри вводу..."
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:281
 #: src/modules/conf_imc/e_int_config_imc_import.c:296
 msgid "Input Method Config Import Error"
-msgstr ""
+msgstr "Помилка Імпорту Конфігурації Методу Вводу"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:282
 msgid ""
 "Enlightenment was unable to import the configuration.<br><br>Are you sure "
 "this is really a valid configuration?"
 msgstr ""
+"Enlightenment не зміг імпортувати конфігурацію.<br><br>Ви впевнені, що це - "
+"дійсно правильна конфігурація?"
 
 #: src/modules/conf_imc/e_int_config_imc_import.c:297
 msgid ""
 "Enlightenment was unable to import the configuration<br>due to a copy error."
 msgstr ""
+"Enlightenment не зміг імпортувати конфігурацію<br>через помилку копіювання."
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
-msgstr ""
+msgstr "Мова"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:37
 msgid "Interaction Settings"
-msgstr ""
+msgstr "Налаштування Взаємодії"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:94
 msgid "Thumbscroll"
-msgstr ""
+msgstr "Thumbscroll"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
-msgstr ""
+msgstr "Включити Thumbscroll"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr ""
+msgstr "Поріг застосування перетягування повзунка"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
 #, c-format
 msgid "%1.0f pixels"
-msgstr ""
+msgstr "%1.0f пикселів"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
 msgid "Threshold for applying drag momentum"
-msgstr ""
+msgstr "Поріг застосування інерції перетягування"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 #, c-format
 msgid "%1.0f pixels/sec"
-msgstr ""
+msgstr "%1.0f pixels/sec"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:114
 msgid "Friction slowdown"
-msgstr ""
+msgstr "Уповільнення тертя"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:117
 #, c-format
 msgid "%1.2f sec"
-msgstr ""
+msgstr "%1.2f сек"
 
 #: src/modules/conf_interaction/e_mod_main.c:35
 msgid "Interaction"
-msgstr ""
+msgstr "Взаємодія"
 
 #: src/modules/conf_intl/e_int_config_intl.c:583
 #: src/modules/conf_intl/e_mod_main.c:35
 msgid "Language Settings"
-msgstr ""
+msgstr "Налаштування Мови"
 
 #: src/modules/conf_intl/e_int_config_intl.c:900
 #: src/modules/conf_intl/e_int_config_intl.c:977
 msgid "Language Selector"
-msgstr ""
+msgstr "Вибір Мови"
 
 #: src/modules/conf_intl/e_int_config_intl.c:950
 #: src/modules/conf_intl/e_int_config_intl.c:1028
 msgid "Locale Selected"
-msgstr ""
+msgstr "Вибрана Локаль"
 
 #: src/modules/conf_intl/e_int_config_intl.c:951
 #: src/modules/conf_intl/e_int_config_intl.c:1029
 msgid "Locale"
-msgstr ""
+msgstr "Локаль"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:7
 msgid ""
 "Please press key sequence,<br><br>or <hilight>Escape</hilight> to abort."
 msgstr ""
+"Будь ласка, натисніть послідовність клавіш,<br><br>або <hilight>Escape</ "
+"hilight> для скасування."
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:92
 msgid "Key Binding Settings"
-msgstr ""
+msgstr "Налаштування Гарячих Клавіш"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:223
 #: src/modules/conf_keybindings/e_mod_main.c:35
 msgid "Key Bindings"
-msgstr ""
+msgstr "Гарячі Клавіші"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:228
 msgid "Add Key"
-msgstr ""
+msgstr "Додати Клавішу"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:231
 msgid "Delete Key"
-msgstr ""
+msgstr "Видалити Клавішу"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:235
 msgid "Modify Key"
-msgstr ""
+msgstr "Змінити  Клавішу"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:918
 msgid "Key Binding Sequence"
-msgstr ""
+msgstr "Послідовність Прив'язки Клавіші"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1129
 msgid "Binding Key Error"
-msgstr ""
+msgstr "Помилка Прив'язки Клавіші"
 
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1130
 #, c-format
@@ -4528,51 +4774,53 @@ msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding key sequence."
 msgstr ""
+"Обрана Вами послідовність прив'язки клавіші вже використовується прив'язкою "
+"<br><hilight>%s</hilight>.<br>Будь ласка, виберіть іншу послідовність."
 
 #: src/modules/conf_menus/e_int_config_menus.c:44
 #: src/modules/conf_menus/e_int_config_menus.c:110
 #: src/modules/conf_menus/e_int_config_menus.c:169
 #: src/modules/conf_menus/e_mod_main.c:35
 msgid "Menu Settings"
-msgstr ""
+msgstr "Налаштування Меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:101
 #: src/modules/conf_menus/e_int_config_menus.c:160
 msgid "Main Menu Settings"
-msgstr ""
+msgstr "Налаштування Головного Меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:102
 #: src/modules/conf_menus/e_int_config_menus.c:161
 msgid "Show Favorites In Main Menu"
-msgstr ""
+msgstr "Показувати \"Вибране\" в Головному Меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:105
 #: src/modules/conf_menus/e_int_config_menus.c:164
 msgid "Show Applications In Main Menu"
-msgstr ""
+msgstr "Показувати \"Програми\" в Головному Меню"
 
 #: 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 ""
+msgstr "Показувати Ім'я"
 
 #: src/modules/conf_menus/e_int_config_menus.c:114
 #: src/modules/conf_menus/e_int_config_menus.c:173
 msgid "Show Generic In Menu"
-msgstr ""
+msgstr "Показувати Загальну Інформацію"
 
 #: src/modules/conf_menus/e_int_config_menus.c:117
 #: src/modules/conf_menus/e_int_config_menus.c:176
 msgid "Show Comment In Menu"
-msgstr ""
+msgstr "Показувати Коментар"
 
 #: src/modules/conf_menus/e_int_config_menus.c:181
 msgid "Autoscroll Settings"
-msgstr ""
+msgstr "Налаштування Автопрокрутки"
 
 #: src/modules/conf_menus/e_int_config_menus.c:182
 msgid "Autoscroll Margin"
-msgstr ""
+msgstr "Межа Автопрокрутки"
 
 #: src/modules/conf_menus/e_int_config_menus.c:184
 #: src/modules/conf_menus/e_int_config_menus.c:189
@@ -4583,90 +4831,90 @@ msgstr ""
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:171
 #, c-format
 msgid "%2.0f pixels"
-msgstr ""
+msgstr "%2.0f пікселів"
 
 #: src/modules/conf_menus/e_int_config_menus.c:187
 msgid "Autoscroll Cursor Margin"
-msgstr ""
+msgstr "Край Курсора Автопрокрутки"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
-msgstr ""
+msgstr "Різні Налаштування"
 
 #: src/modules/conf_menus/e_int_config_menus.c:195
 msgid "Menu Scroll Speed"
-msgstr ""
+msgstr "Швидкість Прокрутки Меню"
 
 #: src/modules/conf_menus/e_int_config_menus.c:197
 #, c-format
 msgid "%5.0f pixels/sec"
-msgstr ""
+msgstr "%5.0f пикс/сек"
 
 #: src/modules/conf_menus/e_int_config_menus.c:200
 msgid "Fast Mouse Move Threshhold"
-msgstr ""
+msgstr "Розкид Швидкого Руху Миші"
 
 #: src/modules/conf_menus/e_int_config_menus.c:202
 #: src/modules/conf_window_display/e_int_config_window_display.c:229
 #, c-format
 msgid "%4.0f pixels/sec"
-msgstr ""
+msgstr "%4.0f пикселів/сек"
 
 #: src/modules/conf_menus/e_int_config_menus.c:206
 msgid "Click Drag Timeout"
-msgstr ""
+msgstr "Перерва під час клацання перетягуванням"
 
 #: src/modules/conf_menus/e_int_config_menus.c:208
 #, c-format
 msgid "%2.2f seconds"
-msgstr ""
+msgstr "%2.2f сек."
 
 #: src/modules/conf_mime/e_int_config_mime.c:64
 #: src/modules/conf_mime/e_mod_main.c:35
 msgid "File Icons"
-msgstr ""
+msgstr "Піктограми Файлів"
 
 #: src/modules/conf_mime/e_int_config_mime.c:186
 msgid "File Types"
-msgstr ""
+msgstr "Типи Файлів"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:69
 msgid "File Icon"
-msgstr ""
+msgstr "Піктограма Файлу"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:137
 msgid "Mime:"
-msgstr ""
+msgstr "Mime:"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:147
 msgid "Use Generated Thumbnail"
-msgstr ""
+msgstr "Використовувати Згенеровану Мініатюру"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:150
 msgid "Use Theme Icon"
-msgstr ""
+msgstr "Використовувати Тему Піктограми"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:153
 msgid "Use Edje File"
-msgstr ""
+msgstr "Використовувати Файл Edje"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:156
 msgid "Use Image"
-msgstr ""
+msgstr "Використовувати Зображення"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:159
 msgid "Use Default"
-msgstr ""
+msgstr "За замовчуванням"
 
 #: src/modules/conf_mime/e_int_config_mime_edit.c:270
 msgid "Select an Edj File"
-msgstr ""
+msgstr "Вибрати Файл Edje"
 
 #: src/modules/conf_mime/e_mod_main.c:34 src/modules/fileman/e_mod_main.c:49
 #: src/modules/fileman/e_mod_main.c:67 src/modules/fileman/e_mod_main.c:377
 msgid "Files"
-msgstr ""
+msgstr "Файли"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:7
 msgid ""
@@ -4674,1165 +4922,1173 @@ msgid ""
 "or roll a wheel, to assign mouse binding.<br>Press <hilight>Escape</"
 "highlight> to abort."
 msgstr ""
+"Будь ласка, тримаючи потрібну Вам клавішу модифікатора<br>натисніть кнопку "
+"або прокрутіть коліщатко мишки,<br>щоб визначити прив'язки.<br>Натисніть "
+"<hilight>Escape</ highlight> щоб скасувати."
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:112
 msgid "Mouse Binding Settings"
-msgstr ""
+msgstr "Налаштування Прив'язок Мишки"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:275
 #: src/modules/conf_mousebindings/e_mod_main.c:35
 msgid "Mouse Bindings"
-msgstr ""
+msgstr "Прив'язки Мишки"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:281
 msgid "Add Binding"
-msgstr ""
+msgstr "Додати Прив'язку"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:283
 msgid "Delete Binding"
-msgstr ""
+msgstr "Видалити Прив'язку"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:287
 msgid "Modify Binding"
-msgstr ""
+msgstr "Змінити Прив'язку"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:295
 msgid "Restore Mouse and Wheel Binding Defaults"
-msgstr ""
+msgstr "Відновити Стандартні Прив'язки Мишки та Коліщатка"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:315
 msgid "Action Context"
-msgstr ""
+msgstr "Контекст Виконання"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:317
 msgid "Any"
-msgstr ""
+msgstr "Будь-який"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:329
 msgid "Win List"
-msgstr ""
+msgstr "Список Вікон"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:333
 msgid "Popup"
-msgstr ""
+msgstr "Підказка"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:337
 msgid "Zone"
-msgstr ""
+msgstr "Зона"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:341
 msgid "Container"
-msgstr ""
+msgstr "Контейнер"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:345
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:1272
 msgid "Mouse Binding Sequence"
-msgstr ""
+msgstr "Послідовність прив'язок Мишки"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:45
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:137
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:217
 msgid "Cursor Settings"
-msgstr ""
+msgstr "Налаштування Курсору"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:129
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:209
 msgid "Show Cursor"
-msgstr ""
+msgstr "Показувати Курсор"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:133
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:213
 msgid "Idle Cursor"
-msgstr ""
+msgstr "Бездіяльний Курсор"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:141
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:221
 msgid "Use Enlightenment Cursor"
-msgstr ""
+msgstr "Використовувати E17 Курсор"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:143
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:223
 msgid "Use X Cursor"
-msgstr ""
+msgstr "Використовувати X Курсор"
 
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:225
 msgid "Cursor Size"
-msgstr ""
+msgstr "Розмір Курсору"
 
 #: src/modules/conf_mouse_cursor/e_mod_main.c:35
 msgid "Mouse Cursor"
-msgstr ""
+msgstr "Курсор Мишки"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
-msgstr ""
+msgstr "Параметри Мишки"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
-msgstr ""
+msgstr "Мишка для правої/лівої руки"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
-msgstr ""
+msgstr "Прискорення Мишки"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
-msgstr ""
+msgstr "Прискорення"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
-msgstr ""
+msgstr "Поріг"
 
 #: src/modules/conf_paths/e_int_config_paths.c:62
 msgid "Search Path Settings"
-msgstr ""
+msgstr "Шукати встановлення шляхів"
 
 #: src/modules/conf_paths/e_int_config_paths.c:73
 msgid "Data"
-msgstr ""
+msgstr "Дані"
 
 #: src/modules/conf_paths/e_int_config_paths.c:75
 msgid "Images"
-msgstr ""
+msgstr "Зображення"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
-msgstr ""
+msgstr "Теми"
 
 #: src/modules/conf_paths/e_int_config_paths.c:81
 msgid "Icons"
-msgstr ""
+msgstr "Піктограми"
 
 #: src/modules/conf_paths/e_int_config_paths.c:85
 msgid "Backgrounds"
-msgstr ""
+msgstr "Тло"
 
 #: src/modules/conf_paths/e_int_config_paths.c:87
 msgid "Messages"
-msgstr ""
+msgstr "Повідомлення"
 
 #: src/modules/conf_paths/e_int_config_paths.c:168
 msgid "E Paths"
-msgstr ""
+msgstr "Шляхи E"
 
 #: src/modules/conf_paths/e_int_config_paths.c:199
 msgid "Default Directories"
-msgstr ""
+msgstr "Каталоги За Замовчуванням"
 
 #: src/modules/conf_paths/e_int_config_paths.c:206
 msgid "User Defined Directories"
-msgstr ""
+msgstr "Каталоги Встановлені Користувачем"
 
 #: src/modules/conf_paths/e_mod_main.c:35
 msgid "Search Directories"
-msgstr ""
+msgstr "Пошук в Каталогах"
 
 #: src/modules/conf_performance/e_int_config_performance.c:40
 msgid "Performance Settings"
-msgstr ""
+msgstr "Налаштування Продуктивності"
 
 #: src/modules/conf_performance/e_int_config_performance.c:95
 #: src/modules/conf_performance/e_int_config_performance.c:135
 msgid "Framerate"
-msgstr ""
+msgstr "Частота кадрів"
 
 #: src/modules/conf_performance/e_int_config_performance.c:97
 #: src/modules/conf_performance/e_int_config_performance.c:137
 #, c-format
 msgid "%1.0f fps"
-msgstr ""
+msgstr "%1.0f fps"
 
 #: src/modules/conf_performance/e_int_config_performance.c:100
 #: src/modules/conf_performance/e_int_config_performance.c:140
 msgid "Application Priority"
-msgstr ""
+msgstr "Пріоритет програми"
 
 #: src/modules/conf_performance/e_int_config_performance.c:146
 msgid "Cache Settings"
-msgstr ""
+msgstr "Налаштування Кешування"
 
 #: src/modules/conf_performance/e_int_config_performance.c:147
 msgid "Cache Flush Interval"
-msgstr ""
+msgstr "Інтервал Очищення Кешу"
 
 #: src/modules/conf_performance/e_int_config_performance.c:152
 msgid "Size Of Font Cache"
-msgstr ""
+msgstr "Розмір Кешу Шрифтів"
 
 #: src/modules/conf_performance/e_int_config_performance.c:154
 #, c-format
 msgid "%1.1f MB"
-msgstr ""
+msgstr "%1.1f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:157
 msgid "Size Of Image Cache"
-msgstr ""
+msgstr "Розмір Кешу Зображень"
 
 #: src/modules/conf_performance/e_int_config_performance.c:159
 #, c-format
 msgid "%1.0f MB"
-msgstr ""
+msgstr "%1.0f MB"
 
 #: src/modules/conf_performance/e_int_config_performance.c:162
 msgid "Number Of Edje Files To Cache"
-msgstr ""
+msgstr "Кількість Кешованих Edje Файлів"
 
 #: src/modules/conf_performance/e_int_config_performance.c:164
 #, c-format
 msgid "%1.0f files"
-msgstr ""
+msgstr "%1.0f файлів"
 
 #: src/modules/conf_performance/e_int_config_performance.c:167
 msgid "Number Of Edje Collections To Cache"
-msgstr ""
+msgstr "Кількість Кешованих Колекцій Edje"
 
 #: src/modules/conf_performance/e_int_config_performance.c:169
 #, c-format
 msgid "%1.0f collections"
-msgstr ""
+msgstr "%1.0f колекцій"
 
 #: src/modules/conf_performance/e_mod_main.c:35
 msgid "Performance"
-msgstr ""
+msgstr "Продуктивність"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
-msgstr ""
+msgstr "Вибір Профілю"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
-msgstr ""
+msgstr "Доступні Профілі"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
-msgstr ""
+msgstr "Вибрати профіль"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
-msgstr ""
+msgstr "Скинути"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
-msgstr ""
+msgstr "Ви хочете видалити \"%s\" профіль.<br><br>Ви впевнені?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
-msgstr ""
+msgstr "Видалити?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
-msgstr ""
+msgstr "Додати Новий Профіль"
 
 #: src/modules/conf_profiles/e_mod_main.c:22
 msgid "Profiles"
-msgstr ""
+msgstr "Профілі"
 
 #: src/modules/conf_scale/e_int_config_scale.c:61
 msgid "Scaling Settings"
-msgstr ""
+msgstr "Налаштування Маштабування"
 
 #: src/modules/conf_scale/e_int_config_scale.c:140
 msgid "Scale with DPI"
-msgstr ""
+msgstr "Маштабувати з DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:144
 msgid "Relative"
-msgstr ""
+msgstr "Відносно"
 
 #: src/modules/conf_scale/e_int_config_scale.c:145
 msgid "Base DPI to scale relative to"
-msgstr ""
+msgstr "Базова роздільна здатність для відносного масштабування"
 
 #: src/modules/conf_scale/e_int_config_scale.c:148
 #: src/modules/conf_scale/e_int_config_scale.c:259
 #, c-format
 msgid "%1.0f DPI"
-msgstr ""
+msgstr "%1.0f DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:151
 #, c-format
 msgid "Currently %i DPI"
-msgstr ""
+msgstr "Поточна роздільна здатність %i DPI"
 
 #: src/modules/conf_scale/e_int_config_scale.c:245
 msgid "Policy"
-msgstr ""
+msgstr "Політика"
 
 #: src/modules/conf_scale/e_int_config_scale.c:248
 msgid "Don't Scale"
-msgstr ""
+msgstr "Не масштабувати"
 
 #: src/modules/conf_scale/e_int_config_scale.c:252
 msgid "Scale relative to screen DPI"
-msgstr ""
+msgstr "Масштабувати відносно роздільної здатності екрану"
 
 #: src/modules/conf_scale/e_int_config_scale.c:255
 #, c-format
 msgid "Base DPI (Currently %i DPI)"
-msgstr ""
+msgstr "Базова роздільна здатність (Поточне %i DPI)"
 
 #: src/modules/conf_scale/e_int_config_scale.c:263
 msgid "Custom scaling factor"
-msgstr ""
+msgstr "Масштабний коефіцієнт Користувача"
 
 #: src/modules/conf_scale/e_int_config_scale.c:266
 #: src/modules/conf_scale/e_int_config_scale.c:276
 #: src/modules/conf_scale/e_int_config_scale.c:282
 #, c-format
 msgid "%1.2f times"
-msgstr ""
+msgstr "%1.2f раз"
 
 #: src/modules/conf_scale/e_int_config_scale.c:272
 msgid "Constraints"
-msgstr ""
+msgstr "Обмеження"
 
 #: src/modules/conf_scale/e_int_config_scale.c:273
 msgid "Minimum"
-msgstr ""
+msgstr "Мінімум"
 
 #: src/modules/conf_scale/e_int_config_scale.c:279
 msgid "Maximum"
-msgstr ""
+msgstr "Максимум"
 
 #: src/modules/conf_scale/e_mod_main.c:35
 msgid "Scaling"
-msgstr ""
+msgstr "Масштаб"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:67
 msgid "Screen Saver Settings"
-msgstr ""
+msgstr "Налаштування Зберігача Екрану"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:135
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:173
 msgid "Enable X screensaver"
-msgstr ""
+msgstr "Ввімкнути збереження екрану"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:138
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:176
 msgid "Screensaver Timer(s)"
-msgstr ""
+msgstr "Таймер(и) Зберігача Екрану"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:140
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:178
 msgid "Time until X screensaver starts"
-msgstr ""
+msgstr "Час до старту X зберігача екрану"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
-msgstr ""
+msgstr "Час до зміни X зберігача екрану"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
-msgstr ""
+msgstr "Затемненя"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:221
 msgid "Preferred"
-msgstr ""
+msgstr "Бажано"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:224
 msgid "Not Preferred"
-msgstr ""
+msgstr "Не Бажано"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:229
 msgid "Exposure Events"
-msgstr ""
+msgstr "Витяг події"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:234
 msgid "Allow"
-msgstr ""
+msgstr "Дозволити"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:237
 msgid "Don't Allow"
-msgstr ""
+msgstr "Не Дозволяти"
 
 #: src/modules/conf_screensaver/e_mod_main.c:35
 msgid "Screen Saver"
-msgstr ""
+msgstr "Зберігач Екрану"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:71
 msgid "Configured Shelves"
-msgstr ""
+msgstr "Налаштовані Полички"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:84
 #: src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
-msgstr ""
+msgstr "Setup"
 
 #: src/modules/conf_shelves/e_int_config_shelf.c:277
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "shelf?"
-msgstr ""
+msgstr "Ви просите видалити \"%s\".<br><br>Ви впевнені? Видалити цю поличку?"
 
 #: src/modules/conf_startup/e_int_config_startup.c:39
 msgid "Startup Settings"
-msgstr ""
+msgstr "Налаштування Запуску"
 
 #: src/modules/conf_startup/e_int_config_startup.c:328
 msgid "Show Splash Screen on Login"
-msgstr ""
+msgstr "Показати Заставку під час Входу"
 
 #: src/modules/conf_startup/e_mod_main.c:35
 #: src/modules/conf_transitions/e_int_config_transitions.c:134
 msgid "Startup"
-msgstr ""
+msgstr "Запуск"
 
 #: src/modules/conf_theme/e_int_config_theme.c:90
 msgid "Theme Selector"
-msgstr ""
+msgstr "Вибір Теми"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
-msgstr ""
+msgstr " Імпортувати..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
-msgstr ""
+msgstr " В мережі..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
-msgstr ""
+msgstr "Категорії Тем"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
-msgstr ""
+msgstr "Призначити"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
-msgstr ""
+msgstr "Очистити Все"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:67
 msgid "Select a Theme..."
-msgstr ""
+msgstr "Вибір Теми..."
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:274
 #: src/modules/conf_theme/e_int_config_theme_import.c:283
 msgid "Theme Import Error"
-msgstr ""
+msgstr "Помилка Імпорту Теми"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:275
 msgid ""
 "Enlightenment was unable to import the theme.<br><br>Are you sure this is "
 "really a valid theme?"
 msgstr ""
+"Enlightenment не зміг імпортувати тему.<br><br>Ви впевнені що це відповідна "
+"тема?"
 
 #: src/modules/conf_theme/e_int_config_theme_import.c:284
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
-msgstr ""
+msgstr "Enlightenment не зміг імпортувати тему<br>через помилку копіювання"
 
 #: src/modules/conf_theme/e_int_config_theme_web.c:127
 msgid "Exchange themes"
-msgstr ""
+msgstr "Змінити теми"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:44
 msgid "Transition Settings"
-msgstr ""
+msgstr "Налаштування Переходу"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:126
 msgid "Events"
-msgstr ""
+msgstr "Події"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:135
 msgid "Desk Change"
-msgstr ""
+msgstr "Зміна Стільниці"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:136
 msgid "Background Change"
-msgstr ""
+msgstr "Змінити Фон"
 
 #: src/modules/conf_transitions/e_int_config_transitions.c:144
 #: src/modules/conf_transitions/e_mod_main.c:35
 msgid "Transitions"
-msgstr ""
+msgstr "Переходи"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:110
 msgid "Wallpaper Settings"
-msgstr ""
+msgstr "Налаштування Шпалер"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
-msgstr ""
+msgstr "Використовувати Шпалери з Теми"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
-msgstr ""
+msgstr "Зображення..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
-msgstr ""
+msgstr "Градієнт..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
-msgstr ""
+msgstr "В мережі..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
-msgstr ""
+msgstr "Де розташувати Шпалери"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
-msgstr ""
+msgstr "Всі Стільниці"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
-msgstr ""
+msgstr "Ця Стільниця"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
-msgstr ""
+msgstr "Цей Екран"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:97
 msgid "Create a gradient..."
-msgstr ""
+msgstr "Створити градієнт ..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:124
 msgid "Color 1:"
-msgstr ""
+msgstr "Колір 1:"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:128
 msgid "Color 2:"
-msgstr ""
+msgstr "Колір 2:"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:164
 msgid "Fill Options"
-msgstr ""
+msgstr "Опції Наповнення"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
-msgstr ""
+msgstr "Горизонтальна"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
-msgstr ""
+msgstr "Вертикальна"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:177
 msgid "Diagonal Up"
-msgstr ""
+msgstr "Діагональ Вверх"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:182
 msgid "Diagonal Down"
-msgstr ""
+msgstr "Діагональ Вниз"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:187
 msgid "Radial"
-msgstr ""
+msgstr "Радіальний"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:370
 msgid "Gradient Creation Error"
-msgstr ""
+msgstr "Помилка Створення Градієнту"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:371
 msgid "For some reason, Enlightenment was unable to create a gradient."
-msgstr ""
+msgstr "З якоїсь причини Enlightenment не зміг створити градієнт."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:128
 msgid "Wallpaper settings..."
-msgstr ""
+msgstr "Параметри Шпалер"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:164
 msgid "Fill and Stretch Options"
-msgstr ""
+msgstr "Опції Наповнення та Розтягування"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:167
 msgid "Stretch"
-msgstr ""
+msgstr "Розтягнути"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:172
 msgid "Center"
-msgstr ""
+msgstr "По центру"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:177
 msgid "Tile"
-msgstr ""
+msgstr "Розмножити"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:182
 msgid "Within"
-msgstr ""
+msgstr "В межах"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:187
 msgid "Fill"
-msgstr ""
+msgstr "Заповнити"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:194
 msgid "File Quality"
-msgstr ""
+msgstr "Якість Файлу"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:196
 msgid "Use original file"
-msgstr ""
+msgstr "Використовувати ориґінальний файл"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:199
 #, c-format
 msgid "%3.0f%%"
-msgstr ""
+msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
-msgstr ""
+msgstr "Вибрати Зображення..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
-msgstr ""
+msgstr "Помилка Імпорту Зображення"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 msgid ""
 "Enlightenment was unable to import the picture<br>due to conversion errors."
 msgstr ""
+"Enlightenment не зміг імпортувати зображення<br>через помилки в конверсії."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
-msgstr ""
+msgstr "Помилка Імпорту Шпалер"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 msgid ""
 "Enlightenment was unable to import the wallpaper<br>due to a copy error."
-msgstr ""
+msgstr "Enlightenment не зміг імпортувати шпалери<br>через помилку копіювання."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr ""
+"Enlightenment не зміг імпортувати фон.<br><br>Ви впевнені що це відповідний "
+"файл фону?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
-msgstr ""
+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:32
 #: src/modules/conf_wallpaper/e_mod_main.c:96
 msgid "Wallpaper"
-msgstr ""
+msgstr "Шпалери"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:58
 #: src/modules/conf_window_display/e_mod_main.c:35
 msgid "Window Display"
-msgstr ""
+msgstr "Показ Вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:167
 msgid "Display"
-msgstr ""
+msgstr "Дисплей"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:168
 msgid "Show window geometry information when moving or resizing"
-msgstr ""
+msgstr "Показувати геометрію вікна під час руху та зміні розміру"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:170
 #: src/modules/conf_window_display/e_int_config_window_display.c:227
 msgid "Animate the shading and unshading of windows"
-msgstr ""
+msgstr "Анімувати згортання та розгортання вікон"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:174
 #: src/modules/conf_window_display/e_int_config_window_display.c:254
 msgid "Automatic New Window Placement"
-msgstr ""
+msgstr "Автоматичне Розташування Нових Вікон"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:176
 #: src/modules/conf_window_display/e_int_config_window_display.c:257
 msgid "Smart Placement"
-msgstr ""
+msgstr "Розумне Розташування"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:178
 #: src/modules/conf_window_display/e_int_config_window_display.c:259
 msgid "Don't hide Gadgets"
-msgstr ""
+msgstr "Не ховати Ґаджети"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:180
 #: src/modules/conf_window_display/e_int_config_window_display.c:261
 msgid "Place at mouse pointer"
-msgstr ""
+msgstr "Розташовувати під вказівником мишки"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:182
 #: src/modules/conf_window_display/e_int_config_window_display.c:263
 msgid "Place manually with the mouse"
-msgstr ""
+msgstr "Розташовувати вручну мишкою"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:184
 #: src/modules/conf_window_display/e_int_config_window_display.c:265
 msgid "Automatically switch to desktop of new window"
-msgstr ""
+msgstr "Автоматично переключатися на стільницю нового вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:203
 msgid "Window Move Geometry"
-msgstr ""
+msgstr "Геометрія Пересування Вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:205
 #: src/modules/conf_window_display/e_int_config_window_display.c:216
 msgid "Display information"
-msgstr ""
+msgstr "Показувати Інформацію"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:207
 msgid "Follow the window as it moves"
-msgstr ""
+msgstr "Слідувати за вікном під час пересування"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:214
 msgid "Window Resize Geometry"
-msgstr ""
+msgstr "Геометрія Зміни Розмірів Вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:218
 msgid "Follow the window as it resizes"
-msgstr ""
+msgstr "Слідувати за вікном під час зміни розмірів"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:225
 msgid "Window Shading"
-msgstr ""
+msgstr "Анімація Вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:234
 msgid "Linear"
-msgstr ""
+msgstr "Лінійно"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:238
 msgid "Smooth accelerate and decelerate"
-msgstr ""
+msgstr "Гладенькі прискорення та уповільнення"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:242
 msgid "Accelerate"
-msgstr ""
+msgstr "Прискорювати"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:246
 msgid "Decelerate"
-msgstr ""
+msgstr "Сповільнювати"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:269
 msgid "Window Border"
-msgstr ""
+msgstr "Межа Вікна"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:272
 msgid "Prefer user defined icon"
-msgstr ""
+msgstr "Віддавати перевагу піктограмі користувача"
 
 #: src/modules/conf_window_display/e_int_config_window_display.c:274
 msgid "Prefer application provided icon"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr ""
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr ""
+msgstr "Віддавати перевагу піктограмі яка надається додатком"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
-msgstr ""
+msgstr "Налаштування Фокусування"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:165
 msgid "Click Window to Focus"
-msgstr ""
+msgstr "Клацнути на Вікно для Фокусу"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:167
 msgid "Window under the Mouse"
-msgstr ""
+msgstr "Вікно під Мишкою"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:169
 msgid "Most recent Window under the Mouse"
-msgstr ""
+msgstr "Найсвіжіше Вікно під Мишкою"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:183
 msgid "Focus"
-msgstr ""
+msgstr "Фокусування"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:185
 msgid "Click to focus"
-msgstr ""
+msgstr "Натиснути для фокусу"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:187
 msgid "Pointer focus"
-msgstr ""
+msgstr "Фокус під покажчиком"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:189
 msgid "Sloppy focus"
-msgstr ""
+msgstr "Зміщений вигляд"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:193
 msgid "New Window Focus"
-msgstr ""
+msgstr "Фокусування Нового Вікна"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:195
 msgid "No new windows get focus"
-msgstr ""
+msgstr "Нові вікна не отримують фокусу"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:197
 msgid "All new windows get focus"
-msgstr ""
+msgstr "Всі нові вікна отримують фокус"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:199
 msgid "Only new dialogs get focus"
-msgstr ""
+msgstr "Тільки нові діалоги отримують фокус"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:201
 msgid "Only new dialogs get focus if the parent has focus"
-msgstr ""
+msgstr "Нові діалоги отримують фокус якщо батьківський мав фокус"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:205
 msgid "Other Settings"
-msgstr ""
+msgstr "Інші Налаштування"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:206
 msgid "Always pass on caught click events to programs"
-msgstr ""
+msgstr "Передавати програмам спіймані натискання"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:208
 msgid "A click on a window always raises it"
-msgstr ""
+msgstr "Клік на вікно завжди піднімає його"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:210
 msgid "A click in a window always focuses it"
-msgstr ""
+msgstr "Клік на вікно завжди фокусує його"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:212
 msgid "Refocus last focused window on desktop switch"
 msgstr ""
+"Фокус на останньому сфокусувованому вікні під час перемикання стільниць"
 
 #: src/modules/conf_window_focus/e_int_config_focus.c:214
 msgid "Revert focus when hiding or closing a window"
-msgstr ""
+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
 #: src/modules/wizard/page_060.c:26
 msgid "Window Focus"
-msgstr ""
+msgstr "Фокусування Вікна"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:54
 #: src/modules/conf_window_manipulation/e_mod_main.c:35
 msgid "Window Geometry"
-msgstr ""
+msgstr "Геометрія Вікна"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:129
 msgid "Resistance"
-msgstr ""
+msgstr "Протидія"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:130
 msgid "Resist moving or resizing a window over an obstacle"
-msgstr ""
+msgstr "Протидія переміщенню або зміні розмірів вікна перед перешкодою"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:132
 msgid "Resistance between windows:"
-msgstr ""
+msgstr "Протидія між вікнами:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:140
 msgid "Resistance at the edge of the screen:"
-msgstr ""
+msgstr "Протидія біля краю екрану:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:148
 msgid "Resistance to desktop gadgets:"
-msgstr ""
+msgstr "Протидія ґаджетів на стільниці:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:160
 msgid "Keyboard move and resize"
-msgstr ""
+msgstr "Переміщення та зміна розміру клавіатурою"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:161
 msgid "Automatically accept changes after:"
-msgstr ""
+msgstr "Автоматично прийняти зміни після:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:165
 msgid "Move by:"
-msgstr ""
+msgstr "Перемістити на:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:169
 msgid "Resize by:"
-msgstr ""
+msgstr "Змінити розмір на:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:44
 #: src/modules/conf_window_manipulation/e_mod_main.c:37
 msgid "Window Maximize Policy"
-msgstr ""
+msgstr "Політика максимізації вікна"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
-msgstr ""
-
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr ""
+msgstr "Смарт-розширення"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
-msgstr ""
+msgstr "Заповнити доступне місце"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:138
 msgid "Maximize Policy"
-msgstr ""
+msgstr "Політика Максимізації"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
-msgstr ""
+msgstr "Напрями максимізації"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
-msgstr ""
+msgstr "Обидва"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr ""
+"Автоматично перемістити/змінити розмір вікна під час авто-приховування "
+"полички"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:48
 #: src/modules/conf_window_manipulation/e_mod_main.c:36
 msgid "Window Stacking"
-msgstr ""
+msgstr "Стиковка вікон"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:121
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:140
 msgid "Automatically raise windows on mouse over"
-msgstr ""
+msgstr "Автоматично піднімати вікна під мишкою"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:124
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:161
 msgid "Allow windows to be above fullscreen window"
-msgstr ""
+msgstr "Дозволяти вікна наверху повноекранного вікна"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:139
 msgid "Autoraise"
-msgstr ""
+msgstr "Автопідйом"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:142
 msgid "Delay before raising:"
-msgstr ""
+msgstr "Затримка перед підйомом:"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:155
 msgid "Raise Window"
-msgstr ""
+msgstr "Підняти Вікно"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:157
 msgid "Raise when starting to move or resize"
-msgstr ""
+msgstr "Піднімати перед початком руху або зміною розміру"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_stacking.c:159
 msgid "Raise when clicking to focus"
-msgstr ""
+msgstr "Піднімати під час кліку для фокусу"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
+msgstr "Пам'ять Вікна"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
-msgid "Delete Remember(s)"
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
 msgstr ""
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
+msgid "Delete Remember(s)"
+msgstr "Стерти Пам'ять Вікна"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
-msgstr ""
+msgstr "Подробиці"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
-msgstr ""
+msgstr "<Без назви>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
-msgstr ""
+msgstr "Клас:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
-msgstr ""
+msgstr "<Без Класу>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
-msgstr ""
+msgstr "Заголовок:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
-msgstr ""
+msgstr "<Без Заголовку>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
-msgstr ""
+msgstr "Роль:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
-msgstr ""
+msgstr "<Без Ролі>"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:62
 msgid "Window List Settings"
-msgstr ""
+msgstr "Налаштування Списку Вікон"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:145
 msgid "Show iconified windows"
-msgstr ""
+msgstr "Показувати згорнуті вікна"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:147
 msgid "Show iconified windows from other desks"
-msgstr ""
+msgstr "Показувати згорнуті вікна з інших стільниць"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:151
 msgid "Show iconified windows from other screens"
-msgstr ""
+msgstr "Показувати згорнуті вікна з інших екранів"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:157
 msgid "Show windows from other desks"
-msgstr ""
+msgstr "Показувати вікна з інших стільниць"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:159
 msgid "Show windows from other screens"
-msgstr ""
+msgstr "Показувати вікна з інших екранів"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:163
 #: src/modules/conf_winlist/e_int_config_winlist.c:241
 msgid "Selection Settings"
-msgstr ""
+msgstr "Налаштування Виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:164
 #: src/modules/conf_winlist/e_int_config_winlist.c:242
 msgid "Focus window while selecting"
-msgstr ""
+msgstr "Фокусувати вікно під час виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:166
 #: src/modules/conf_winlist/e_int_config_winlist.c:244
 msgid "Raise window while selecting"
-msgstr ""
+msgstr "Піднімати вікно під час виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:168
 #: src/modules/conf_winlist/e_int_config_winlist.c:246
 msgid "Warp mouse to window while selecting"
-msgstr ""
+msgstr "Прив'язувати мишку до вікна під час виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:170
 #: src/modules/conf_winlist/e_int_config_winlist.c:248
 msgid "Uncover windows while selecting"
-msgstr ""
+msgstr "Показувати вікно під час виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:172
 #: src/modules/conf_winlist/e_int_config_winlist.c:250
 msgid "Jump to desk while selecting"
-msgstr ""
+msgstr "Переходити на стільницю під час виділення"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:176
 #: src/modules/conf_winlist/e_int_config_winlist.c:254
 msgid "Warp Settings"
-msgstr ""
+msgstr "Налаштування Переходу"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:177
 #: src/modules/conf_winlist/e_int_config_winlist.c:255
 msgid "Warp At End"
-msgstr ""
+msgstr "Перехід в Кінці"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:257
 msgid "Warp Speed"
-msgstr ""
+msgstr "Швидкість Переходу"
 
 #: src/modules/cpufreq/e_mod_main.c:135
 msgid "Cpufreq"
-msgstr ""
+msgstr "Cpufreq"
 
 #: src/modules/cpufreq/e_mod_main.c:182
 msgid "Fast (4 ticks)"
-msgstr ""
+msgstr "Швидко (4 тіка)"
 
 #: src/modules/cpufreq/e_mod_main.c:189
 msgid "Medium (8 ticks)"
-msgstr ""
+msgstr "Помірно (8 тіків)"
 
 #: src/modules/cpufreq/e_mod_main.c:196
 msgid "Normal (32 ticks)"
-msgstr ""
+msgstr "Нормально (32 тіка)"
 
 #: src/modules/cpufreq/e_mod_main.c:203
 msgid "Slow (64 ticks)"
-msgstr ""
+msgstr "Повільно (64 тіка)"
 
 #: src/modules/cpufreq/e_mod_main.c:210
 msgid "Very Slow (256 ticks)"
-msgstr ""
+msgstr "Дуже Повільно (256 тіків)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
-msgstr ""
+msgstr "Вказати Самому"
 
 #: src/modules/cpufreq/e_mod_main.c:229 src/modules/cpufreq/e_mod_main.c:263
 msgid "Lower Power Automatic"
-msgstr ""
+msgstr "Автоматично Знижувати Потужність"
 
 #: src/modules/cpufreq/e_mod_main.c:231 src/modules/cpufreq/e_mod_main.c:265
 msgid "Minimum Speed"
-msgstr ""
+msgstr "Мінімальна Швидкість"
 
 #: src/modules/cpufreq/e_mod_main.c:233 src/modules/cpufreq/e_mod_main.c:267
 msgid "Maximum Speed"
-msgstr ""
+msgstr "Максимальна Швидкість"
 
 #: src/modules/cpufreq/e_mod_main.c:244
 msgid "Restore CPU Power Policy"
-msgstr ""
+msgstr "Відновлювати Налаштування Потужності ЦПУ"
 
 #: src/modules/cpufreq/e_mod_main.c:252
 msgid "Powersaving policy"
-msgstr ""
+msgstr "Політика енергозбереження"
 
 #: src/modules/cpufreq/e_mod_main.c:280
 msgid "Automatic powersaving"
-msgstr ""
+msgstr "Автоматичне енергозбереження"
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
 msgid "%i MHz"
-msgstr ""
+msgstr "%i Мгц"
 
 #: src/modules/cpufreq/e_mod_main.c:301
 #, c-format
 msgid "%i.%i GHz"
-msgstr ""
+msgstr "%i.%i Ґґц"
 
 #: src/modules/cpufreq/e_mod_main.c:318
 msgid "Time Between Updates"
-msgstr ""
+msgstr "Час Між Оновленнями"
 
 #: src/modules/cpufreq/e_mod_main.c:324
 msgid "Set CPU Power Policy"
-msgstr ""
+msgstr "Вказати Налаштування Потужності ЦПУ"
 
 #: src/modules/cpufreq/e_mod_main.c:331
 msgid "Set CPU Speed"
-msgstr ""
+msgstr "Встановити Швидкість ЦПУ"
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
-msgstr ""
+msgstr "Режим енергозбереження"
 
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid ""
 "There was an error trying to set the<br>cpu frequency governor via the "
 "module's<br>setfreq utility."
 msgstr ""
+"Помилка налаштування регулятора<br>частоти ЦПУ за допомогою "
+"утиліти<br>setfreq цього модуля."
 
 #: src/modules/cpufreq/e_mod_main.c:412
 msgid ""
@@ -5840,108 +6096,112 @@ msgid ""
 "missing<br>Kernel modules or features, or your CPU<br>simply does not "
 "support this feature."
 msgstr ""
+"Ваше ядро не підтримує регулювання частоти<br>ЦПУ взагалі. Може ви не "
+"довантажити<br> необхідні модулі ядра, або ваш ЦПУ<br>просто не підтримує цю "
+"особливість."
 
 #: src/modules/cpufreq/e_mod_main.c:432
 msgid ""
 "There was an error trying to set the<br>cpu frequency setting via the "
 "module's<br>setfreq utility."
 msgstr ""
+"Помилка налаштування частоти ЦПУ<br>за допомогою утиліти setfreq цього модуля"
 
 #: src/modules/dropshadow/e_mod_config.c:40
 msgid "Dropshadow Settings"
-msgstr ""
+msgstr "Параметри Тіней"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
-msgstr ""
+msgstr "Якість"
 
 #: src/modules/dropshadow/e_mod_config.c:111
 msgid "High Quality"
-msgstr ""
+msgstr "Висока Якість"
 
 #: src/modules/dropshadow/e_mod_config.c:113
 msgid "Medium Quality"
-msgstr ""
+msgstr "Середня Якість"
 
 #: src/modules/dropshadow/e_mod_config.c:115
 msgid "Low Quality"
-msgstr ""
+msgstr "Низька Якість"
 
 #: src/modules/dropshadow/e_mod_config.c:119
 msgid "Blur Type"
-msgstr ""
+msgstr "Тип Розмивання"
 
 #: src/modules/dropshadow/e_mod_config.c:122
 msgid "Very Fuzzy"
-msgstr ""
+msgstr "Дуже Розмита"
 
 #: src/modules/dropshadow/e_mod_config.c:124
 msgid "Fuzzy"
-msgstr ""
+msgstr "Розмита"
 
 #: src/modules/dropshadow/e_mod_config.c:128
 msgid "Sharp"
-msgstr ""
+msgstr "Різка"
 
 #: src/modules/dropshadow/e_mod_config.c:130
 msgid "Very Sharp"
-msgstr ""
+msgstr "Дуже Різка"
 
 #: src/modules/dropshadow/e_mod_config.c:134
 msgid "Shadow Distance"
-msgstr ""
+msgstr "Дистанція Тіні"
 
 #: src/modules/dropshadow/e_mod_config.c:137
 msgid "Very Far"
-msgstr ""
+msgstr "Дуже Далеко"
 
 #: src/modules/dropshadow/e_mod_config.c:139
 msgid "Far"
-msgstr ""
+msgstr "Далеко"
 
 #: src/modules/dropshadow/e_mod_config.c:141
 msgid "Near"
-msgstr ""
+msgstr "Близько"
 
 #: src/modules/dropshadow/e_mod_config.c:143
 msgid "Very Near"
-msgstr ""
+msgstr "Дуже Близько"
 
 #: src/modules/dropshadow/e_mod_config.c:145
 msgid "Extremely Near"
-msgstr ""
+msgstr "Надзвичайно Близько"
 
 #: src/modules/dropshadow/e_mod_config.c:147
 msgid "Underneath"
-msgstr ""
+msgstr "Під Собою"
 
 #: src/modules/dropshadow/e_mod_config.c:151
 msgid "Shadow Darkness"
-msgstr ""
+msgstr "Темнота Тіні"
 
 #: src/modules/dropshadow/e_mod_config.c:154
 msgid "Very Dark"
-msgstr ""
+msgstr "Дуже Темна"
 
 #: src/modules/dropshadow/e_mod_config.c:156
 msgid "Dark"
-msgstr ""
+msgstr "Темна"
 
 #: src/modules/dropshadow/e_mod_config.c:158
 msgid "Light"
-msgstr ""
+msgstr "Світла"
 
 #: src/modules/dropshadow/e_mod_config.c:160
 msgid "Very Light"
-msgstr ""
+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:69
 msgid "Run Command Dialog"
-msgstr ""
+msgstr "Діалог Запуску Команди"
 
 #: src/modules/fileman/e_mod_main.c:310 src/modules/illume/e_mod_win.c:180
 msgid "Home"
@@ -5949,11 +6209,11 @@ msgstr "Домівка"
 
 #: src/modules/fileman/e_mod_main.c:322
 msgid "Favorites"
-msgstr ""
+msgstr "Вибрані"
 
 #: src/modules/fileman/e_mod_main.c:334
 msgid "Root"
-msgstr ""
+msgstr "Файлова система"
 
 #: src/modules/fileman/e_mod_main.c:431
 msgid ""
@@ -5965,6 +6225,14 @@ msgid ""
 "defaults will fix<br>that by adding it in. You can re-configure things now "
 "to your<br>liking. Sorry for the hiccup in your configuration.<br>"
 msgstr ""
+"Налаштування даних Файлового Менеджера потребують оновлення. Ваша "
+"стара<br>конфігурація була стерта а нова встановлена за замовчанням. "
+"Таке<br>буде траплятись регулярно протягом розбудови Enlightenment, тому "
+"не<br>звітуйте про помилку. Це просто означає що Файловий Менеджер "
+"потребує<br> нової конфігурації даних за замовчуванням, а Вашої старої "
+"конфігурації<br>просто недостатньо. Ці нові налаштування за замовчанням "
+"буде<br>зафіксовано і додано. Зараз Ви можете зробити нову "
+"конфігурацію<br>на свій смак. Пробачте за незручності.<br>"
 
 #: src/modules/fileman/e_mod_main.c:444
 msgid ""
@@ -5975,309 +6243,314 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
+"Ваша конфігурація Файлового Менеджера БІЛЬШ НОВА ніж Enlightenment. Це дуже "
+"дивно.<br>Такого не повинно траплятися, якщо тільки Ви не занизили версію "
+"модуля ФМ або<br>не скопіювали конфігурацію з місця, де була більш нова "
+"версія ФМ.<br>Це погано, і тому ваша конфігурація була відновлена на "
+"стандартну.<br>Вибачте за незручності.<br>"
 
 #: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
-msgstr ""
+msgstr "Параметри Файлового Менеджера оновлено"
 
 #: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
-msgstr ""
+msgstr "Налаштування Файлового Менеджера"
 
 #: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
-msgstr ""
+msgstr "Розмір Піктограми"
 
 #: src/modules/fileman/e_mod_config.c:233
 msgid "View"
-msgstr ""
+msgstr "Вигляд"
 
 #: src/modules/fileman/e_mod_config.c:236
 msgid "Open Dirs In Place"
-msgstr ""
+msgstr "Відкривати Каталоги На Місці"
 
 #: src/modules/fileman/e_mod_config.c:240
 msgid "Sort Dirs First"
-msgstr ""
+msgstr "Каталоги Відсортовано Першими"
 
 #: src/modules/fileman/e_mod_config.c:243
 msgid "Case Sensitive"
-msgstr ""
+msgstr "Відчутно до регістру"
 
 #: src/modules/fileman/e_mod_config.c:247
 msgid "Use Single Click"
-msgstr ""
+msgstr "Використовувати Один Клік"
 
 #: src/modules/fileman/e_mod_config.c:250
 msgid "Use Alternate Selection Modifiers"
-msgstr ""
+msgstr "Використовувати Альтернативний Вибір Модифікатора"
 
 #: src/modules/fileman/e_mod_config.c:254
 msgid "Show Icon Extension"
-msgstr ""
+msgstr "Показувати Розширення Піктограм"
 
 #: src/modules/fileman/e_mod_config.c:257
 msgid "Show Full Path"
-msgstr ""
+msgstr "Показати Повний Шлях"
 
 #: src/modules/fileman/e_mod_config.c:260
 msgid "Show Desktop Icons"
-msgstr ""
+msgstr "Показувати Піктограми на Стільниці"
 
 #: src/modules/fileman/e_mod_config.c:263
 msgid "Show Toolbar"
-msgstr ""
+msgstr "Показувати Панель Інструментів"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
-msgstr ""
+msgstr "Поведінка"
 
 #: src/modules/fileman/e_mod_config.c:270
 msgid "Show HAL icons on desktop"
-msgstr ""
+msgstr "Показувати піктограми HAL на стільниці"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "Монтувати томи під час підключення"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "Відкривати менеджер файлів під час монтування"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
-msgstr ""
+msgstr "В Батьківський Каталог"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
-msgstr ""
+msgstr "Інший додаток..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
-msgstr ""
+msgstr "Відкрити"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
-msgstr ""
+msgstr "Відкрити через..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
-msgstr ""
+msgstr "Відомі програми"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
-msgstr ""
+msgstr "Вказані Програми"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
-msgstr ""
+msgstr "Своя Команда"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
-msgstr ""
+msgstr "Копіювання скасоване"
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "Переміщення скасоване"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "Видалення скасоване"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
-msgstr ""
+msgstr "Unknown operation from slave is aborted"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
-msgstr ""
+msgstr "Копіювання %s зроблено"
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "Копіювання %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "Переміщення %s зроблено"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "Переміщення %s (eta: %d sec)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Delete done"
-msgstr "Вилучити"
+msgstr "Видалення зроблено"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr ""
+msgstr "Видалення файлів..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
-msgstr ""
+msgstr "Невідома операція від підлеглого %d"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
 msgid "(no information)"
-msgstr ""
+msgstr "(немає інформації)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "File: %s"
-msgstr "Файл:"
+msgstr "Файл: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "Із: %s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "До: %s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "Обробка %d операції(й)"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr ""
+msgstr "Файловий менеджер не діє"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
-msgstr ""
+msgstr "Інформація про EFM Дію"
 
 #: src/modules/gadman/e_mod_config.c:58
 msgid "Gadgets Manager"
-msgstr ""
+msgstr "Менеджер Ґаджетів"
 
 #: src/modules/gadman/e_mod_config.c:147
 msgid "Background Mode"
-msgstr ""
+msgstr "Режим Фону"
 
 #: src/modules/gadman/e_mod_config.c:152 src/modules/gadman/e_mod_config.c:184
 msgid "Custom Image"
-msgstr ""
+msgstr "Зображення Користувача"
 
 #: src/modules/gadman/e_mod_config.c:156 src/modules/gadman/e_mod_config.c:177
 msgid "Custom Color"
-msgstr ""
+msgstr "Колір Користувача"
 
 #: src/modules/gadman/e_mod_config.c:160
 msgid "Transparent"
-msgstr ""
+msgstr "Прозорий"
 
 #: src/modules/gadman/e_mod_config.c:167
 msgid "Animations"
-msgstr ""
+msgstr "Анімація"
 
 #: src/modules/gadman/e_mod_config.c:168
 msgid "Background"
-msgstr ""
+msgstr "Фон"
 
 #: src/modules/gadman/e_mod_config.c:171 src/modules/gadman/e_mod_main.c:27
 #: src/modules/gadman/e_mod_main.c:77 src/modules/gadman/e_mod_main.c:84
 #: src/modules/gadman/e_mod_main.c:120 src/modules/gadman/e_mod_main.c:149
 msgid "Gadgets"
-msgstr ""
+msgstr "Ґаджети"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
-msgstr ""
+msgstr "Вільно"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
-msgstr ""
+msgstr "Завжди на стільниці"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
-msgstr ""
+msgstr "Натиснувши зверху"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
-msgstr ""
+msgstr "Додати інші ґаджети"
 
 #: src/modules/gadman/e_mod_main.c:84 src/modules/gadman/e_mod_main.c:120
 msgid "Show/hide gadgets"
-msgstr ""
+msgstr "Показати/сховати ґаджети"
 
 #: src/modules/winlist/e_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
 msgid "Window : List"
-msgstr ""
+msgstr "Вікно : Список"
 
 #: src/modules/winlist/e_mod_main.c:48 src/modules/winlist/e_mod_main.c:64
 msgid "Next Window"
-msgstr ""
+msgstr "Наступне Вікно"
 
 #: src/modules/winlist/e_mod_main.c:50 src/modules/winlist/e_mod_main.c:63
 msgid "Previous Window"
-msgstr ""
+msgstr "Попереднє Вікно"
 
 #: src/modules/winlist/e_winlist.c:141
 msgid "Select a window"
-msgstr ""
+msgstr "Вибрати Вікно"
 
 #: src/modules/ibar/e_mod_config.c:56
 msgid "IBar Settings"
-msgstr ""
+msgstr "Параметри IBar"
 
 #: src/modules/ibar/e_mod_config.c:102
 msgid "Selected Bar Source"
-msgstr ""
+msgstr "Вибране Джерело Розділу"
 
 #: src/modules/ibar/e_mod_config.c:123
 msgid "Icon Labels"
-msgstr ""
+msgstr "Мітки Піктограми"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
-msgstr ""
+msgstr "Показувати Мітку Піктограми"
 
 #: src/modules/ibar/e_mod_config.c:130
 msgid "Display App Name"
-msgstr ""
+msgstr "Показувати Ім'я App"
 
 #: src/modules/ibar/e_mod_config.c:134
 msgid "Display App Comment"
-msgstr ""
+msgstr "Показувати Коментар App"
 
 #: src/modules/ibar/e_mod_config.c:138
 msgid "Display App Generic"
-msgstr ""
+msgstr "Показувати Загальні App"
 
 #: src/modules/ibar/e_mod_config.c:168
 msgid "Create new IBar source"
-msgstr ""
+msgstr "Створити нове джерело IBar"
 
 #: src/modules/ibar/e_mod_config.c:169
 msgid "Enter a name for this new source:"
-msgstr ""
+msgstr "Введіть ім'я для цього нового джерела:"
 
 #: src/modules/ibar/e_mod_config.c:183
 #, c-format
@@ -6285,315 +6558,321 @@ msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
 msgstr ""
+"Ви запропонували стерти \"%s\".<br><br>Ви дійсно хочете стерти це джерело?"
 
 #: src/modules/ibar/e_mod_config.c:187
 msgid "Are you sure you want to delete this bar source?"
-msgstr ""
+msgstr "Ви дійсно хочете стерти джерело для цієї панелі?"
 
 #: src/modules/ibar/e_mod_main.c:215
 msgid "IBar"
-msgstr ""
+msgstr "IBar"
 
 #: src/modules/ibar/e_mod_main.c:797
 msgid "Change Icon Properties"
-msgstr ""
+msgstr "Змінити Властивості Піктограми"
 
 #: src/modules/ibar/e_mod_main.c:802
 msgid "Remove Icon"
-msgstr ""
+msgstr "Вилучити Піктограму"
 
 #: src/modules/ibar/e_mod_main.c:812
 msgid "Add An Icon"
-msgstr ""
+msgstr "Додати Піктограму"
 
 #: src/modules/ibar/e_mod_main.c:819
 msgid "Create New Icon"
-msgstr ""
+msgstr "Створити Нову Піктограму"
 
 #: src/modules/ibar/e_mod_main.c:835
 msgid "Add Application"
-msgstr ""
+msgstr "Додати Програму"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
-msgstr ""
+msgstr "Параметри IBox"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
-msgstr ""
+msgstr "Показувати Ім'я"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
-msgstr ""
+msgstr "Показувати Назву"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
-msgstr ""
+msgstr "Показувати Клас"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
-msgstr ""
+msgstr "Показати Ім'я Піктограми"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
-msgstr ""
+msgstr "Показувати Заголовок Вікна"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
-msgstr ""
+msgstr "Показувати вікна зі всіх екранів"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
-msgstr ""
+msgstr "Показувати вікна з поточного екрану"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
-msgstr ""
+msgstr "Показувати вікна зі всіх стільниць"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
-msgstr ""
+msgstr "Показувати вікна з поточної стільниці"
 
 #: src/modules/ibox/e_mod_main.c:227
 msgid "IBox"
-msgstr ""
+msgstr "IBox"
 
 #: src/modules/pager/e_mod_config.c:72
 msgid "Pager Settings"
-msgstr ""
+msgstr "Налаштування Пейджера"
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
-msgstr ""
+msgstr "Перехід по стільницям коліщатком мишки"
 
 #: src/modules/pager/e_mod_config.c:123 src/modules/pager/e_mod_config.c:163
 msgid "Show desktop names"
-msgstr ""
+msgstr "Показувати назви стільниць"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
-msgstr ""
+msgstr "Налаштування Підказок"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
-msgstr ""
+msgstr "Показати підказку під час зміни стільниці"
 
 #: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
-msgstr ""
+msgstr "Показувати підказку для термінових вікон"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr ""
+msgstr "Кнопка - Вибір та Рух"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
-msgstr ""
+msgstr "Натисніть щоб встановити"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
-msgstr ""
+msgstr "Кнопка Тягни-та-Кидай"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
-msgstr ""
+msgstr "Тягнути всю стільницю"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
-msgstr ""
+msgstr "Висота вікна підказки задіяного клавішею"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
-msgstr ""
+msgstr "%.0f пікс."
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
-msgstr ""
+msgstr "Опір під час перетягування"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
-msgstr ""
+msgstr "Висота вікна підказки для пейджера"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
-msgstr ""
+msgstr "Швидкість підказки"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
-msgstr ""
+msgstr "%1.1f сек"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
-msgstr ""
+msgstr "Налаштуваняя Термінового Вікна"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr ""
+msgstr "Показувати підказку в терміновому вікні"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
-msgstr ""
+msgstr "Підказка залипає на екрані в терміновому вікні"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
-msgstr ""
+msgstr "Кнопки Захоплення Пейджера"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
+"Будь ласка, натисніть клавішу мишки<br>Натисніть <hilight>Escape</ hilight> "
+"для скасування.<br>Або <hilight>Del</ hilight> для скидання кнопки."
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
-msgstr ""
+msgstr "Увага"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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>Ця "
+"кнопка працює тільки в Підказках"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
-msgstr ""
+msgstr "Кнопка %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
-msgstr ""
+msgstr "Показувати Підказку Пейджера"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
-msgstr ""
+msgstr "Пересунути Підказку Праворуч"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
-msgstr ""
+msgstr "Пересунути Підказку Ліворуч"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
-msgstr ""
+msgstr "Пересунути Підказку Догори"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
-msgstr ""
+msgstr "Пересунути Підказку Донизу"
 
 #: src/modules/start/e_mod_main.c:111
 msgid "Start"
-msgstr ""
+msgstr "Пуск"
 
 #: src/modules/syscon/e_mod_main.c:34
 msgid "System Control"
-msgstr ""
+msgstr "Управління Системою"
 
 #: src/modules/syscon/e_mod_main.c:55
 msgid "System Controls"
-msgstr ""
+msgstr "Модулі Управління Системою"
 
 #: src/modules/temperature/e_mod_config.c:63
 msgid "Temperature Settings"
-msgstr ""
+msgstr "Параметри температури"
 
 #: src/modules/temperature/e_mod_config.c:248
 #: src/modules/temperature/e_mod_config.c:352
 msgid "Display Units"
-msgstr ""
+msgstr "Показувати градуси за"
 
 #: src/modules/temperature/e_mod_config.c:250
 #: src/modules/temperature/e_mod_config.c:354
 msgid "Celsius"
-msgstr ""
+msgstr "Цельсієм"
 
 #: src/modules/temperature/e_mod_config.c:252
 #: src/modules/temperature/e_mod_config.c:356
 msgid "Fahrenheit"
-msgstr ""
+msgstr "Фаренгейтом"
 
 #: src/modules/temperature/e_mod_config.c:256
 #: src/modules/temperature/e_mod_config.c:378
 msgid "Check Interval"
-msgstr ""
+msgstr "Проміжок Перевірок"
 
 #: src/modules/temperature/e_mod_config.c:258
 msgid "Fast"
-msgstr ""
+msgstr "Швидко"
 
 #: src/modules/temperature/e_mod_config.c:262
 msgid "Slow"
-msgstr ""
+msgstr "Повільно"
 
 #: src/modules/temperature/e_mod_config.c:264
 msgid "Very Slow"
-msgstr ""
+msgstr "Дуже повільно"
 
 #: src/modules/temperature/e_mod_config.c:271
 #: src/modules/temperature/e_mod_config.c:295
 #: src/modules/temperature/e_mod_config.c:396
 #: src/modules/temperature/e_mod_config.c:408
 msgid "High Temperature"
-msgstr ""
+msgstr "Висока Температура"
 
 #: src/modules/temperature/e_mod_config.c:274
 msgid "200 F"
-msgstr ""
+msgstr "200 F"
 
 #: src/modules/temperature/e_mod_config.c:276
 msgid "150 F"
-msgstr ""
+msgstr "150 F"
 
 #: src/modules/temperature/e_mod_config.c:278
 #: src/modules/temperature/e_mod_config.c:287
 msgid "110 F"
-msgstr ""
+msgstr "110 F"
 
 #: src/modules/temperature/e_mod_config.c:282
 #: src/modules/temperature/e_mod_config.c:306
 #: src/modules/temperature/e_mod_config.c:401
 #: src/modules/temperature/e_mod_config.c:413
 msgid "Low Temperature"
-msgstr ""
+msgstr "Низька Температура"
 
 #: src/modules/temperature/e_mod_config.c:285
 msgid "130 F"
-msgstr ""
+msgstr "130 F"
 
 #: src/modules/temperature/e_mod_config.c:289
 msgid "90 F"
-msgstr ""
+msgstr "90 F"
 
 #: src/modules/temperature/e_mod_config.c:298
 msgid "93 C"
-msgstr ""
+msgstr "93 C"
 
 #: src/modules/temperature/e_mod_config.c:300
 msgid "65 C"
-msgstr ""
+msgstr "65 C"
 
 #: src/modules/temperature/e_mod_config.c:302
 #: src/modules/temperature/e_mod_config.c:311
 msgid "43 C"
-msgstr ""
+msgstr "43 C"
 
 #: src/modules/temperature/e_mod_config.c:309
 msgid "55 C"
-msgstr ""
+msgstr "55 C"
 
 #: src/modules/temperature/e_mod_config.c:313
 msgid "32 C"
-msgstr ""
+msgstr "32 C"
 
 #: src/modules/temperature/e_mod_config.c:367
 msgid "Sensors"
-msgstr ""
+msgstr "Датчики"
 
 #: src/modules/temperature/e_mod_config.c:397
 #: src/modules/temperature/e_mod_config.c:402
@@ -6607,211 +6886,225 @@ msgstr "%1.0f ℉"
 msgid "%1.0f C"
 msgstr "%1.0f ℃"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "Температура"
 
 #: src/modules/wizard/e_wizard.c:221
 msgid "Next"
-msgstr ""
+msgstr "Далі"
 
 #: src/modules/wizard/e_wizard.c:281
 msgid "Welcome to Enlightenment"
 msgstr "Ласкаво просимо до Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
-msgstr ""
+msgstr "Вибрати один"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
-msgstr ""
+msgstr "Профіль"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
+"У вашій системі не<br>знайдено файлів меню.<br>Будь ласка, зверніться<br>до "
+"документації<br>www.enlightenment.org<br>для уточнення<br>деталей про "
+"функціонування<br>ваших меню додатків."
 
 #: src/modules/wizard/page_030.c:107
 msgid "Select application menu"
-msgstr ""
+msgstr "Виберіть меню додатку"
 
 #: src/modules/wizard/page_030.c:124
 msgid "System Default"
-msgstr ""
+msgstr "За Замовчуванням"
 
 #: src/modules/wizard/page_040.c:25
 msgid "Launcher Bar"
-msgstr ""
+msgstr "Панель Швидкого Запуску"
 
 #: src/modules/wizard/page_040.c:27
 msgid "Select applications"
-msgstr ""
+msgstr "Виберіть додаток"
 
 #: src/modules/wizard/page_050.c:28
 msgid "Desktop Files"
-msgstr ""
+msgstr "Файли Стільниці"
 
 #: src/modules/wizard/page_050.c:32
 msgid "No icons on desktop"
-msgstr ""
+msgstr "Без піктограм на стільниці"
 
 #: src/modules/wizard/page_050.c:35
 msgid "Enable desktop icons"
-msgstr ""
+msgstr "Ввімкнути піктограми стільниці"
 
 #: src/modules/wizard/page_060.c:28
 msgid "Focus mode"
-msgstr ""
+msgstr "Режим фокусування"
 
 #: src/modules/wizard/page_060.c:32
 msgid "Click to focus windows"
-msgstr ""
+msgstr "Клікніть для фокусування вікон"
 
 #: src/modules/wizard/page_060.c:35
 msgid "Mouse over focuses windows"
-msgstr ""
+msgstr "Наведення мишки фокусує вікна"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
-msgstr ""
+msgstr "Виберіть піктограми щоб додати"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
-msgstr ""
+msgstr "Швидкий запуск"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
-msgstr ""
+msgstr "Вибір додатків"
 
 #: src/modules/mixer/app_mixer.c:165
 msgid "Capture"
-msgstr ""
+msgstr "Захват"
 
 #: src/modules/mixer/app_mixer.c:167
 msgid "Playback"
-msgstr ""
+msgstr "Програвання"
 
 #: src/modules/mixer/app_mixer.c:289
 msgid "Output"
-msgstr ""
+msgstr "Вихід"
 
 #: src/modules/mixer/app_mixer.c:363
 msgid "Cards"
-msgstr ""
+msgstr "Карти"
 
 #: src/modules/mixer/app_mixer.c:378 src/modules/mixer/conf_gadget.c:280
 msgid "Channels"
-msgstr ""
+msgstr "Канали"
 
 #: src/modules/mixer/app_mixer.c:390
 msgid "Card:"
-msgstr ""
+msgstr "Карта:"
 
 #: src/modules/mixer/app_mixer.c:394
 msgid "Channel:"
-msgstr ""
+msgstr "Канал:"
 
 #: src/modules/mixer/app_mixer.c:398
 msgid "Type:"
-msgstr ""
+msgstr "Type:"
 
 #: src/modules/mixer/app_mixer.c:402
 msgid "Left:"
-msgstr ""
+msgstr "Ліворуч:"
 
 #: src/modules/mixer/app_mixer.c:407
 msgid "Right:"
-msgstr ""
+msgstr "Праворуч:"
 
 #: src/modules/mixer/app_mixer.c:412 src/modules/mixer/e_mod_main.c:592
 msgid "Mute"
-msgstr ""
+msgstr "Вимкнути звук"
 
 #: src/modules/mixer/app_mixer.c:415 src/modules/mixer/conf_gadget.c:196
 msgid "Lock Sliders"
-msgstr ""
+msgstr "Фіксувати канали"
 
 #: src/modules/mixer/app_mixer.c:419
 msgid "Edit"
-msgstr ""
+msgstr "Змінити"
 
 #: src/modules/mixer/conf_gadget.c:202
 msgid "Show both sliders when locked"
-msgstr ""
+msgstr "Показувати обидва повзунки під час фіксації"
 
 #: src/modules/mixer/conf_gadget.c:322
 msgid "Sound Cards"
-msgstr ""
+msgstr "Звукові Карти"
 
 #: src/modules/mixer/conf_gadget.c:377
 msgid "Mixer Settings"
-msgstr ""
+msgstr "Налаштування мікшера"
 
 #: src/modules/mixer/conf_module.c:98
 msgid "Mixer to use for global actions:"
-msgstr ""
+msgstr "Мікшер для глобальних дій:"
 
 #: src/modules/mixer/conf_module.c:152
 msgid "Launch mixer..."
-msgstr ""
+msgstr "Запустити микшер..."
 
 #: src/modules/mixer/conf_module.c:187
 msgid "Mixer Module Settings"
-msgstr ""
+msgstr "Налаштування Модулів Мікшера"
 
 #: src/modules/mixer/e_mod_main.c:123
 msgid "Mixer Settings Updated"
-msgstr ""
+msgstr "Налаштування Мікшера Оновлені"
 
 #: src/modules/mixer/e_mod_main.c:602
 msgid "Controls"
-msgstr ""
+msgstr "Канали"
 
 #: src/modules/mixer/e_mod_main.c:1157
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
 msgstr ""
+"Налаштування модулів мікшера змінені.<br>Ваша стара конфігурація була "
+"замінена новими за замовчуванням.<br>Приносимо вибачення за незручності."
 
 #: src/modules/connman/e_mod_main.c:214
 msgid "Connection Manager"
-msgstr ""
+msgstr "Управління З’єднанями"
 
 #: src/modules/connman/e_mod_main.c:731
 msgid "Network Connection Settings"
-msgstr ""
+msgstr "Налаштування Мережевих З'єднань"
 
 #: src/modules/connman/e_mod_main.c:737
 msgid "Network Device"
-msgstr ""
+msgstr "Мережевий Пристрій"
 
 #: src/modules/connman/e_mod_main.c:742
 msgid "Wifi"
-msgstr ""
+msgstr "Бездротова Мережа"
 
 #: src/modules/connman/e_mod_main.c:745
 msgid "LAN"
-msgstr ""
+msgstr "Локальна Мережа"
 
 #: src/modules/connman/e_mod_main.c:748
 msgid "Specific Device"
-msgstr ""
+msgstr "Зазначений Пристрій"
 
 #: src/modules/connman/e_mod_main.c:769
 msgid "Networks"
-msgstr ""
+msgstr "Мережі"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
-msgstr ""
+msgstr "Інший systray вже існує"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
-msgstr ""
+msgstr "Може бути тільки один ґаджет systray, і він вже існує."
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr ""
+msgstr "Systray"
+
+#~ msgid "Internal Windows"
+#~ msgstr "Внутрішні Вікна"
+
+#~ msgid "Expand the window"
+#~ msgstr "Розширити вікно"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "Дозволити маніпулювання вікном"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 98699eb..6cba2c7 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 d2b4f26..1f25f35 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,45 +4,48 @@
 # gao stone <gaoghy at gmail.com>, 2008.
 # Aron Xu <aronmalache at 163.com>, 2008, 2009.
 # Luo Jie <lililjlj at gmail.com>, 2009.
+# eexpress <exp.exp at gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-07-29 15:09+1000\n"
-"PO-Revision-Date: 2009-07-08 07:12+0000\n"
-"Last-Translator: luojie-dune <lililjlj at gmail.com>\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\n"
+"PO-Revision-Date: 2009-11-06 10:51+0000\n"
+"Last-Translator: eexpress <exp.exp at gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translations at lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-10 07:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
 msgstr "关于 Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "关闭"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -51,13 +54,12 @@ 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 ""
-"版权所有 拷贝(&c); 1999-2008, Enlightenment 开发小组。<br><br>我们希望您喜欢"
-"使用这个软件,就像我们喜欢编写它一样。<br><br>This software is provided as-"
-"is with no explicit or implied warranty. This software is governed by "
-"licensing conditions, so please see the COPYING and COPYING-PLAIN licence "
-"files installed on your system.<br><br>Enlightenment 仍在 <hilight>密集开发</"
-"hilight>中并且不稳定。很多特性尚不完全或不存在,也可能存在很多瑕疵。可别说我"
-"<hilight>没警告过你哦!</hilight>"
+"版权所有 &copy; 1999-2009,  Enlightenment 开发团队。<br><br>我们希望您能像我"
+"们喜欢开发这款软件一样喜欢这款软件。<br><br>本软件不提供明确或隐含的保证。该"
+"软件是在软件许可下的,所以请在使用前阅读安装在您系统的 COPYING 和 COPYING-"
+"PLAIN 许可文件。<br><br>Enlightenment 进行了 <hilight>大量的开发</hilight> 并"
+"且并不稳定,很多功能尚未完成或并不存在,还有很多 bug。您已经被 <hilight>警告"
+"</hilight>过了!"
 
 #: src/bin/e_about.c:50
 msgid "<title>The Team</title>"
@@ -77,563 +79,563 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "确定要杀死这个窗口吗?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "确定要退出吗?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "您要求退出Enlightenment。<br><br>确定要退出吗?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "确定要注销吗?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "您正要退出Enlightenment。<br><br>确定要注销吗?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "确定要关闭吗?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "您正要关闭计算机。<br><br>确定要关闭计算机吗?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "确定要重启吗?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "您正要重启计算机。<br><br>确定要重新启动计算机吗?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "您正要挂起计算机。<br><br>确定要挂起计算机吗?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "确定要休眠吗?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "您正要休眠计算机。<br><br>确定要休眠计算机吗?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "窗口:动作"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移动"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "改变大小"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "菜单"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "升起"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "降低"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "杀死"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "窗口:状态"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "粘着模式切换"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "图标模式切换"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "全屏状态切换"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "全屏最大化"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "最大化模式 \"智能\""
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "最大化模式 \"扩展\""
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "最大化模式 \"填充\""
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr ""
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "切换无边框状态"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
-msgstr ""
+msgstr "切换粘附状态"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "向左翻转桌面"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "向右翻转桌面"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "向上翻转桌面"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "往下翻转桌面"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "翻转桌面 —— 依据"
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "显示桌面"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 msgid "Show The Shelf"
 msgstr "显示书架"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "翻转桌面到..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "线性翻转桌面到..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 msgid "Flip Desktop Left (All Screens)"
-msgstr "向左翻转桌面(所有屏幕)"
+msgstr "向左翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 msgid "Flip Desktop Right (All Screens)"
-msgstr "向右翻转桌面(所有屏幕)"
+msgstr "向右翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 msgid "Flip Desktop Up (All Screens)"
-msgstr "向上翻转桌面(所有屏幕)"
+msgstr "向上翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 msgid "Flip Desktop Down (All Screens)"
-msgstr "向下翻转桌面(所有屏幕)"
+msgstr "向下翻转桌面(所有屏幕)"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 msgid "Flip Desktop By... (All Screens)"
-msgstr ""
+msgstr "翻转桌面的方式...(全部屏幕)"
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 msgid "Flip Desktop To... (All Screens)"
-msgstr ""
+msgstr "翻转桌面到...(全部屏幕)"
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 msgid "Flip Desktop Linearly... (All Screens)"
-msgstr ""
+msgstr "直线翻转桌面...(全部屏幕)"
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 msgid "Flip Desktop In Direction..."
 msgstr "翻转桌面指向..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切换到桌面 0"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切换到桌面 1"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切换到桌面 2"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切换到桌面 3"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切换到桌面 4"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切换到桌面 5"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切换到桌面 6"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切换到桌面 7"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切换到桌面 8"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切换到桌面 9"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切换到桌面 10"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切换到桌面 11"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切换到桌面 ..."
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "屏幕"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "发送鼠标到屏幕 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "发送鼠标到屏幕 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "发送鼠标到屏幕 ..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "发送鼠标到前1屏"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "发送鼠标到后1屏"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
-msgstr ""
+msgstr "发送鼠标 前进/后退 屏幕..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "窗口:移动"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "发送到下个桌面"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "到前一桌面"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "桌面号 #..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "到桌面..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "显示主窗口"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "显示“我的最爱”菜单"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "显示所有应用程序菜单"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "显示 客户端 菜单"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "显示菜单..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "启动"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "应用程序"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 msgid "Exit Now"
 msgstr "现在退出"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment:模式"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 msgid "Presentation Mode Toggle"
 msgstr "锁定幻灯片模式"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 msgid "Offline Mode Toggle"
 msgstr "锁定脱机模式"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "系统"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr "现在关闭电源"
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr "关闭电源"
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "重启"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "挂起"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 msgid "Lock"
 msgstr "锁定"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Generic : Actions"
 msgstr "常规:动作"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 msgid "Delayed Action"
 msgstr "延迟动作"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "设为背景"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "已完成桌面文件扫描"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "桌面文件扫描"
 
@@ -641,41 +643,40 @@ msgstr "桌面文件扫描"
 msgid "Color Selector"
 msgstr "色彩选择器"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "确定"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
 "new set of defaults initialized. This<br>will happen regularly during "
@@ -686,7 +687,7 @@ msgid ""
 "the hiccup in your settings.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
 "should not happen unless you downgraded<br>Enlightenment or copied the "
@@ -695,11 +696,11 @@ msgid ""
 "to<br>defaults. Sorry for the inconvenience.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 msgid "Settings Upgraded"
 msgstr "设定已经升级"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -707,7 +708,7 @@ msgid ""
 "%s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -717,7 +718,7 @@ msgid ""
 "been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -726,7 +727,7 @@ msgid ""
 "file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -735,7 +736,7 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -743,11 +744,11 @@ msgid ""
 "s<br><br>This file has been deleted to avoid corrupt data.<br>"
 msgstr ""
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 设定写入问题"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -755,12 +756,12 @@ msgstr "Enlightenment 设定写入问题"
 msgid "Advanced"
 msgstr "高级"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "基本"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "应用"
 
@@ -768,7 +769,7 @@ msgstr "应用"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "模块"
 
@@ -777,62 +778,63 @@ msgstr "模块"
 msgid "Extensions"
 msgstr "扩展"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "错误 - 无 PAM 支持"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "这个Enlightenment中没有构建PAM 支持,所以<br>桌面锁定已禁用。"
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "锁定失败"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 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 ""
+msgstr "桌面不能锁定,因为某些软件独占了键盘鼠标,并且独占不能解开。"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "请输入您的解锁密码"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "认证系统错误"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
 "The error code was <hilight>%i</hilight>.<br>This is bad and should not be "
 "happening. Please report this bug."
 msgstr ""
+"PAM 认证出错,不能产生认证会话。出错代码是 %i。这是不正常的,请报告错误。"
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr "启用幻灯片模式?"
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
-msgstr ""
+msgstr "您解锁桌面太快了。您想要启动简报模式并临时禁止屏保、屏幕锁、电源管理?"
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr "否,继续延时"
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr "否,以后不再询问"
 
@@ -848,12 +850,15 @@ 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 ""
+"您要产生图标的这个窗口,没有窗口名和窗口类名,图标必须要知道这些特性,而不能"
+"瞎猜的。您可以使用窗口标题名代替,但这必须是窗口启动后,其标题名和设置一致,"
+"并且一直不能改变。"
 
 #: src/bin/e_eap_editor.c:215
 msgid "Desktop Entry Editor"
 msgstr "桌面条目编辑器"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -898,7 +903,7 @@ msgstr "分类"
 msgid "Mime Types"
 msgstr "Mime 类型"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 msgid "Options"
 msgstr "选项"
 
@@ -930,23 +935,23 @@ msgstr "选择一个图标"
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "删除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "剪切"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "复制"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "粘贴"
 
@@ -954,331 +959,331 @@ msgstr "粘贴"
 msgid "Select All"
 msgstr "选择所有"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "运行时错误"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "应用程序运行错误"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, c-format
 msgid ""
 "Enlightenment was unable to run the application:<br><br>%s<br><br>The "
 "application failed to start."
 msgstr "Enlightenment 未能运行程序:<br><br>%s<br><br>该程序启动失败。"
 
-#: src/bin/e_exec.c:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "应用程序执行出错"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 意外终止。"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "退出代码 %i 从 %s 反馈回来。"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被中断信号中断。"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被退出信号中断。"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被浮点错误中断。"
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被不可干涉的'杀死信号'中断。"
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被错误信号中断。"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被管道错误中断。"
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被终止信号中断。"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被总线错误中断。"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被信号 %i 中断。"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr ""
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "错误日志"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "没有错误信息。"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "保存此信息"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "此错误日志将被保存为 %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "错误信息"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "错误信号信息"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "输出数据"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "没有输出。"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 msgid "Nonexistent path"
 msgstr "不存在路径"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, c-format
 msgid "%s doesn't exist."
 msgstr "%s 不存在。"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Mount Error"
-msgstr ""
+msgstr "挂载错误"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
-msgstr ""
+msgstr "无法挂载设备"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Unmount Error"
-msgstr ""
+msgstr "卸载错误"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
-msgstr ""
+msgstr "无法卸载设备"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Eject Error"
-msgstr ""
+msgstr "弹出错误"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
-msgstr ""
+msgstr "无法弹出设备"
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i 个文件"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 msgid "Link"
 msgstr "连接"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 msgid "Abort"
 msgstr "关于"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 msgid "Inherit parent settings"
 msgstr "继承上一级设定"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "显示模式"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "显示隐藏文件"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "现在排序"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新目录"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "改名"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
-msgstr ""
+msgstr "卸载"
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 msgid "Mount"
-msgstr ""
+msgstr "挂载"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
-msgstr ""
+msgstr "弹出"
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "属性"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 msgid "Use default"
 msgstr "使用默认"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "网格图标"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "自定义图标"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "图标大小  (%d)"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 msgid "Set background..."
 msgstr "设定背景..."
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 msgid "Set overlay..."
 msgstr "设定覆盖..."
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "清除"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "创建新目录"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "新目录名称:"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "改名%s 为::"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "改文件名"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 msgid "Retry"
 msgstr "重试"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 msgid "Error"
 msgstr "错误"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr "全部选否"
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr "全部选是"
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 msgid "Warning"
 msgstr "警告"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "文件已经存在,覆盖吗?<br><hilight>%s</hilight>"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr "忽略"
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr "忽略所有"
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr "执行操作时产生一个错误。<br>%s"
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您确定删除<br><hilight>%s</hilight>吗?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1291,144 +1296,148 @@ msgstr ""
 msgid "File Properties"
 msgstr "文件属性"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "文件:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "大小:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "最后修改:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "文件类型:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "权限"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "所有者:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "其他人可读"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "其他人可写"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "所有者可读"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "所有者可写"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "预览"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "默认"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "缩略图"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "自定义"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "为所有此类文件使用本图标"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "连接信息"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "选择一个图像"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr "%llu TiB"
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr "%llu GiB"
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr "%llu MiB"
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr "%llu KiB"
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr "%llu B"
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, c-format
 msgid "Unknown Volume"
 msgstr "未知盘区"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr "可移动设备"
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+msgid "Move this gadget to"
+msgstr ""
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "简易"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "插入"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "外观"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "自动滚动"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "可以变换尺寸"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "开始移动/缩放此组件"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "删除该组件"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "停止移动/缩放此组件"
 
@@ -1438,7 +1447,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr ""
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "窗口锁"
 
@@ -1472,21 +1481,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "堆叠"
 
@@ -1495,12 +1504,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "卷起状态"
 
@@ -1509,7 +1518,7 @@ msgid "Maximized state"
 msgstr "最大化状态"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "全屏状态"
 
@@ -1517,7 +1526,7 @@ msgstr "全屏状态"
 msgid "Lock me from changing:"
 msgstr "锁住我以防更改:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "边框样式"
 
@@ -1565,121 +1574,122 @@ msgstr "解除固定"
 msgid "More..."
 msgstr "更多…"
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "最小化"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 msgid "Keyboard Shortcut"
 msgstr "快捷键"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 msgid "To Favorites Menu"
 msgstr "发送到收藏菜单"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 msgid "To Launcher"
 msgstr "添加到启动器"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "边框"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "跳过"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "状态"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "记住"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "窗口属性"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "置顶"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "置底"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "选择边框样式"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "使用 E17 默认图标首选项"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "使用应用程序提供的图标 "
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "使用用户自定义图标"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "遮蔽的"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "粘住"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "窗口列表"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "分页器"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 msgid "Taskbar"
 msgstr "任务栏"
 
 #: src/bin/e_int_border_prop.c:363
 msgid "NetWM"
-msgstr ""
+msgstr "NetWM"
 
 #: src/bin/e_int_border_prop.c:370
 msgid "ICCCM"
@@ -1689,7 +1699,7 @@ msgstr ""
 msgid "ICCCM Properties"
 msgstr "ICCCM 属性"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "标题"
 
@@ -1743,11 +1753,11 @@ msgstr "窗口组"
 
 #: src/bin/e_int_border_prop.c:436
 msgid "Transient For"
-msgstr ""
+msgstr "渐变"
 
 #: src/bin/e_int_border_prop.c:437
 msgid "Client Leader"
-msgstr ""
+msgstr "客户端把手"
 
 #: src/bin/e_int_border_prop.c:438
 msgid "Gravity"
@@ -1779,13 +1789,13 @@ msgstr "NetWM 属性"
 
 #: src/bin/e_int_border_prop.c:471
 msgid "Modal"
-msgstr ""
+msgstr "模态"
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "跳过任务栏"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "跳过分页器"
 
@@ -1793,15 +1803,15 @@ msgstr "跳过分页器"
 msgid "Hidden"
 msgstr "隐藏"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "窗口记忆"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "窗口属性不唯一匹配"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1814,133 +1824,124 @@ msgid ""
 "settings will be accepted. Press <hilight>Cancel</hilight> if you<br>are not "
 "sure and nothing will be affected."
 msgstr ""
-"你正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应用"
-"到一个窗口,而这个窗口<hilight>并没有单一的属性</hilight>。<br><br>这意味着它"
-"是跟其它一个或多个窗口共享名字/类、Transience、角色等属性的,<br>记住这个窗"
-"口的这些属性也会应用到匹配的那些窗口。<br><br>这只是个警告,如果你不想这个操"
-"作发生的话。<br>如果这是你所要做的,按一下<hilight>应用</hilight>或者"
-"<hilight>OK</hilight>按钮,你的操作就会生效。<br>如果你不想,按下<hilight>取"
+"您正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应用到"
+"一个窗口,而这个窗口<hilight>并没有单一的属性</hilight>。<br><br>这意味着它是"
+"跟其它一个或多个窗口共享名字/类、Transience、角色等属性的,<br>记住这个窗口"
+"的这些属性也会应用到匹配的那些窗口。<br><br>这只是个警告,如果您不想这个操作"
+"发生的话。<br>如果这是您所要做的,按一下<hilight>应用</hilight>或者"
+"<hilight>OK</hilight>按钮,您的操作就会生效。<br>如果您不想,按下<hilight>取"
 "消</hilight>,那就什么都不会发生。"
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "没有匹配的属性被设定"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window <hilight>without "
 "specifying how to remember it</hilight>.<br><br>You must specify at least 1 "
 "way of remembering this window."
 msgstr ""
-"你正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应用"
-"到一个窗口,却<hilight>不指定如何记住它</hilight>。<br><br>你必须指定至少一种"
-"记住这个窗口的方法。"
+"您正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应用到"
+"一个窗口,却<hilight>不指定如何记住它</hilight>。<br><br>您必须指定至少一种记"
+"住这个窗口的方法。"
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"你正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应用"
-"到一个窗口,而这个窗口<hilight>并没有单一的属性</hilight>。<br><br>这意味着它"
-"是跟其它一个或多个窗口共享名字/类、Transience、角色等属性的,<br>记住这个窗"
-"口的这些属性也会应用到匹配的那些窗口。<br><br>你可能需要启用<hilight>只匹配一"
-"个窗口</hilight>选项,如果你只是想要仅仅这个窗口的实例被修改,而保留其它窗口"
-"不变。<br><br>这只是个警告,如果你不想这个操作发生的话。<br>如果这是你所要做"
-"的,按一下<hilight>应用</hilight>或者<hilight>OK</hilight>按钮,你的操作就会"
-"生效。<br>如果你不想,按下<hilight>取消</hilight>,那就什么都不会发生。"
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "æ— "
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "尺寸和位置"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "锁定"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "尺寸,位置和锁定"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "任何"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "记住使用"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "窗口的名字和类"
+#: src/bin/e_int_border_remember.c:638
+msgid "Window name"
+msgstr ""
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:650
+msgid "Window class"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "窗口角色"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "窗口类型"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr "æš‚æ—¶"
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "记住属性"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "图标首选项"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "虚拟桌面"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "当前屏幕"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "跳过窗口列表"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+msgid "Application file or name (.desktop)"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "匹配单个窗口"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "登陆时启动该程序"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr "启动时总是聚焦"
 
+#: src/bin/e_int_border_remember.c:760
+msgid "Keep current properties"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "登陆时启动该程序"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 msgid "Settings"
 msgstr "设置"
@@ -1959,24 +1960,24 @@ msgstr "书架"
 msgid "Module Settings"
 msgstr "模块设置"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "可用模块"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "载入模块"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "已载入的模块"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "卸载模块"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2010,8 +2011,8 @@ msgstr "移除组件"
 msgid "Toolbar Settings"
 msgstr "工具栏设定"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "布局"
 
@@ -2024,7 +2025,7 @@ msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
 "configuration's<br>executable is in your PATH<br>"
-msgstr ""
+msgstr "启动输入法出现错误。请确定您的输入法配置正确,并且配置文件可执行。"
 
 #: src/bin/e_int_menus.c:89
 msgid "Main"
@@ -2035,12 +2036,12 @@ msgid "Favorite Applications"
 msgstr "最常用程序"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "应用程序"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2049,7 +2050,7 @@ msgstr "应用程序"
 msgid "Windows"
 msgstr "窗口"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "丢失的窗口"
 
@@ -2079,135 +2080,134 @@ msgstr "显示/隐藏所有窗口"
 
 #: src/bin/e_int_menus.c:575
 msgid "(No Applications)"
-msgstr "(无应用程序)"
+msgstr "(无应用程序)"
 
 #: src/bin/e_int_menus.c:709
 msgid "Set Virtual Desktops"
 msgstr "设定虚拟桌面"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
-msgstr "(无窗口)"
+msgstr "(无窗口)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "无名称!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
-msgstr "(无书架)"
+msgstr "(无书架)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "书架 #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "添加一个架子"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "删除一个书架"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "书架设定"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "中等"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 msgid "Set Contents..."
 msgstr "设定书架内容..."
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "在所有之上"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "窗口下"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "所有物体下"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "允许窗口遮盖书架"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "缩至内容尺寸"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f 像素"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "样式"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "自动隐藏"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "自动隐藏书架"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "鼠标移入时显示"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "鼠标点击时显示"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "隐藏超时"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "隐藏持续时间"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "在全部桌面显示"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "在指定桌面显示"
 
@@ -2221,6 +2221,9 @@ msgid ""
 "or is not owned by you. Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"可能遇到 IPC 攻击。发现了 IPC 套接目录,\n"
+"但是权限太宽松(应该只能由所有者可读写),\n"
+"或者所有者不是您。请检查:%s/enlightenment-%s\n"
 
 #: src/bin/e_ipc.c:57
 #, c-format
@@ -2230,6 +2233,10 @@ msgid ""
 "Please check:\n"
 "%s/enlightenment-%s\n"
 msgstr ""
+"IPC 套接字目录无法被创建\n"
+"或查验通过。\n"
+"请检查:\n"
+"%s/enlightenment-%s\n"
 
 #: src/bin/e_main.c:323
 #, c-format
@@ -2357,7 +2364,7 @@ msgid ""
 "Ecore and check they support the Software Buffer rendering engine."
 msgstr ""
 "Enlightenment 发现 ecore_evas 不支持 Evas 的软件 X11\n"
-"渲染。请检查你的 Evas 和 Ecore 安装并确认他们支持软\n"
+"渲染。请检查您的 Evas 和 Ecore 安装并确认他们支持软\n"
 "件 X11 渲染。"
 
 #: src/bin/e_main.c:538 src/bin/e_main.c:545
@@ -2397,7 +2404,7 @@ msgid ""
 "Enlightenment cannot set up paths for finding files.\n"
 "Perhaps you are out of memory?"
 msgstr ""
-"Enlightenment 无法建立路径以打开文件。\\n\"\n"
+"Enlightenment 无法建立路径以打开文件。\n"
 "\"可能您的内存用完了?"
 
 #: src/bin/e_main.c:627
@@ -2416,7 +2423,7 @@ msgstr "开启国际化支持"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment 无法建立它的国际化系统。"
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2424,46 +2431,52 @@ msgstr ""
 "Enlightenment 无法建立启动屏幕。\n"
 "可能您的内存用完了?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "测试格式支持"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
 msgstr ""
+"Enlightenment 发现 Evas 不能创建画笔缓冲。检查 Evas 是否支持软件缓冲。\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment 发现 Evas 不能加载 PNG 文件。检查 Evas 是否支持加载 PNG。\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment 发现 Evas 不能加载 JPEG 文件。检查 Evas 是否支持加载 JPEG。\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
 msgstr ""
+"Enlightenment 发现 Evas 不能加载 EET 文件。检查 Evas 是否支持加载 EET。\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
 "fontconfig\n"
 "support and system fontconfig defines a 'Sans' font.\n"
 msgstr ""
+"Enlightenment 发现 Evas 不能加载 Sans 字体。检查 Evas 是否支持 fontconfig,而"
+"且系统定义了 Sans 字体。\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "设置屏幕"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2471,191 +2484,191 @@ msgstr ""
 "Enlightenment 在您的所有的屏幕上建立窗口管理失败。\n"
 "可能有另外一个窗口管理器在运行?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "安装屏幕保护程序"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment 无法配置 X 屏幕保护程序。"
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "设置桌面锁定"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment 无法建立它的桌面锁定系统。"
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "建立路径"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "设置系统控制"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment 无法初始化“系统命令”系统。\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "安装动作"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment 无法建立它的动作系统。"
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "设置运行系统"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment 无法建立它的 exec 系统。"
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "设定记忆"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment 无法设定它的记忆设置。"
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "设置 FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment 无法启动文件管理器。\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "安装消息系统"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment 无法建立它的消息系统。"
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "设置 DND"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment 无法建立它的拖放系统。"
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 msgid "Setup Grab Input Handling"
-msgstr ""
+msgstr "设置捕捉输入处理"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment 无法建立它的输入捕获处理系统。"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "安装模块"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment 无法建立它的模块系统。"
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "设定记忆"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment 无法设定它的记忆设置。"
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "设定色彩类别"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment 无法建立它的颜色系统。"
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "设定 Gadcon"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment 无法建立它的构件控制系统。"
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "设置 DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment 无法设定它的显示器电源管理设置。"
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 msgid "Set Up Powersave modes"
 msgstr "设置省电模式"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment 无法建立它的省点系统。"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "安装壁纸"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment 无法建立它的桌面背景系统。"
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "安装鼠标"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment 无法设定它的记忆设置。"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "设置绑定"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment 无法建立它的绑定系统。"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "设置弹出"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment 无法建立它的弹出系统。"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "设置书架"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment 无法建立它的书架系统。"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "设置缩略图"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment 无法建立它的缩略图系统。\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "设置文件排列"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment 无法建立它的文件组织系统。"
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "载入模块"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2663,27 +2676,29 @@ msgid ""
 "dialog should let you select your<br>modules again."
 msgstr ""
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightenment 先前在启动时崩溃,现已重新启动。"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
 "modules from your configuration.<br><br>The module configuration dialog "
 "should let you select your<br>modules again."
 msgstr ""
+"Enlightenment 之前崩溃并重启过。全部模块都禁止加载,以便发现您的配置中的问题"
+"模块。您可以在模块设置对话栏中,重新加载模块。"
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "设置书架"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "接近完成"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2691,11 +2706,11 @@ msgid ""
 msgstr ""
 "导入模块 %s 时发生错误。<br>在模块搜索路径中<br>没有找到名为 %s 的模块。<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "载入模块出错"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2704,11 +2719,11 @@ msgstr ""
 "导入模块 %s 时发生错误。<br>该模块的全路径是:<br>%s<br>错误报告如下:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "模块没包括所有必需的功能"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2718,12 +2733,12 @@ msgstr ""
 "模块 API 错误<br>启动模块错误:%s<br>要求最小的模块 API 版本号:%i。"
 "<br>Enlightenment给的模块版本号:%i。<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模块"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸载这个模块?<br>"
 
@@ -2734,29 +2749,29 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "确定要删除此书架?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
-msgstr "你要求删除此书架。你确定要删除吗?"
+msgstr "您要求删除此书架。您确定要删除吗?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移动/缩放项目"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "开始移动/缩放项目"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 msgid "Set Shelf Contents"
 msgstr "设定书架内容"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
@@ -2773,11 +2788,11 @@ msgstr "检查系统权限"
 msgid "System Check Done"
 msgstr "系统检查已完成"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "注销问题"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2786,109 +2801,109 @@ msgstr ""
 "注销花费了太多的时间。一些<br>应用程序拒绝关闭。<br>您是否要强行注销而不手工"
 "退出那些应用程序?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "现在注销"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "继续等待"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "取消注销"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "正在注销"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "正在注销。<br><hilight>请等等。</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment 在忙着处理另一个请求"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
 "begun."
 msgstr "Enlightenment正在注销。<br>开始后,您不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
 "has been started."
 msgstr "Enlightenment正在关闭系统。<br>在开始后,您不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
 "begun."
 msgstr "Enlightenment 正在重新起动系统。<br>开始后,您不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
 "system actions."
 msgstr "Enlightenment 正在挂起系统。<br>结束前您不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
 "complete."
 msgstr "Enlightenment正在休眠系统。<br>结束前,您不能进行其他系统操作。"
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "哎呀!不会吧!"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr "关闭计算机失败了。"
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 msgid "Reset failed."
 msgstr "重新启动失败了。"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 msgid "Suspend failed."
 msgstr "挂起系统失败了。"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 msgid "Hibernate failed."
 msgstr "休眠系统失败了。"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr "关闭计算机"
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "正在关机。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 msgid "Resetting"
 msgstr "正在重新设置"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "正在重启动。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "正在挂起"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "正在挂起。<br><hilight>请稍侯。</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "休眠"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "正在休眠。<br><hilight>请稍侯。</hilight>"
 
@@ -2904,11 +2919,11 @@ msgstr "设置为主题"
 msgid "Set Toolbar Contents"
 msgstr "设置工具条内容"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "无法退出--不死的窗口"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -2917,77 +2932,77 @@ msgstr ""
 "一些窗口仍然处在被生命周期锁定之中。<br>这意味着 Enlightenment 不允许它自己退"
 "出,除非这些窗口已经被关闭,<br>或者被去除生命周期锁。<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 字节"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "将来"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "在最后一分钟"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 月前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小时前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分钟前"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "未知"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3007,51 +3022,51 @@ msgstr "上"
 msgid "Down"
 msgstr "下"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "添加到收藏"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "到上层目录"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "权限:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "已修改:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "您"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "受保护的"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "只读"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "读写"
 
@@ -3067,57 +3082,57 @@ msgstr "基本设置"
 msgid "Show alert when battery is low"
 msgstr "当电池电量低是显示警告"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 msgid "Check every:"
 msgstr "检查计划,间隔为:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, c-format
 msgid "%1.0f ticks"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 msgid "Polling"
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 msgid "Show alert on low battery"
 msgstr "低电量时报警"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 msgid "Alert when at:"
 msgstr "以下情况报警:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分钟"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, c-format
 msgid "%1.0f %%"
 msgstr "%1.0f %%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr "自动解除..."
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, c-format
 msgid "%1.0f sec"
 msgstr "%1.0f 秒"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 msgid "Alert"
 msgstr "警告"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3125,12 +3140,12 @@ msgstr "自动检测"
 msgid "Internal"
 msgstr "内部"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 msgid "HAL"
 msgstr "HAL"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr "硬件"
 
@@ -3138,24 +3153,24 @@ msgstr "硬件"
 msgid "Battery"
 msgstr "电池"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 msgid "Your battery is low!"
 msgstr "电池电量低!"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr "建议使用交流电源。"
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr "N/A"
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr "错误"
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 msgid "Battery Meter"
 msgstr "电池标尺"
 
@@ -3163,20 +3178,20 @@ msgstr "电池标尺"
 msgid "Clock"
 msgstr "时钟"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 msgid "Settings Panel"
 msgstr "设定面板"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 msgid "Presentation"
 msgstr "演示"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 msgid "Offline"
 msgstr "脱机"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 msgid "Modes"
 msgstr "模式"
 
@@ -3202,7 +3217,7 @@ msgid "Restart Applications"
 msgstr "重启应用程序"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "所有应用程序"
 
@@ -3224,12 +3239,12 @@ msgstr "IBar 其他"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "菜单"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "默认边框样式"
 
@@ -3237,14 +3252,14 @@ msgstr "默认边框样式"
 msgid "Window Border Selection"
 msgstr "窗口边框选择"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "为下次使用记住这个窗口边框"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3270,7 +3285,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3320,7 +3335,7 @@ msgstr "桌面分组"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:138
 msgid "Group with current desktop"
-msgstr ""
+msgstr "当前桌面分组"
 
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:140
 msgid "Separate group"
@@ -3456,19 +3471,19 @@ msgstr "列表头"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:77
 msgid "Radio Text"
-msgstr ""
+msgstr "单选框文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:78
 msgid "Radio Text Disabled"
-msgstr ""
+msgstr "禁用单选框文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:79
 msgid "Slider Text"
-msgstr ""
+msgstr "滑块文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:80
 msgid "Slider Text Disabled"
-msgstr ""
+msgstr "禁用滑块文字"
 
 #: src/modules/conf_colors/e_int_config_color_classes.c:87
 msgid "Module Label"
@@ -3538,9 +3553,9 @@ msgid "Desktop Name"
 msgstr "桌面名称"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "名字:"
 
@@ -3575,7 +3590,7 @@ msgstr "当X 屏幕保护程序运行时锁定"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:210
 msgid "Time after screensaver activated"
-msgstr ""
+msgstr "屏保激活的时间间隔"
 
 #: src/modules/conf_desklock/e_int_config_desklock.c:213
 #: src/modules/conf_desklock/e_int_config_desklock.c:443
@@ -3606,10 +3621,10 @@ msgstr "%1.0f 分钟"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "个人"
@@ -3641,8 +3656,8 @@ msgstr "显示屏幕区域 #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3720,7 +3735,7 @@ msgstr "拖拽对象到屏幕边缘时翻转"
 
 #: src/modules/conf_desks/e_int_config_desks.c:298
 msgid "Wrap desktops around when flipping"
-msgstr ""
+msgstr "翻转时反转桌面?"
 
 #: src/modules/conf_desks/e_int_config_desks.c:302
 msgid "Flip Animation"
@@ -3747,62 +3762,67 @@ msgstr "%1.1f 秒"
 
 #: src/modules/conf_desks/e_int_config_desks.c:317
 msgid "Background panning"
-msgstr ""
+msgstr "背景摇镜"
 
 #: src/modules/conf_desks/e_int_config_desks.c:321
 #, c-format
 msgid "%.2f X-axis pan factor"
-msgstr ""
+msgstr "%.2f X 轴摇镜系数"
 
 #: src/modules/conf_desks/e_int_config_desks.c:325
 #, c-format
 msgid "%.2f Y-axis pan factor"
-msgstr ""
+msgstr "%.2f Y 轴摇镜系数"
 
 #: src/modules/conf_desks/e_mod_main.c:35
 msgid "Virtual Desktops"
 msgstr "虚拟桌面"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "对话设置"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "常规设置"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "禁用确认对话"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 msgid "Normal Windows"
 msgstr "正常窗口"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 msgid "Default Settings Dialogs Mode"
-msgstr ""
+msgstr "对话栏模式默认设定"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "基本模式"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "高级模式"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "默认对话模式"
 
@@ -3817,6 +3837,8 @@ 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 ""
+"现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
+"如果您不按任何键,将在 %d 秒后恢复原来的分辨率 <br>%dx%d %d Hz。"
 
 #: src/modules/conf_display/e_int_config_display.c:136
 #, c-format
@@ -3825,6 +3847,8 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored in %d seconds."
 msgstr ""
+"现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
+"如果您不按任何键,将在 %d 秒后恢复原来设置的 %dx%d 分辨率。"
 
 #: src/modules/conf_display/e_int_config_display.c:146
 #, c-format
@@ -3833,6 +3857,8 @@ 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 ""
+"现在这样正常吗?如果正常就<hilight>保存</hilight>,否则就恢复。<br>如果您不按"
+"任何键,<hilight>立即</hilight>恢复为原有分辨率<br>%dx%d at %d Hz。"
 
 #: src/modules/conf_display/e_int_config_display.c:153
 #, c-format
@@ -3841,10 +3867,12 @@ msgid ""
 "<br>If you do not press a button, the old resolution of<br>%dx%d will be "
 "restored <hilight>IMMEDIATELY</hilight>."
 msgstr ""
+"现在这样正常吗?如果正常就<hilight>保存</hilight>设置,否则就恢复原设置。<br>"
+"如果您不按任何键,<hilight>立即</hilight>恢复原有 <br>%dx%d 分辨率。"
 
 #: src/modules/conf_display/e_int_config_display.c:190
 msgid "Resolution change"
-msgstr "分辨率改变"
+msgstr "改变分辨率"
 
 #: src/modules/conf_display/e_int_config_display.c:194
 msgid "Save"
@@ -3858,31 +3886,31 @@ msgstr "恢复"
 msgid "Screen Resolution Settings"
 msgstr "屏幕分辨率设置"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "分辨率"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "登陆时恢复"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "旋转"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "镜像"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "缺失的特性"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
 "hilight> (X Resize and Rotate) extension.<br>You cannot change screen "
@@ -3890,12 +3918,15 @@ msgid ""
 "be<br>that at the time <hilight>ecore</hilight> was built, there<br>was no "
 "XRandR support detected."
 msgstr ""
+"您的图形服务不支持 <hilight>XRandR</hilight>(缩放和旋转)扩展功能。<br>您不能"
+"在此情况下修改屏幕分辨率。<br>也可能是在编译 <hilight>ecore</hilight> 时没有"
+"检测到 XRandR 支持。"
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "未找到刷新率"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -3903,6 +3934,9 @@ msgid ""
 "setting<br>the resolution, which may cause <hilight>damage</hilight> to your "
 "screen."
 msgstr ""
+"您的图形服务没报告刷新率。如果您是在运行一个嵌套的图形服务,这属于正常的。否"
+"则,在您修改屏幕分辨率的时候,只能使用当前的屏幕刷新率,这可能导致您的屏幕损"
+"伤。"
 
 #: src/modules/conf_display/e_mod_main.c:35
 msgid "Screen Resolution"
@@ -3911,15 +3945,15 @@ msgstr "屏幕分辨率"
 #: src/modules/conf_dpms/e_int_config_dpms.c:60
 #: src/modules/conf_dpms/e_int_config_dpms.c:81
 msgid "Display Power Management Signaling"
-msgstr ""
+msgstr "显示电源管理信号"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:61
 msgid "The current display server is not <br>DPMS capable."
-msgstr ""
+msgstr "当前显示服务,不兼容 <br>DPMS 特性。"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:82
 msgid "The current display server does not <br>have the DPMS extension."
-msgstr ""
+msgstr "当前显示服务,不支持 <br>DPMS 扩展特性。"
 
 #: src/modules/conf_dpms/e_int_config_dpms.c:112
 msgid "Display Power Management Settings"
@@ -3950,7 +3984,7 @@ msgid "Power Management"
 msgstr "电源管理"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -3960,102 +3994,107 @@ msgstr "<æ— >"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 msgid "Edge Binding Settings"
-msgstr ""
+msgstr "边缘绑定设置"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 msgid "Edge Bindings"
-msgstr ""
+msgstr "边缘绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 msgid "Add Edge"
-msgstr ""
+msgstr "添加边缘"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 msgid "Delete Edge"
-msgstr ""
+msgstr "删除边缘"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 msgid "Modify Edge"
-msgstr ""
+msgstr "修改边缘"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
-msgstr "删除所有"
+msgstr "全部删除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "恢复默认绑定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "动作"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "动作参数"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 msgid "General Options"
 msgstr "常规选项"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 msgid "Allow binding activation with fullscreen windows"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 msgid "Edge Binding Sequence"
-msgstr ""
+msgstr "边缘绑定顺序"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, c-format
 msgid "%.2f seconds"
+msgstr "%.2f 秒"
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 msgid "Binding Edge Error"
-msgstr ""
+msgstr "边缘绑定出错"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
 "s</hilight> action.<br>Please choose another binding edge sequence."
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4090,6 +4129,7 @@ msgid ""
 "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"
@@ -4150,7 +4190,7 @@ msgstr "终端设置"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:198
 msgid "Terminal Command (CTRL+RETURN to utilize)"
-msgstr "终端命令(CTRL+RETURN 启用)"
+msgstr "终端命令(CTRL+RETURN 启用)"
 
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:206
 #: src/modules/conf_winlist/e_int_config_winlist.c:295
@@ -4219,19 +4259,19 @@ msgstr "标题栏"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:64
 msgid "Textblock Plain"
-msgstr ""
+msgstr "文字块无格式"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:65
 msgid "Textblock Light"
-msgstr ""
+msgstr "文字块减小"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:66
 msgid "Textblock Big"
-msgstr ""
+msgstr "文字块增大"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:70
 msgid "Settings Heading"
-msgstr ""
+msgstr "设置标题"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:71
 msgid "About Title"
@@ -4259,7 +4299,7 @@ msgstr "对话错误"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:77
 msgid "Exebuf Command"
-msgstr ""
+msgstr "Exebuf 命令"
 
 #: src/modules/conf_fonts/e_int_config_fonts.c:78
 msgid "Splash Title"
@@ -4350,18 +4390,17 @@ msgstr "很大"
 msgid "%d pixels"
 msgstr "%d 像素"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "启用自定义字体类别"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "123: 我的天空!"
 
@@ -4369,37 +4408,49 @@ msgstr "123: 我的天空!"
 msgid "Font Classes"
 msgstr "字体类别"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "启用字体类别"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+msgid "Font"
+msgstr ""
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+msgid "Style"
+msgstr ""
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "高级预览文字.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "渲染"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "字节码"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "自动"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "字体回滚"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "回滚名称"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "启用回滚"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+msgid "Hinting / Fallbacks"
 msgstr ""
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
@@ -4412,9 +4463,9 @@ msgstr "图标主题"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:198
 msgid "Icon theme overrides general theme"
-msgstr ""
+msgstr "图标主题覆盖常规主题"
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "图标主题"
 
@@ -4482,7 +4533,7 @@ msgid ""
 msgstr "Enlightenment 无法创建子进程:<br><br>%s<br>"
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "语言"
 
@@ -4496,11 +4547,11 @@ msgstr "缩略图滚动"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:96
 msgid "Enable Thumbscroll"
-msgstr ""
+msgstr "启用缩略图滚动"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:100
 msgid "Threshold for a thumb drag"
-msgstr ""
+msgstr "缩略图拖放阈值"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:103
 #: src/modules/conf_mouse_cursor/e_int_config_cursor.c:228
@@ -4510,7 +4561,7 @@ msgstr "%1.0f 像素"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:107
 msgid "Threshold for applying drag momentum"
-msgstr ""
+msgstr "启动拖放的阈值"
 
 #: src/modules/conf_interaction/e_int_config_interaction.c:110
 #, c-format
@@ -4538,7 +4589,7 @@ msgstr "语言设置"
 #: src/modules/conf_intl/e_int_config_intl.c:900
 #: src/modules/conf_intl/e_int_config_intl.c:977
 msgid "Language Selector"
-msgstr "语音选择"
+msgstr "语言选择器"
 
 #: src/modules/conf_intl/e_int_config_intl.c:950
 #: src/modules/conf_intl/e_int_config_intl.c:1028
@@ -4652,7 +4703,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "自动滚动鼠标临界值"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "杂项"
 
@@ -4828,24 +4879,24 @@ msgstr "指针大小"
 msgid "Mouse Cursor"
 msgstr "鼠标指针"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 msgid "Mouse Settings"
 msgstr "鼠标设置"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 msgid "Mouse Hand"
 msgstr "鼠标手"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "鼠标加速"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "加速"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "临界值"
 
@@ -4862,7 +4913,7 @@ msgid "Images"
 msgstr "图片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "主题"
 
@@ -4962,33 +5013,33 @@ msgstr ""
 msgid "Performance"
 msgstr "性能"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "用户环境选择器"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "可用用户环境"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 msgid "Select a profile"
 msgstr "选择一个档案"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 msgid "Reset"
 msgstr "重置"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr ""
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 msgid "Delete OK?"
 msgstr "删除吗?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "添加新用户环境"
 
@@ -5084,11 +5135,11 @@ msgstr "屏幕保护程序计时器"
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:140
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:178
 msgid "Time until X screensaver starts"
-msgstr ""
+msgstr "屏保启动延时"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:186
 msgid "Time until X screensaver alternates"
-msgstr ""
+msgstr "屏保停止延时"
 
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:216
 msgid "Blanking"
@@ -5151,23 +5202,23 @@ msgstr "启动"
 msgid "Theme Selector"
 msgstr "主题选择器"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 msgid " Import..."
 msgstr " 导入…"
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr " 在线…"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "主题分类"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "指派"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "清除所有"
 
@@ -5220,38 +5271,38 @@ msgid "Wallpaper Settings"
 msgstr "壁纸设置"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "使用主题墙纸"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "图片…"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "渐变..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr "在线…"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "壁纸位置"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "所有桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "这个桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "这个屏幕"
 
@@ -5272,14 +5323,14 @@ msgid "Fill Options"
 msgstr "填充选项"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "åž‚ç›´"
 
@@ -5344,40 +5395,40 @@ msgstr "使用源文件"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "选择图片…"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "图片导入出错"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 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:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "壁纸导入出错"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 msgid ""
 "Enlightenment was unable to import the wallpaper.<br><br>Are you sure this "
 "is a valid wallpaper?"
 msgstr "Enlightenment 无法导入该壁纸。<br><br>您确定那是一个有效的壁纸吗?"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 msgid "Exchange wallpapers"
 msgstr "转换主题壁纸"
 
@@ -5489,14 +5540,6 @@ msgstr "使用用户自定义图标"
 msgid "Prefer application provided icon"
 msgstr "使用应用程序提供的图标"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "内部窗口"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "总是记住内部窗口"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "焦点设置"
@@ -5629,17 +5672,12 @@ msgid "Window Maximize Policy"
 msgstr "窗口最大化策略"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "智能扩展"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "扩展窗口"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "填充可用区域"
 
@@ -5647,19 +5685,19 @@ msgstr "填充可用区域"
 msgid "Maximize Policy"
 msgstr "最大化策略"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 msgid "Maximize Directions"
 msgstr "最大化风向"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr "都是"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "允许窗口操作"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "书架自动隐藏时自动移动/缩放窗口"
 
@@ -5698,49 +5736,57 @@ msgstr "开始移动或缩放时升起"
 msgid "Raise when clicking to focus"
 msgstr "点击焦点时提升"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: src/modules/conf_window_remembers/e_mod_main.c:17
 msgid "Window Remembers"
 msgstr "窗口记忆"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+msgid "Remember internal dialogs"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+msgid "Remember fileman windows"
+msgstr ""
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 msgid "Delete Remember(s)"
 msgstr "删除记忆"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 msgid "Details"
 msgstr "详细信息"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 msgid "<No Name>"
 msgstr "<无名称>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 msgid "Class:"
 msgstr "类别:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 msgid "<No Class>"
 msgstr "<无类别>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 msgid "Title:"
 msgstr "标题:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 msgid "<No Title>"
 msgstr "<无标题>"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 msgid "Role:"
 msgstr "角色:"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 msgid "<No Role>"
 msgstr "<无角色>"
 
@@ -5786,12 +5832,12 @@ msgstr "选取窗口时提升窗口"
 #: src/modules/conf_winlist/e_int_config_winlist.c:168
 #: src/modules/conf_winlist/e_int_config_winlist.c:246
 msgid "Warp mouse to window while selecting"
-msgstr ""
+msgstr "选择时不在窗口回绕光标"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:170
 #: src/modules/conf_winlist/e_int_config_winlist.c:248
 msgid "Uncover windows while selecting"
-msgstr ""
+msgstr "选择时不覆盖窗口"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:172
 #: src/modules/conf_winlist/e_int_config_winlist.c:250
@@ -5801,16 +5847,16 @@ msgstr "选定时跳转到桌面"
 #: src/modules/conf_winlist/e_int_config_winlist.c:176
 #: src/modules/conf_winlist/e_int_config_winlist.c:254
 msgid "Warp Settings"
-msgstr ""
+msgstr "回绕设置"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:177
 #: src/modules/conf_winlist/e_int_config_winlist.c:255
 msgid "Warp At End"
-msgstr ""
+msgstr "尾部回绕"
 
 #: src/modules/conf_winlist/e_int_config_winlist.c:257
 msgid "Warp Speed"
-msgstr ""
+msgstr "回绕速度"
 
 #: src/modules/cpufreq/e_mod_main.c:135
 msgid "Cpufreq"
@@ -5818,23 +5864,23 @@ msgstr "CPU 频率"
 
 #: src/modules/cpufreq/e_mod_main.c:182
 msgid "Fast (4 ticks)"
-msgstr "快 (4秒)"
+msgstr "快 (4秒)"
 
 #: src/modules/cpufreq/e_mod_main.c:189
 msgid "Medium (8 ticks)"
-msgstr "中等 (8秒)"
+msgstr "中等 (8秒)"
 
 #: src/modules/cpufreq/e_mod_main.c:196
 msgid "Normal (32 ticks)"
-msgstr "正常 (32秒)"
+msgstr "正常 (32秒)"
 
 #: src/modules/cpufreq/e_mod_main.c:203
 msgid "Slow (64 ticks)"
-msgstr "慢 (64秒)"
+msgstr "慢 (64秒)"
 
 #: src/modules/cpufreq/e_mod_main.c:210
 msgid "Very Slow (256 ticks)"
-msgstr "很慢 (256下)"
+msgstr "很慢 (256下)"
 
 #: src/modules/cpufreq/e_mod_main.c:225
 msgid "Manual"
@@ -5858,11 +5904,11 @@ msgstr "重置 CPU 电源策略"
 
 #: src/modules/cpufreq/e_mod_main.c:252
 msgid "Powersaving policy"
-msgstr ""
+msgstr "节电规则"
 
 #: src/modules/cpufreq/e_mod_main.c:280
 msgid "Automatic powersaving"
-msgstr ""
+msgstr "自动节电"
 
 #: src/modules/cpufreq/e_mod_main.c:299
 #, c-format
@@ -5888,7 +5934,7 @@ msgstr "设定 CPU 速度"
 
 #: src/modules/cpufreq/e_mod_main.c:337
 msgid "Powersaving behavior"
-msgstr ""
+msgstr "节电行为"
 
 #: src/modules/cpufreq/e_mod_main.c:386
 msgid ""
@@ -5902,6 +5948,8 @@ msgid ""
 "missing<br>Kernel modules or features, or your CPU<br>simply does not "
 "support this feature."
 msgstr ""
+"您的内核不支持设置设置 CPU 频率。<br>可能是缺少内核模块或者特性,或者是纯粹由"
+"于 CPU 不支持。"
 
 #: src/modules/cpufreq/e_mod_main.c:432
 msgid ""
@@ -5911,7 +5959,7 @@ msgstr "试着通过模块 setfreq 功能设定 CPU 频率设置<br>时发生一
 
 #: src/modules/dropshadow/e_mod_config.c:40
 msgid "Dropshadow Settings"
-msgstr ""
+msgstr "投影设置"
 
 #: src/modules/dropshadow/e_mod_config.c:108
 msgid "Quality"
@@ -6027,6 +6075,10 @@ 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 ""
+"Fileman 模块的设置数据需要更新。<br>您的旧配置已被清除并建立了新的初始设置。"
+"<br>这在开发中是正常现象,所以无需提交错误。<br>这只是意味着 Fileman 需要新的"
+"初始配置来正常工作,旧配置缺少了某些功能。<br>新配置增加了这些功能。现在您可"
+"以重新按照喜好修改您的设置了。<br>我们对此造成的打搅表示抱歉。"
 
 #: src/modules/fileman/e_mod_main.c:444
 msgid ""
@@ -6037,18 +6089,18 @@ msgid ""
 "precaution your configuration has been now restored to<br>defaults. Sorry "
 "for the inconvenience.<br>"
 msgstr ""
-"您的配置文件比当前的 Enlightenment 更新。这是非常奇怪的事。除非您降级了"
-"Enlightenment,或者复制了其它地方的某个新版本的配置文件,否则这种情况不应该发"
-"生。这是不好的情况,以防万一,您的配置文件已经被恢复到默认状态。对任何的不便"
-"表示歉意。<br>"
+"您的配置文件比当前的 Enlightenment 的更新。这是非常奇怪的事。<br>除非您降级"
+"了 Enlightenment,或者复制了其它地方的某个新版本的配置文件,<br>否则这种情况"
+"不应该发生。这是不好的情况,为防万一您的配置文件已经被恢复到默认状态。<br>对"
+"任何因此造成的的不便表示歉意。<br>"
 
 #: src/modules/fileman/e_mod_main.c:513
 msgid "Fileman Settings Updated"
-msgstr ""
+msgstr "Fileman 设置已更新"
 
 #: src/modules/fileman/e_mod_config.c:95
 msgid "Fileman Settings"
-msgstr "文件管理器设置"
+msgstr "Fileman 设置"
 
 #: src/modules/fileman/e_mod_config.c:227
 msgid "Icon Size"
@@ -6095,7 +6147,7 @@ msgid "Show Toolbar"
 msgstr "显示工具栏"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr "行为"
 
@@ -6105,138 +6157,138 @@ msgstr "在桌面上显示 HAL 图标"
 
 #: src/modules/fileman/e_mod_config.c:273
 msgid "Mount volumes on insert"
-msgstr ""
+msgstr "插入介质后,立刻挂载"
 
 #: src/modules/fileman/e_mod_config.c:276
 msgid "Open filemanager on mount"
-msgstr ""
+msgstr "挂载后,打开文件管理器"
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "回到上级目录"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 msgid "Other application..."
 msgstr "其他应用程序..."
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "打开"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "打开方式..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 msgid "Known Applications"
 msgstr "已知应用程序"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "指定应用程序"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 msgid "Custom Command"
 msgstr "自定义命令"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
-msgstr ""
+msgstr "移动操作被取消"
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
-msgstr ""
+msgstr "删除操作被取消"
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
-msgstr ""
+msgstr "从设备的无效操作,已中止。"
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
-msgstr ""
+msgstr "复制 %s (剩余时间:%d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
-msgstr ""
+msgstr "移动 %s 完成"
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
-msgstr ""
+msgstr "移动 %s (剩余时间:%d 秒)"
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, c-format
 msgid "Delete done"
-msgstr ""
+msgstr "删除完成"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, c-format
 msgid "Deleting files..."
-msgstr ""
+msgstr "正在删除文件..."
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
-msgstr ""
+msgstr "从设备 %d 产生无效的操作"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:138
 #: src/modules/fileman_opinfo/e_mod_main.c:148
 msgid "(no information)"
-msgstr ""
+msgstr "(无信息)"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:142
 #, c-format
 msgid "File: %s"
-msgstr ""
+msgstr "文件:%s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:144
 #, c-format
 msgid "From: %s"
-msgstr ""
+msgstr "发信人:%s"
 
 #: src/modules/fileman_opinfo/e_mod_main.c:151
 #, c-format
 msgid "To: %s"
-msgstr ""
+msgstr "收信人:%s"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, c-format
 msgid "Processing %d operation(s)"
-msgstr ""
+msgstr "正执行 %d 个操作"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 msgid "Filemanager is idle"
-msgstr ""
+msgstr "文件管理器空闲"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
-msgstr "EFM运行信息"
+msgstr "EFM 运行信息"
 
 #: src/modules/gadman/e_mod_config.c:58
 msgid "Gadgets Manager"
@@ -6272,19 +6324,19 @@ msgstr "背景"
 msgid "Gadgets"
 msgstr "组件"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 msgid "Free"
 msgstr "空闲"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 msgid "Always on desktop"
 msgstr "总在桌面上"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr "按下时"
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 msgid "Add other gadgets"
 msgstr "添加其他组件"
 
@@ -6321,7 +6373,7 @@ msgstr "已选定的Bar源"
 msgid "Icon Labels"
 msgstr "图标标签"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "显示图标标签"
 
@@ -6380,43 +6432,43 @@ msgstr "创建新图标"
 msgid "Add Application"
 msgstr "添加应用程序"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 msgid "IBox Settings"
 msgstr "IBox设定"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "显示名称"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "显示标题"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "显示类别"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "显示图标名称"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 msgid "Display Border Caption"
 msgstr "显示边界标题"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "显示所有屏幕窗口"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "显示当前屏幕窗口"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "显示所有桌面窗口"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "显示活动桌面所有窗口"
 
@@ -6426,7 +6478,7 @@ msgstr "IBox"
 
 #: src/modules/pager/e_mod_config.c:72
 msgid "Pager Settings"
-msgstr ""
+msgstr "页面设定"
 
 #: src/modules/pager/e_mod_config.c:120 src/modules/pager/e_mod_config.c:160
 msgid "Flip desktop on mouse wheel"
@@ -6436,120 +6488,124 @@ msgstr "鼠标滚轮翻转"
 msgid "Show desktop names"
 msgstr "显示桌面名称"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 msgid "Popup Settings"
 msgstr "弹出设置"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 msgid "Show popup on desktop change"
 msgstr "当桌面更改时显示弹出窗口"
 
 #: src/modules/pager/e_mod_config.c:132
 msgid "Show popup for urgent windows"
-msgstr ""
+msgstr "显示独占窗口的弹出列表?"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
-msgstr ""
+msgstr "选择侧栏按键"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "点击已设定"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 msgid "Drag and Drop button"
 msgstr "拖拽按钮"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 msgid "Drag whole desktop"
 msgstr "拖拽整个桌面"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr "键盘动作弹出高度"
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f 像素"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "拖拽阻力"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 msgid "Popup pager height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 msgid "Popup speed"
 msgstr "弹出速度"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 msgid "Urgent Window Settings"
 msgstr "紧急窗口设置"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 msgid "Show popup on urgent window"
-msgstr ""
+msgstr "在独占窗口显示弹出菜单"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
-msgstr ""
+msgstr "屏幕置顶的独占窗口上显示弹出菜单?"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
 msgstr ""
+"请按一个鼠标按键,如要取消请按 <hilight>Esc</hilight>,<br>或使用 "
+"<hilight>Del</hilight> 恢复默认按键设置。"
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 msgid "Attetion"
 msgstr "注意"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 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 ""
+"您不能在 shelf 使用鼠标右键,因为右键已经被指定到上下文菜单。<br>此按键只能在"
+"弹出菜单工作。"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "按钮 %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 msgid "Show Pager Popup"
 msgstr ""
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 msgid "Popup Desk Right"
 msgstr "弹出桌面向右"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 msgid "Popup Desk Left"
 msgstr "弹出桌面向左"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 msgid "Popup Desk Up"
 msgstr "弹出桌面向上"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 msgid "Popup Desk Down"
 msgstr "弹出桌面向下"
 
@@ -6673,7 +6729,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "温度"
 
@@ -6685,20 +6741,22 @@ msgstr "下一步"
 msgid "Welcome to Enlightenment"
 msgstr "欢迎光临Enlightenment"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 msgid "Select one"
 msgstr "选择一个"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 msgid "Profile"
 msgstr "档案"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
 "on<br>how to get your<br>application menus<br>working."
 msgstr ""
+"您系统里没发现菜单文件。<br>详情请查阅 <br>www.enlightenment.org<br>上,关于"
+"如何让系统菜单正常工作的文档说明。"
 
 #: src/modules/wizard/page_030.c:107
 msgid "Select application menu"
@@ -6740,15 +6798,15 @@ msgstr "点击后聚焦在窗口中"
 msgid "Mouse over focuses windows"
 msgstr "光标覆盖聚焦窗口"
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 msgid "Select Icons to Add"
 msgstr "选择要添加的图标"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 msgid "Quick Launch"
 msgstr "快速启动"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 msgid "Select Applications"
 msgstr "选择应用程序"
 
@@ -6840,7 +6898,7 @@ msgstr "控制"
 msgid ""
 "Mixer Module Settings data changed.<br>Your old configuration has been "
 "replaced with new default.<br>Sorry for the inconvenience."
-msgstr ""
+msgstr "混音模块设置已改变。如有不便,敬请谅解。"
 
 #: src/modules/connman/e_mod_main.c:214
 msgid "Connection Manager"
@@ -6870,17 +6928,20 @@ msgstr "指定设备"
 msgid "Networks"
 msgstr "网络"
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
-msgstr ""
+msgstr "有另外一个系统托盘存在。"
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
-msgstr ""
+msgstr "只允许一个系统托盘的组件,目前已经有了一个。"
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 msgid "Systray"
-msgstr ""
+msgstr "系统托盘"
+
+#~ msgid "Window name and class"
+#~ msgstr "窗口的名字和类"
 
 #~ msgid "Configure Virtual Desktops"
 #~ msgstr "配置虚拟桌面"
@@ -6906,12 +6967,21 @@ msgstr ""
 #~ msgid "Configure Heading"
 #~ msgstr "设置标题条"
 
+#~ msgid "Internal Windows"
+#~ msgstr "内部窗口"
+
+#~ msgid "Expand the window"
+#~ msgstr "扩展窗口"
+
 #~ msgid "Scaling Factors"
 #~ msgstr "缩放因素"
 
 #~ msgid "Personal scaling factor"
 #~ msgstr "个人缩放因素"
 
+#~ msgid "Allow window manipulation"
+#~ msgstr "允许窗口操作"
+
 #~ msgid "Custom Grid Icons"
 #~ msgstr "定义网格图标"
 
@@ -6921,9 +6991,15 @@ msgstr ""
 #~ msgid "idle"
 #~ msgstr "闲置"
 
+#~ msgid "Flip desktops when mouse at screen edge"
+#~ msgstr "鼠标位于屏幕边缘时翻转"
+
 #~ msgid "Flip when moving mouse to the screen edge"
 #~ msgstr "移动鼠标到屏幕边缘时翻转"
 
+#~ msgid "Time the mouse is at the edge before flipping:"
+#~ msgstr "鼠标位于屏幕边缘的时间"
+
 #~ msgid "Defined Command"
 #~ msgstr "定义命令"
 
@@ -6966,6 +7042,12 @@ msgstr ""
 #~ msgid "%1.0f percent"
 #~ msgstr "百分之 %1.0f"
 
+#~ msgid "Dismiss alert automatically"
+#~ msgstr "自动解除警告"
+
+#~ msgid "Dismiss alert after:"
+#~ msgstr "以下时间后解除警告:"
+
 #~ msgid ""
 #~ "You requested to delete \"%s\".<br><br>Are you sure you want to delete "
 #~ "this profile?"
@@ -6980,11 +7062,41 @@ msgstr ""
 #~ msgid "Clone Current Profile"
 #~ msgstr "克隆当前用户环境"
 
-#~ msgid "Lock Screen"
-#~ msgstr "锁定屏幕"
+#~ msgid "Choose a website from list..."
+#~ msgstr "从列表中选择一个网站…"
 
-#~ msgid "Logout"
-#~ msgstr "退出"
+#~ msgid "get-e.org - Static"
+#~ msgstr "get-e.org - 静态"
+
+#~ msgid "get-e.org  - Animated"
+#~ msgstr "get-e.org  - 动画"
+
+#~ msgid "[%s] Getting feed... DONE!"
+#~ msgstr "[%s] 获取 feed... 完成!"
+
+#~ msgid "[%s] Getting feed... FAILED!"
+#~ msgstr "[%s] 获取 feed... 失败!"
+
+#~ msgid "[%s] Parsing feed... DONE!"
+#~ msgstr "[%s] 解析 feed... 完成!"
+
+#~ msgid "[%s] Parsing feed... FAILED!"
+#~ msgstr "[%s] 解析 feed... 失败!"
+
+#~ msgid "[%s] Downloading of edje file..."
+#~ msgstr "[%s] 下载 edje 文件..."
+
+#~ msgid "[%s] Download %d images of %d"
+#~ msgstr "[%s] 下载图像 %d / %d"
+
+#~ msgid "[%s] Choose an image from list"
+#~ msgstr "[%s] 从列表中选择一个图像"
+
+#~ msgid "[%s] Downloading of edje file... %d%% done"
+#~ msgstr "[%s] 下载 edje 文件... %d%% 完成"
+
+#~ msgid "[%s] Getting feed..."
+#~ msgstr "[%s] 获取 feed..."
 
 #~ msgid "Desktop %i, %i"
 #~ msgstr "桌面  %i, %i"
@@ -6998,6 +7110,12 @@ msgstr ""
 #~ msgid "Toolbar Configuration"
 #~ msgstr "工具栏配置"
 
+#~ msgid "Lock Screen"
+#~ msgstr "锁定屏幕"
+
+#~ msgid "Logout"
+#~ msgstr "退出"
+
 #~ msgid "Shelf Configuration"
 #~ msgstr "书架配置"
 
@@ -7052,11 +7170,8 @@ msgstr ""
 #~ msgid "Mixer Module Configuration"
 #~ msgstr "混音器模块设置"
 
-#~ msgid "Back"
-#~ msgstr "后退"
-
-#~ msgid "Choose Language"
-#~ msgstr "选择语言"
+#~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
+#~ msgstr "Enlightenment无法创建一个命令行:<br><br>%s %s<br>"
 
 #~ msgid "X reports there are no root windows and %i screens!\n"
 #~ msgstr "X 报告没有找到窗口和屏幕 %i !\n"
@@ -7064,98 +7179,6 @@ msgstr ""
 #~ msgid "Disable this splash screen in the future?"
 #~ msgstr "以后不显示这个 Splash?"
 
-#~ msgid "Theme Bug Detected"
-#~ msgstr "检测到主题 Bug"
-
-#~ msgid "Init"
-#~ msgstr "初始"
-
-#~ msgid "Window Manipulation"
-#~ msgstr "窗口管理"
-
-#~ msgid "Mouse Acceleration Settings"
-#~ 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 "没有信息"
-
-#~ msgid "NO BAT"
-#~ msgstr "没有电池"
-
-#~ msgid "Flip desktops when mouse at screen edge"
-#~ msgstr "鼠标位于屏幕边缘时翻转"
-
-#~ msgid "Time the mouse is at the edge before flipping:"
-#~ msgstr "鼠标位于屏幕边缘的时间"
-
-#~ msgid "Dismiss alert automatically"
-#~ msgstr "自动解除警告"
-
-#~ msgid "Dismiss alert after:"
-#~ msgstr "以下时间后解除警告:"
-
-#~ msgid "Choose a website from list..."
-#~ msgstr "从列表中选择一个网站…"
-
-#~ msgid "get-e.org - Static"
-#~ msgstr "get-e.org - 静态"
-
-#~ msgid "get-e.org  - Animated"
-#~ msgstr "get-e.org  - 动画"
-
-#~ msgid "[%s] Getting feed... DONE!"
-#~ msgstr "[%s] 获取 feed... 完成!"
-
-#~ msgid "[%s] Getting feed... FAILED!"
-#~ msgstr "[%s] 获取 feed... 失败!"
-
-#~ msgid "[%s] Parsing feed... DONE!"
-#~ msgstr "[%s] 解析 feed... 完成!"
-
-#~ msgid "[%s] Parsing feed... FAILED!"
-#~ msgstr "[%s] 解析 feed... 失败!"
-
-#~ msgid "[%s] Downloading of edje file..."
-#~ msgstr "[%s] 下载 edje 文件..."
-
-#~ msgid "[%s] Download %d images of %d"
-#~ msgstr "[%s] 下载图像 %d / %d"
-
-#~ msgid "[%s] Choose an image from list"
-#~ msgstr "[%s] 从列表中选择一个图像"
-
-#~ msgid "[%s] Downloading of edje file... %d%% done"
-#~ msgstr "[%s] 下载 edje 文件... %d%% 完成"
-
-#~ msgid "[%s] Getting feed..."
-#~ msgstr "[%s] 获取 feed..."
-
-#~ msgid "Enlightenment was unable to process a command line:<br><br>%s %s<br>"
-#~ msgstr "Enlightenment无法创建一个命令行:<br><br>%s %s<br>"
-
 #~ msgid "Enlightenment cannot set up its app system."
 #~ msgstr "Enlightenment 无法建立它的应用系统。"
 
@@ -7171,6 +7194,9 @@ msgstr ""
 #~ msgid "Miscellaneous"
 #~ msgstr "杂项"
 
+#~ msgid "Window Manipulation"
+#~ msgstr "窗口管理"
+
 #~ msgid "French"
 #~ msgstr "法国的"
 
@@ -7228,9 +7254,6 @@ msgstr ""
 #~ msgid "Window"
 #~ msgstr "窗口"
 
-#~ msgid "Window Name"
-#~ msgstr "窗口名"
-
 #~ msgid "Window Title"
 #~ msgstr "窗口标题"
 
@@ -7267,6 +7290,35 @@ msgstr ""
 #~ msgid "Move application up"
 #~ 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 "NO INFO"
+#~ msgstr "没有信息"
+
+#~ msgid "NO BAT"
+#~ msgstr "没有电池"
+
+#~ msgid "BAD DRIVER"
+#~ msgstr "错误的驱动"
+
+#~ msgid "FULL"
+#~ msgstr "满"
+
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgid "Danger"
+#~ msgstr "危险"
+
+#~ msgid "Charging"
+#~ msgstr "充电中"
+
 #~ msgid "Enlightenment Battery Module"
 #~ msgstr "Enlightenment电池模块"
 
@@ -7301,13 +7353,6 @@ msgstr ""
 #~ msgid "Cannot add icon"
 #~ msgstr "不能加入图标"
 
-#~ 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 ""
-#~ "你试着将一个没有 application 文件的应用程序图标拖放进来。<br><br>这个图标"
-#~ "无法被加入到 IBar。"
-
 #~ msgid "Enlightenment IBar Module"
 #~ msgstr "Enlightenment IBar 模块"
 
@@ -7386,9 +7431,6 @@ msgstr ""
 #~ msgid "Eap Editor"
 #~ msgstr "Eap 编辑器"
 
-#~ msgid "(Unused)"
-#~ msgstr "(未使用)"
-
 #~ msgid ""
 #~ "Enlightenment was unable run the program:\n"
 #~ "\n"
@@ -7423,26 +7465,6 @@ msgstr ""
 #~ msgid "x"
 #~ msgstr "可执行"
 
-#~ 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 ""
-#~ "Enlightenment 无法建立IPC套接字。\n"
-#~ "看起来已经有一个Enlightenment在运行了。\n"
-#~ "请确认没有其它Enlightenment在同一个display上运行,\n"
-#~ "如果没有,试着删除 ~/.ecore/enlightenment-* 下的所有文件,\n"
-#~ "然后再试着运行一遍。\n"
-#~ "\n"
-#~ "如果您使用AFS,那么你可能需要创建一个从 ~/.ecore 到 /tmp/my_directory/"
-#~ "ecore\n"
-#~ "的符号链接,以便套接字的建立。"
-
 #~ msgid "Enlightenment IPC setup error!"
 #~ msgstr "Enlightenment IPC设置错误!"
 
@@ -7524,21 +7546,6 @@ msgstr ""
 #~ msgid "Ok"
 #~ msgstr "OK"
 
-#~ msgid "Check Fast (0.5 sec)"
-#~ msgstr "频繁检查(0.5秒)"
-
-#~ msgid "Check Medium (1 sec)"
-#~ msgstr "一般检查(1秒)"
-
-#~ msgid "Check Normal (2 sec)"
-#~ msgstr "一般检查(2秒)"
-
-#~ msgid "Check Slow (5 sec)"
-#~ msgstr "缓慢检查(5秒)"
-
-#~ msgid "Check Very Slow (30 sec)"
-#~ msgstr "极缓慢检查(30秒)"
-
 #~ msgid "No Digital Display"
 #~ msgstr "无数字显示"
 
@@ -7554,12 +7561,6 @@ msgstr ""
 #~ msgid "Very Fast"
 #~ msgstr "很快"
 
-#~ msgid "Fix Aspect (Keep Height)"
-#~ msgstr "修正外观(保持高度)"
-
-#~ msgid "Fix Aspect (Keep Width)"
-#~ msgstr "修正外观(保持宽度)"
-
 #~ msgid "Enlightenment Randr Module"
 #~ msgstr "Enlightenment Randr 模块"
 
@@ -7571,13 +7572,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "Keep new resolution <hilight>%dx%d</hilight>?<br><br>Restoring old "
-#~ "resolution %dx%d in %d seconds."
-#~ msgstr ""
-#~ "保持使用新的分辨率 <hilight>%dx%d</hilight> 吗?<br><br>将会恢复旧的分辨"
-#~ "率 %dx%d (%d秒之内)。"
-
-#~ msgid ""
-#~ "Keep new resolution <hilight>%dx%d</hilight>?<br><br>Restoring old "
 #~ "resolution %dx%d NOW!"
 #~ msgstr ""
 #~ "保持使用新的分辨率 <hilight>%dx%d</hilight> 吗?<br><br>现在要立即恢复旧的"
@@ -7601,27 +7595,24 @@ msgstr ""
 #~ msgid "1 hour"
 #~ msgstr "一小时"
 
-#~ msgid "Check Fast (1 sec)"
-#~ msgstr "频繁检查(1秒)"
+#~ msgid "Back"
+#~ msgstr "后退"
 
-#~ msgid "Check Medium (5 sec)"
-#~ msgstr "一般检查(5秒)"
+#~ msgid "Choose Language"
+#~ msgstr "选择语言"
 
-#~ msgid "Check Normal (10 sec)"
-#~ msgstr "一般检查(10秒)"
+#~ msgid "Theme Bug Detected"
+#~ msgstr "检测到主题 Bug"
 
-#~ msgid "Check Slow (30 sec)"
-#~ msgstr "缓慢检查(30秒)"
+#~ msgid "Init"
+#~ msgstr "初始"
 
-#~ msgid "Check Very Slow (60 sec)"
-#~ msgstr "极缓慢检查(60秒)"
+#~ msgid "Mouse Acceleration Settings"
+#~ msgstr "鼠标加速设置"
 
 #~ msgid "Chinese (Simplified)"
 #~ msgstr "中文 (简体)"
 
-#~ msgid "Chinese (Traditional)"
-#~ msgstr "中文(繁体)"
-
 #~ msgid "Hong Kong"
 #~ msgstr "香港"
 
@@ -7637,23 +7628,6 @@ msgstr ""
 #~ msgid "Spain"
 #~ msgstr "西班牙"
 
-#~ msgid ""
-#~ "Error starting icon editor\n"
-#~ "\n"
-#~ "please install e_util_eapp_edit\n"
-#~ "or make sure it is in your PATH\n"
-#~ msgstr ""
-#~ "启动图标编辑器错误\n"
-#~ "\n"
-#~ "请安装 e_util_eapp_edit\n"
-#~ "或者确认它已经在你的路径设置中\n"
-
-#~ msgid "Icon Edit Error"
-#~ msgstr "图标编辑错误"
-
-#~ msgid "Wait Exit"
-#~ msgstr "等待推出"
-
 #~ msgid "Modify"
 #~ msgstr "修改"
 
@@ -7663,9 +7637,6 @@ msgstr ""
 #~ msgid "Lifespan"
 #~ msgstr "生命周期"
 
-#~ msgid "Remember This Window"
-#~ msgstr "记住该窗口"
-
 #~ msgid "Remember This Instance Only"
 #~ msgstr "只记住这个实例"
 
@@ -7696,23 +7667,11 @@ msgstr ""
 #~ msgid "Send To"
 #~ msgstr "发送到"
 
-#~ msgid ""
-#~ "This is Enlightenment %s.\n"
-#~ "Copyright © 1999-2005, by the Enlightenment Dev Team.\n"
-#~ "\n"
-#~ "We hope you enjoy using this software as much as we enjoyed writing it.\n"
-#~ "\n"
-#~ "Please think of the aardvarks. They need some love too."
-#~ msgstr ""
-#~ "这是 Enlightenment %s 。\n"
-#~ "版权所有 © 1999-2005,Enlightenment 开发小组。\n"
-#~ "\n"
-#~ "我们希望你能像我们开发这个软件一样开心地使用它。\n"
-#~ "\n"
-#~ "请想想土豚们。它们也需要关爱。"
+#~ msgid "Icon Edit Error"
+#~ msgstr "图标编辑错误"
 
-#~ msgid "(Empty)"
-#~ msgstr "(空)"
+#~ msgid "Match by Name"
+#~ msgstr "名称匹配"
 
 #~ msgid "Module API Error"
 #~ msgstr "模块API错误"
@@ -7891,5 +7850,135 @@ msgstr ""
 #~ "Enlightenment给的模块版本号:%i 。\n"
 #~ "中止模块。"
 
-#~ msgid "Match by Name"
-#~ msgstr "名称匹配"
+#~ msgid "Wait Exit"
+#~ msgstr "等待推出"
+
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "您正试着让 Enlightenment 记住把某些属性(诸如大小、位置、边框样式等)<br>应"
+#~ "用到一个窗口,而这个窗口<hilight>并没有单一的属性</hilight>。<br><br>这意"
+#~ "味着它是跟其它一个或多个窗口共享名字/类、Transience、角色等属性的,<br>记"
+#~ "住这个窗口的这些属性也会应用到匹配的那些窗口。<br><br>您可能需要启用"
+#~ "<hilight>只匹配一个窗口</hilight>选项,如果您只是想要仅仅这个窗口的实例被"
+#~ "修改,而保留其它窗口不变。<br><br>这只是个警告,如果您不想这个操作发生的"
+#~ "话。<br>如果这是您所要做的,按一下<hilight>应用</hilight>或者<hilight>OK</"
+#~ "hilight>按钮,您的操作就会生效。<br>如果您不想,按下<hilight>取消</"
+#~ "hilight>,那就什么都不会发生。"
+
+#~ 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 ""
+#~ "您试着将一个没有 application 文件的应用程序图标拖放进来。<br><br>这个图标"
+#~ "无法被加入到 IBar。"
+
+#~ msgid "(Unused)"
+#~ msgstr "(未使用)"
+
+#~ 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 ""
+#~ "Enlightenment 无法建立IPC套接字。\n"
+#~ "看起来已经有一个Enlightenment在运行了。\n"
+#~ "请确认没有其它Enlightenment在同一个display上运行,\n"
+#~ "如果没有,试着删除 ~/.ecore/enlightenment-* 下的所有文件,\n"
+#~ "然后再试着运行一遍。\n"
+#~ "\n"
+#~ "如果您使用AFS,那么您可能需要创建一个从 ~/.ecore 到 /tmp/my_directory/"
+#~ "ecore\n"
+#~ "的符号链接,以便套接字的建立。"
+
+#~ msgid "Check Fast (0.5 sec)"
+#~ msgstr "频繁检查(0.5秒)"
+
+#~ msgid "Check Medium (1 sec)"
+#~ msgstr "一般检查(1秒)"
+
+#~ msgid "Check Normal (2 sec)"
+#~ msgstr "一般检查(2秒)"
+
+#~ msgid "Check Slow (5 sec)"
+#~ msgstr "缓慢检查(5秒)"
+
+#~ msgid "Check Very Slow (30 sec)"
+#~ msgstr "极缓慢检查(30秒)"
+
+#~ msgid "Fix Aspect (Keep Height)"
+#~ msgstr "修正外观(保持高度)"
+
+#~ msgid "Fix Aspect (Keep Width)"
+#~ msgstr "修正外观(保持宽度)"
+
+#~ msgid ""
+#~ "Keep new resolution <hilight>%dx%d</hilight>?<br><br>Restoring old "
+#~ "resolution %dx%d in %d seconds."
+#~ msgstr ""
+#~ "保持使用新的分辨率 <hilight>%dx%d</hilight> 吗?<br><br>将会恢复旧的分辨"
+#~ "率 %dx%d (%d秒之内)。"
+
+#~ msgid "Check Fast (1 sec)"
+#~ msgstr "频繁检查(1秒)"
+
+#~ msgid "Check Medium (5 sec)"
+#~ msgstr "一般检查(5秒)"
+
+#~ msgid "Check Normal (10 sec)"
+#~ msgstr "一般检查(10秒)"
+
+#~ msgid "Check Slow (30 sec)"
+#~ msgstr "缓慢检查(30秒)"
+
+#~ msgid "Check Very Slow (60 sec)"
+#~ msgstr "极缓慢检查(60秒)"
+
+#~ msgid "Chinese (Traditional)"
+#~ msgstr "中文(繁体)"
+
+#~ msgid ""
+#~ "Error starting icon editor\n"
+#~ "\n"
+#~ "please install e_util_eapp_edit\n"
+#~ "or make sure it is in your PATH\n"
+#~ msgstr ""
+#~ "启动图标编辑器错误\n"
+#~ "\n"
+#~ "请安装 e_util_eapp_edit\n"
+#~ "或者确认它已经在您的路径设置中\n"
+
+#~ msgid ""
+#~ "This is Enlightenment %s.\n"
+#~ "Copyright © 1999-2005, by the Enlightenment Dev Team.\n"
+#~ "\n"
+#~ "We hope you enjoy using this software as much as we enjoyed writing it.\n"
+#~ "\n"
+#~ "Please think of the aardvarks. They need some love too."
+#~ msgstr ""
+#~ "这是 Enlightenment %s 。\n"
+#~ "版权所有 © 1999-2005,Enlightenment 开发小组。\n"
+#~ "\n"
+#~ "我们希望您能像我们开发这个软件一样开心地使用它。\n"
+#~ "\n"
+#~ "请想想土豚们。它们也需要关爱。"
+
+#~ msgid "(Empty)"
+#~ msgstr "(空)"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e2b87bf..f1377b6 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 69c8158..56a3c2e 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: 2009-07-29 15:09+1000\n"
+"POT-Creation-Date: 2009-12-02 11:51+1100\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,28 +20,28 @@ msgstr ""
 msgid "About Enlightenment"
 msgstr "關於 Enlightenment"
 
-#: src/bin/e_about.c:20 src/bin/e_actions.c:2499 src/bin/e_config_dialog.c:267
-#: src/bin/e_fm.c:939 src/bin/e_int_border_menu.c:216
+#: src/bin/e_about.c:20 src/bin/e_actions.c:2547 src/bin/e_config_dialog.c:270
+#: src/bin/e_fm.c:943 src/bin/e_int_border_menu.c:222
 #: src/bin/e_int_border_prop.c:81 src/bin/e_theme_about.c:20
 #: src/modules/conf/e_conf.c:180
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:819
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:848
 #: src/modules/conf_theme/e_int_config_theme_web.c:130
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:121
-#: src/modules/fileman/e_fwin.c:1877 src/modules/illume/e_mod_win.c:177
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:120
+#: src/modules/fileman/e_fwin.c:1822 src/modules/illume/e_mod_win.c:177
 #: src/modules/mixer/app_mixer.c:531
 msgid "Close"
 msgstr "關閉"
 
-#: src/bin/e_about.c:21 src/bin/e_actions.c:2795 src/bin/e_actions.c:2799
-#: src/bin/e_actions.c:2803 src/bin/e_int_menus.c:165 src/bin/e_main.c:663
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:182
-#: src/modules/wizard/page_000.c:27
+#: src/bin/e_about.c:21 src/bin/e_actions.c:2844 src/bin/e_actions.c:2848
+#: src/bin/e_actions.c:2852 src/bin/e_int_menus.c:165 src/bin/e_main.c:668
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:210
+#: src/modules/wizard/page_000.c:32
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: src/bin/e_about.c:26
 msgid ""
-"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br><br>We "
+"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br><br>We "
 "hope you enjoy using this software as much as we enjoyed writing it."
 "<br><br>This software is provided as-is with no explicit or implied "
 "warranty. This software is governed by licensing conditions, so please see "
@@ -69,592 +69,592 @@ msgstr ""
 msgid "Are you sure you want to kill this window?"
 msgstr "您是否確定強制結束此視窗?"
 
-#: src/bin/e_actions.c:360 src/bin/e_actions.c:1776 src/bin/e_actions.c:1874
-#: src/bin/e_actions.c:1938 src/bin/e_actions.c:2002 src/bin/e_actions.c:2066
-#: src/bin/e_actions.c:2130 src/bin/e_confirm_dialog.c:47
-#: src/bin/e_desklock.c:1047 src/bin/e_fm.c:9060 src/bin/e_fm.c:9289
-#: src/bin/e_module.c:502 src/bin/e_screensaver.c:106
+#: src/bin/e_actions.c:360 src/bin/e_actions.c:1769 src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1931 src/bin/e_actions.c:1995 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:2123 src/bin/e_confirm_dialog.c:47
+#: src/bin/e_desklock.c:1027 src/bin/e_fm.c:9023 src/bin/e_fm.c:9252
+#: src/bin/e_module.c:506 src/bin/e_screensaver.c:106
 msgid "Yes"
 msgstr "是"
 
-#: src/bin/e_actions.c:362 src/bin/e_actions.c:1778 src/bin/e_actions.c:1876
-#: src/bin/e_actions.c:1940 src/bin/e_actions.c:2004 src/bin/e_actions.c:2068
-#: src/bin/e_actions.c:2132 src/bin/e_confirm_dialog.c:48
-#: src/bin/e_desklock.c:1049 src/bin/e_fm.c:9058 src/bin/e_fm.c:9290
-#: src/bin/e_module.c:503 src/bin/e_screensaver.c:108
+#: src/bin/e_actions.c:362 src/bin/e_actions.c:1771 src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1933 src/bin/e_actions.c:1997 src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2125 src/bin/e_confirm_dialog.c:48
+#: src/bin/e_desklock.c:1029 src/bin/e_fm.c:9021 src/bin/e_fm.c:9253
+#: src/bin/e_module.c:507 src/bin/e_screensaver.c:108
 msgid "No"
 msgstr "否"
 
-#: src/bin/e_actions.c:1769
+#: src/bin/e_actions.c:1762
 msgid "Are you sure you want to exit?"
 msgstr "您是否確定退出?"
 
-#: src/bin/e_actions.c:1771
+#: src/bin/e_actions.c:1764
 msgid ""
 "You requested to exit Enlightenment.<br><br>Are you sure you want to exit?"
 msgstr "您要求退出 Enlightenment。<br><br>您是否確定退出?"
 
-#: src/bin/e_actions.c:1867
+#: src/bin/e_actions.c:1860
 msgid "Are you sure you want to log out?"
 msgstr "您是否確定登出?"
 
-#: src/bin/e_actions.c:1869
+#: src/bin/e_actions.c:1862
 msgid "You are about to log out.<br><br>Are you sure you want to do this?"
 msgstr "您即將登出系統。<br><br>您是否確定登出系統?"
 
-#: src/bin/e_actions.c:1931 src/bin/e_actions.c:2059
+#: src/bin/e_actions.c:1924 src/bin/e_actions.c:2052
 msgid "Are you sure you want to turn off?"
 msgstr "您是否確定關機?"
 
-#: src/bin/e_actions.c:1933
+#: src/bin/e_actions.c:1926
 msgid ""
 "You requested to turn off your Computer.<br><br>Are you sure you want to "
 "shut down?"
 msgstr "您要求關閉您的電腦。<br><br>您是否確定關機?"
 
-#: src/bin/e_actions.c:1995
+#: src/bin/e_actions.c:1988
 msgid "Are you sure you want to reboot?"
 msgstr "您是否確定重新開機?"
 
-#: src/bin/e_actions.c:1997
+#: src/bin/e_actions.c:1990
 msgid ""
 "You requested to reboot your Computer.<br><br>Are you sure you want to "
 "restart it?"
 msgstr "您要求重新啟動您的電腦。<br><br>您是否確定重新開機?"
 
-#: src/bin/e_actions.c:2061
+#: src/bin/e_actions.c:2054
 msgid ""
 "You requested to suspend your Computer.<br><br>Are you sure you want to "
 "suspend?"
 msgstr "您要求進入待機狀態。<br><br>您是否確定待機?"
 
-#: src/bin/e_actions.c:2123
+#: src/bin/e_actions.c:2116
 msgid "Are you sure you want to hibernate?"
 msgstr "您是否確定休眠?"
 
-#: src/bin/e_actions.c:2125
+#: src/bin/e_actions.c:2118
 msgid ""
 "You requested to hibernate your Computer.<br><br>Are you sure you want to "
 "suspend to disk?"
 msgstr "您要求進入休眠狀態。<br><br>您是否確定休眠?"
 
-#: src/bin/e_actions.c:2459 src/bin/e_actions.c:2470 src/bin/e_actions.c:2489
-#: src/bin/e_actions.c:2494 src/bin/e_actions.c:2499 src/bin/e_actions.c:2504
-#: src/bin/e_actions.c:2723 src/bin/e_actions.c:2727 src/bin/e_actions.c:2732
-#: src/bin/e_actions.c:2738 src/bin/e_actions.c:2744 src/bin/e_actions.c:2750
+#: src/bin/e_actions.c:2507 src/bin/e_actions.c:2518 src/bin/e_actions.c:2537
+#: src/bin/e_actions.c:2542 src/bin/e_actions.c:2547 src/bin/e_actions.c:2552
+#: src/bin/e_actions.c:2772 src/bin/e_actions.c:2776 src/bin/e_actions.c:2781
+#: src/bin/e_actions.c:2787 src/bin/e_actions.c:2793 src/bin/e_actions.c:2799
 msgid "Window : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:2459 src/bin/e_fm.c:6106
+#: src/bin/e_actions.c:2507 src/bin/e_fm.c:6080
 msgid "Move"
 msgstr "移動"
 
-#: src/bin/e_actions.c:2470
+#: src/bin/e_actions.c:2518
 msgid "Resize"
 msgstr "改變大小"
 
-#: src/bin/e_actions.c:2481 src/bin/e_actions.c:2771 src/bin/e_actions.c:2773
-#: src/bin/e_actions.c:2775 src/bin/e_actions.c:2777 src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2529 src/bin/e_actions.c:2820 src/bin/e_actions.c:2822
+#: src/bin/e_actions.c:2824 src/bin/e_actions.c:2826 src/bin/e_actions.c:2828
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:325
 msgid "Menu"
 msgstr "選單"
 
-#: src/bin/e_actions.c:2481
+#: src/bin/e_actions.c:2529
 msgid "Window Menu"
 msgstr "視窗選單"
 
-#: src/bin/e_actions.c:2489 src/bin/e_int_border_menu.c:186
+#: src/bin/e_actions.c:2537 src/bin/e_int_border_menu.c:192
 msgid "Raise"
 msgstr "上移"
 
-#: src/bin/e_actions.c:2494 src/bin/e_int_border_menu.c:178
+#: src/bin/e_actions.c:2542 src/bin/e_int_border_menu.c:184
 msgid "Lower"
 msgstr "下移"
 
-#: src/bin/e_actions.c:2504 src/bin/e_int_border_menu.c:205
+#: src/bin/e_actions.c:2552 src/bin/e_int_border_menu.c:211
 msgid "Kill"
 msgstr "強制結束"
 
-#: src/bin/e_actions.c:2509 src/bin/e_actions.c:2516 src/bin/e_actions.c:2523
-#: src/bin/e_actions.c:2530 src/bin/e_actions.c:2532 src/bin/e_actions.c:2535
-#: src/bin/e_actions.c:2538 src/bin/e_actions.c:2540 src/bin/e_actions.c:2542
-#: src/bin/e_actions.c:2544 src/bin/e_actions.c:2551 src/bin/e_actions.c:2553
-#: src/bin/e_actions.c:2555 src/bin/e_actions.c:2557 src/bin/e_actions.c:2559
-#: src/bin/e_actions.c:2566 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2557 src/bin/e_actions.c:2564 src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2578 src/bin/e_actions.c:2580 src/bin/e_actions.c:2583
+#: src/bin/e_actions.c:2586 src/bin/e_actions.c:2588 src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2592 src/bin/e_actions.c:2599 src/bin/e_actions.c:2601
+#: src/bin/e_actions.c:2603 src/bin/e_actions.c:2605 src/bin/e_actions.c:2607
+#: src/bin/e_actions.c:2614 src/bin/e_actions.c:2619
 msgid "Window : State"
 msgstr "視窗: 狀態"
 
-#: src/bin/e_actions.c:2509
+#: src/bin/e_actions.c:2557
 msgid "Sticky Mode Toggle"
 msgstr "切換相黏模式"
 
-#: src/bin/e_actions.c:2516
+#: src/bin/e_actions.c:2564
 msgid "Iconic Mode Toggle"
 msgstr "切換圖示化"
 
-#: src/bin/e_actions.c:2523
+#: src/bin/e_actions.c:2571
 msgid "Fullscreen Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:2530 src/bin/e_int_border_menu.c:150
-#: src/bin/e_int_border_menu.c:351
+#: src/bin/e_actions.c:2578 src/bin/e_int_border_menu.c:153
+#: src/bin/e_int_border_menu.c:357
 msgid "Maximize"
 msgstr "最大化"
 
-#: src/bin/e_actions.c:2532
+#: src/bin/e_actions.c:2580
 msgid "Maximize Vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_actions.c:2535
+#: src/bin/e_actions.c:2583
 msgid "Maximize Horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_actions.c:2538
+#: src/bin/e_actions.c:2586
 msgid "Maximize Fullscreen"
 msgstr "全螢幕最大化"
 
-#: src/bin/e_actions.c:2540
+#: src/bin/e_actions.c:2588
 msgid "Maximize Mode \"Smart\""
 msgstr "「智慧型」最大化模式"
 
-#: src/bin/e_actions.c:2542
+#: src/bin/e_actions.c:2590
 msgid "Maximize Mode \"Expand\""
 msgstr "「展開」最大化模式"
 
-#: src/bin/e_actions.c:2544
+#: src/bin/e_actions.c:2592
 msgid "Maximize Mode \"Fill\""
 msgstr "「填滿」最大化模式"
 
-#: src/bin/e_actions.c:2551
+#: src/bin/e_actions.c:2599
 msgid "Shade Up Mode Toggle"
 msgstr "切換上捲模式"
 
-#: src/bin/e_actions.c:2553
+#: src/bin/e_actions.c:2601
 msgid "Shade Down Mode Toggle"
 msgstr "切換下捲模式"
 
-#: src/bin/e_actions.c:2555
+#: src/bin/e_actions.c:2603
 msgid "Shade Left Mode Toggle"
 msgstr "切換左捲模式"
 
-#: src/bin/e_actions.c:2557
+#: src/bin/e_actions.c:2605
 msgid "Shade Right Mode Toggle"
 msgstr "切換右捲模式"
 
-#: src/bin/e_actions.c:2559
+#: src/bin/e_actions.c:2607
 msgid "Shade Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:2566
+#: src/bin/e_actions.c:2614
 msgid "Toggle Borderless State"
 msgstr "切換無邊框狀態"
 
-#: src/bin/e_actions.c:2571
+#: src/bin/e_actions.c:2619
 msgid "Toggle Pinned State"
 msgstr "切換固定於桌面狀態"
 
-#: src/bin/e_actions.c:2576 src/bin/e_actions.c:2578 src/bin/e_actions.c:2580
-#: src/bin/e_actions.c:2582 src/bin/e_actions.c:2584 src/bin/e_actions.c:2590
-#: src/bin/e_actions.c:2595 src/bin/e_actions.c:2600 src/bin/e_actions.c:2606
-#: src/bin/e_actions.c:2612 src/bin/e_actions.c:2614 src/bin/e_actions.c:2616
-#: src/bin/e_actions.c:2618 src/bin/e_actions.c:2620 src/bin/e_actions.c:2622
 #: src/bin/e_actions.c:2624 src/bin/e_actions.c:2626 src/bin/e_actions.c:2628
-#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2634
-#: src/bin/e_actions.c:2636 src/bin/e_actions.c:2642 src/bin/e_actions.c:2644
-#: src/bin/e_actions.c:2646 src/bin/e_actions.c:2648 src/bin/e_actions.c:2650
-#: src/bin/e_actions.c:2656 src/bin/e_actions.c:2662 src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2630 src/bin/e_actions.c:2632 src/bin/e_actions.c:2638
+#: src/bin/e_actions.c:2644 src/bin/e_actions.c:2649 src/bin/e_actions.c:2655
+#: src/bin/e_actions.c:2661 src/bin/e_actions.c:2663 src/bin/e_actions.c:2665
+#: src/bin/e_actions.c:2667 src/bin/e_actions.c:2669 src/bin/e_actions.c:2671
 #: src/bin/e_actions.c:2673 src/bin/e_actions.c:2675 src/bin/e_actions.c:2677
 #: src/bin/e_actions.c:2679 src/bin/e_actions.c:2681 src/bin/e_actions.c:2683
-#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2687 src/bin/e_actions.c:2689
-#: src/bin/e_actions.c:2691 src/bin/e_actions.c:2693 src/bin/e_actions.c:2695
-#: src/bin/e_actions.c:2697 src/bin/e_actions.c:2845 src/bin/e_actions.c:2850
-#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:720
+#: src/bin/e_actions.c:2685 src/bin/e_actions.c:2691 src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2695 src/bin/e_actions.c:2697 src/bin/e_actions.c:2699
+#: src/bin/e_actions.c:2705 src/bin/e_actions.c:2711 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2722 src/bin/e_actions.c:2724 src/bin/e_actions.c:2726
+#: src/bin/e_actions.c:2728 src/bin/e_actions.c:2730 src/bin/e_actions.c:2732
+#: src/bin/e_actions.c:2734 src/bin/e_actions.c:2736 src/bin/e_actions.c:2738
+#: src/bin/e_actions.c:2740 src/bin/e_actions.c:2742 src/bin/e_actions.c:2744
+#: src/bin/e_actions.c:2746 src/bin/e_actions.c:2894 src/bin/e_actions.c:2899
+#: src/bin/e_int_menus.c:134 src/bin/e_int_shelf_config.c:786
 #: src/modules/conf_clientlist/e_int_config_clientlist.c:103
-#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:166
+#: src/modules/fileman/e_mod_main.c:316 src/modules/ibox/e_mod_config.c:165
 msgid "Desktop"
 msgstr "桌面"
 
-#: src/bin/e_actions.c:2576
+#: src/bin/e_actions.c:2624
 msgid "Flip Desktop Left"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2578
+#: src/bin/e_actions.c:2626
 msgid "Flip Desktop Right"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2580
+#: src/bin/e_actions.c:2628
 msgid "Flip Desktop Up"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2582
+#: src/bin/e_actions.c:2630
 msgid "Flip Desktop Down"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2584
+#: src/bin/e_actions.c:2632
 msgid "Flip Desktop By..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2590
+#: src/bin/e_actions.c:2638
 msgid "Show The Desktop"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2595
+#: src/bin/e_actions.c:2644
 #, fuzzy
 msgid "Show The Shelf"
 msgstr "顯示桌面"
 
-#: src/bin/e_actions.c:2600
+#: src/bin/e_actions.c:2649
 msgid "Flip Desktop To..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2606
+#: src/bin/e_actions.c:2655
 msgid "Flip Desktop Linearly..."
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2612
+#: src/bin/e_actions.c:2661
 msgid "Switch To Desktop 0"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2614
+#: src/bin/e_actions.c:2663
 msgid "Switch To Desktop 1"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2616
+#: src/bin/e_actions.c:2665
 msgid "Switch To Desktop 2"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2618
+#: src/bin/e_actions.c:2667
 msgid "Switch To Desktop 3"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2620
+#: src/bin/e_actions.c:2669
 msgid "Switch To Desktop 4"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2622
+#: src/bin/e_actions.c:2671
 msgid "Switch To Desktop 5"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2624
+#: src/bin/e_actions.c:2673
 msgid "Switch To Desktop 6"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2626
+#: src/bin/e_actions.c:2675
 msgid "Switch To Desktop 7"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2628
+#: src/bin/e_actions.c:2677
 msgid "Switch To Desktop 8"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2630
+#: src/bin/e_actions.c:2679
 msgid "Switch To Desktop 9"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2632
+#: src/bin/e_actions.c:2681
 msgid "Switch To Desktop 10"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2634
+#: src/bin/e_actions.c:2683
 msgid "Switch To Desktop 11"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2636
+#: src/bin/e_actions.c:2685
 msgid "Switch To Desktop..."
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2642
+#: src/bin/e_actions.c:2691
 #, fuzzy
 msgid "Flip Desktop Left (All Screens)"
 msgstr "切換到左方桌面"
 
-#: src/bin/e_actions.c:2644
+#: src/bin/e_actions.c:2693
 #, fuzzy
 msgid "Flip Desktop Right (All Screens)"
 msgstr "切換到右方桌面"
 
-#: src/bin/e_actions.c:2646
+#: src/bin/e_actions.c:2695
 #, fuzzy
 msgid "Flip Desktop Up (All Screens)"
 msgstr "切換到上方桌面"
 
-#: src/bin/e_actions.c:2648
+#: src/bin/e_actions.c:2697
 #, fuzzy
 msgid "Flip Desktop Down (All Screens)"
 msgstr "切換到下方桌面"
 
-#: src/bin/e_actions.c:2650
+#: src/bin/e_actions.c:2699
 #, fuzzy
 msgid "Flip Desktop By... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2656
+#: src/bin/e_actions.c:2705
 #, fuzzy
 msgid "Flip Desktop To... (All Screens)"
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2662
+#: src/bin/e_actions.c:2711
 #, fuzzy
 msgid "Flip Desktop Linearly... (All Screens)"
 msgstr "切換到目前桌面之..."
 
-#: src/bin/e_actions.c:2668
+#: src/bin/e_actions.c:2717
 #, fuzzy
 msgid "Flip Desktop In Direction..."
 msgstr "二維切換桌面到..."
 
-#: src/bin/e_actions.c:2673
+#: src/bin/e_actions.c:2722
 #, fuzzy
 msgid "Switch To Desktop 0 (All Screens)"
 msgstr "切換到桌面 0"
 
-#: src/bin/e_actions.c:2675
+#: src/bin/e_actions.c:2724
 #, fuzzy
 msgid "Switch To Desktop 1 (All Screens)"
 msgstr "切換到桌面 1"
 
-#: src/bin/e_actions.c:2677
+#: src/bin/e_actions.c:2726
 #, fuzzy
 msgid "Switch To Desktop 2 (All Screens)"
 msgstr "切換到桌面 2"
 
-#: src/bin/e_actions.c:2679
+#: src/bin/e_actions.c:2728
 #, fuzzy
 msgid "Switch To Desktop 3 (All Screens)"
 msgstr "切換到桌面 3"
 
-#: src/bin/e_actions.c:2681
+#: src/bin/e_actions.c:2730
 #, fuzzy
 msgid "Switch To Desktop 4 (All Screens)"
 msgstr "切換到桌面 4"
 
-#: src/bin/e_actions.c:2683
+#: src/bin/e_actions.c:2732
 #, fuzzy
 msgid "Switch To Desktop 5 (All Screens)"
 msgstr "切換到桌面 5"
 
-#: src/bin/e_actions.c:2685
+#: src/bin/e_actions.c:2734
 #, fuzzy
 msgid "Switch To Desktop 6 (All Screens)"
 msgstr "切換到桌面 6"
 
-#: src/bin/e_actions.c:2687
+#: src/bin/e_actions.c:2736
 #, fuzzy
 msgid "Switch To Desktop 7 (All Screens)"
 msgstr "切換到桌面 7"
 
-#: src/bin/e_actions.c:2689
+#: src/bin/e_actions.c:2738
 #, fuzzy
 msgid "Switch To Desktop 8 (All Screens)"
 msgstr "切換到桌面 8"
 
-#: src/bin/e_actions.c:2691
+#: src/bin/e_actions.c:2740
 #, fuzzy
 msgid "Switch To Desktop 9 (All Screens)"
 msgstr "切換到桌面 9"
 
-#: src/bin/e_actions.c:2693
+#: src/bin/e_actions.c:2742
 #, fuzzy
 msgid "Switch To Desktop 10 (All Screens)"
 msgstr "切換到桌面 10"
 
-#: src/bin/e_actions.c:2695
+#: src/bin/e_actions.c:2744
 #, fuzzy
 msgid "Switch To Desktop 11 (All Screens)"
 msgstr "切換到桌面 11"
 
-#: src/bin/e_actions.c:2697
+#: src/bin/e_actions.c:2746
 #, fuzzy
 msgid "Switch To Desktop... (All Screens)"
 msgstr "切換桌面到..."
 
-#: src/bin/e_actions.c:2704 src/bin/e_actions.c:2706 src/bin/e_actions.c:2708
-#: src/bin/e_actions.c:2713 src/bin/e_actions.c:2715 src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2753 src/bin/e_actions.c:2755 src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2762 src/bin/e_actions.c:2764 src/bin/e_actions.c:2766
 #: 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
 #: src/modules/conf_dpms/e_mod_main.c:34
 #: src/modules/conf_screensaver/e_mod_main.c:34
-#: src/modules/ibox/e_mod_config.c:135
+#: src/modules/ibox/e_mod_config.c:134
 msgid "Screen"
 msgstr "螢幕"
 
-#: src/bin/e_actions.c:2704
+#: src/bin/e_actions.c:2753
 msgid "Send Mouse To Screen 0"
 msgstr "將滑鼠送到螢幕 0"
 
-#: src/bin/e_actions.c:2706
+#: src/bin/e_actions.c:2755
 msgid "Send Mouse To Screen 1"
 msgstr "將滑鼠送到螢幕 1"
 
-#: src/bin/e_actions.c:2708
+#: src/bin/e_actions.c:2757
 msgid "Send Mouse To Screen..."
 msgstr "將滑鼠送到其它螢幕..."
 
-#: src/bin/e_actions.c:2713
+#: src/bin/e_actions.c:2762
 msgid "Send Mouse Forward 1 Screen"
 msgstr "將滑鼠送到下一螢幕"
 
-#: src/bin/e_actions.c:2715
+#: src/bin/e_actions.c:2764
 msgid "Send Mouse Back 1 Screen"
 msgstr "將滑鼠送到上一螢幕"
 
-#: src/bin/e_actions.c:2717
+#: src/bin/e_actions.c:2766
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "將滑鼠送到目前螢幕之..."
 
-#: src/bin/e_actions.c:2755 src/bin/e_actions.c:2757 src/bin/e_actions.c:2759
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2804 src/bin/e_actions.c:2806 src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2814
 msgid "Window : Moving"
 msgstr "視窗: 移動"
 
-#: src/bin/e_actions.c:2755
+#: src/bin/e_actions.c:2804
 msgid "To Next Desktop"
 msgstr "送到下一桌面"
 
-#: src/bin/e_actions.c:2757
+#: src/bin/e_actions.c:2806
 msgid "To Previous Desktop"
 msgstr "送到上一桌面"
 
-#: src/bin/e_actions.c:2759
+#: src/bin/e_actions.c:2808
 msgid "By Desktop #..."
 msgstr "目前桌面之..."
 
-#: src/bin/e_actions.c:2765
+#: src/bin/e_actions.c:2814
 msgid "To Desktop..."
 msgstr "送到桌面..."
 
-#: src/bin/e_actions.c:2771
+#: src/bin/e_actions.c:2820
 msgid "Show Main Menu"
 msgstr "顯示主選單"
 
-#: src/bin/e_actions.c:2773
+#: src/bin/e_actions.c:2822
 msgid "Show Favorites Menu"
 msgstr "顯示「我的最愛」選單"
 
-#: src/bin/e_actions.c:2775
+#: src/bin/e_actions.c:2824
 msgid "Show All Applications Menu"
 msgstr "顯示「應用程式」選單"
 
-#: src/bin/e_actions.c:2777
+#: src/bin/e_actions.c:2826
 msgid "Show Clients Menu"
 msgstr "顯示「視窗列表」選單"
 
-#: src/bin/e_actions.c:2779
+#: src/bin/e_actions.c:2828
 msgid "Show Menu..."
 msgstr "顯示選單..."
 
-#: src/bin/e_actions.c:2786 src/bin/e_actions.c:2791
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:164
+#: src/bin/e_actions.c:2835 src/bin/e_actions.c:2840
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:173
 #: src/modules/exebuf/e_mod_main.c:48 src/modules/exebuf/e_mod_main.c:69
 #: src/modules/fileman/e_mod_main.c:63 src/modules/fileman/e_mod_main.c:146
 msgid "Launch"
 msgstr "å•Ÿå‹•"
 
-#: src/bin/e_actions.c:2786 src/bin/e_int_border_prop.c:439
+#: src/bin/e_actions.c:2835 src/bin/e_int_border_prop.c:439
 msgid "Command"
 msgstr "命令"
 
-#: src/bin/e_actions.c:2791
+#: src/bin/e_actions.c:2840
 msgid "Application"
 msgstr "應用程式"
 
-#: src/bin/e_actions.c:2795 src/bin/e_int_menus.c:189
+#: src/bin/e_actions.c:2844 src/bin/e_int_menus.c:189
 msgid "Restart"
 msgstr "重新啟動"
 
-#: src/bin/e_actions.c:2799 src/bin/e_int_menus.c:194
+#: src/bin/e_actions.c:2848 src/bin/e_int_menus.c:194
 msgid "Exit"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2803
+#: src/bin/e_actions.c:2852
 #, fuzzy
 msgid "Exit Now"
 msgstr "退出"
 
-#: src/bin/e_actions.c:2807 src/bin/e_actions.c:2812
+#: src/bin/e_actions.c:2856 src/bin/e_actions.c:2861
 #, fuzzy
 msgid "Enlightenment : Mode"
 msgstr "Enlightenment %s 模組"
 
-#: src/bin/e_actions.c:2808
+#: src/bin/e_actions.c:2857
 #, fuzzy
 msgid "Presentation Mode Toggle"
 msgstr "切換全螢幕模式"
 
-#: src/bin/e_actions.c:2813
+#: src/bin/e_actions.c:2862
 #, fuzzy
 msgid "Offline Mode Toggle"
 msgstr "切換捲起模式"
 
-#: src/bin/e_actions.c:2817 src/bin/e_actions.c:2821 src/bin/e_actions.c:2825
-#: src/bin/e_actions.c:2829 src/bin/e_actions.c:2833 src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2866 src/bin/e_actions.c:2870 src/bin/e_actions.c:2874
+#: src/bin/e_actions.c:2878 src/bin/e_actions.c:2882 src/bin/e_actions.c:2886
 #: src/bin/e_configure.c:145 src/bin/e_int_config_modules.c:45
 #: src/modules/conf_desklock/e_int_config_desklock.c:301
 #: src/modules/conf_imc/e_int_config_imc.c:827
 #: src/modules/conf_startup/e_int_config_startup.c:267
-#: src/modules/conf_theme/e_int_config_theme.c:395
-#: src/modules/conf_theme/e_int_config_theme.c:794
+#: src/modules/conf_theme/e_int_config_theme.c:398
+#: src/modules/conf_theme/e_int_config_theme.c:791
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:513
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:643
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:645
 #: src/modules/gadman/e_mod_config.c:189 src/modules/syscon/e_mod_main.c:34
 #: src/modules/syscon/e_mod_main.c:38 src/modules/syscon/e_mod_main.c:55
 #: src/modules/syscon/e_mod_main.c:122
 msgid "System"
 msgstr "系統"
 
-#: src/bin/e_actions.c:2817
+#: src/bin/e_actions.c:2866
 msgid "Log Out"
 msgstr "登入"
 
-#: src/bin/e_actions.c:2821
+#: src/bin/e_actions.c:2870
 msgid "Power Off Now"
 msgstr ""
 
-#: src/bin/e_actions.c:2825
+#: src/bin/e_actions.c:2874
 msgid "Power Off"
 msgstr ""
 
-#: src/bin/e_actions.c:2829
+#: src/bin/e_actions.c:2878
 msgid "Reboot"
 msgstr "重新開機"
 
-#: src/bin/e_actions.c:2833
+#: src/bin/e_actions.c:2882
 msgid "Suspend"
 msgstr "å¾…æ©Ÿ"
 
-#: src/bin/e_actions.c:2837
+#: src/bin/e_actions.c:2886
 msgid "Hibernate"
 msgstr "休眠"
 
-#: src/bin/e_actions.c:2845
+#: src/bin/e_actions.c:2894
 #, fuzzy
 msgid "Lock"
 msgstr "鎖定值"
 
-#: src/bin/e_actions.c:2850 src/bin/e_int_menus.c:1135
+#: src/bin/e_actions.c:2899 src/bin/e_int_menus.c:1122
 msgid "Cleanup Windows"
 msgstr "排列視窗"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Generic : Actions"
 msgstr "視窗: 動作"
 
-#: src/bin/e_actions.c:2855
+#: src/bin/e_actions.c:2904
 #, fuzzy
 msgid "Delayed Action"
 msgstr "特定應用程式"
 
-#: src/bin/e_bg.c:37 src/modules/conf_wallpaper/e_mod_main.c:34
+#: src/bin/e_bg.c:38 src/modules/conf_wallpaper/e_mod_main.c:34
 msgid "Set As Background"
 msgstr "設定為桌布"
 
-#: src/bin/e_border.c:5058
+#: src/bin/e_border.c:4922
 msgid "Desktop files scan done"
 msgstr "完成 desktop 檔案掃描"
 
-#: src/bin/e_border.c:5070
+#: src/bin/e_border.c:4935
 msgid "Desktop file scan"
 msgstr "掃描 desktop 檔案"
 
@@ -663,41 +663,40 @@ msgstr "掃描 desktop 檔案"
 msgid "Color Selector"
 msgstr "Profile 選擇器"
 
-#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1849
-#: src/bin/e_config_dialog.c:257 src/bin/e_eap_editor.c:613
-#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:327
-#: src/bin/e_fm.c:8578 src/bin/e_fm.c:9216 src/bin/e_fm_prop.c:513
-#: src/bin/e_int_border_remember.c:261 src/bin/e_int_border_remember.c:342
-#: src/bin/e_int_border_remember.c:384 src/bin/e_module.c:396
-#: src/bin/e_sys.c:441 src/bin/e_sys.c:487 src/bin/e_utils.c:647
-#: src/modules/conf_dpms/e_int_config_dpms.c:64
+#: src/bin/e_color_dialog.c:48 src/bin/e_config.c:1839
+#: src/bin/e_config_dialog.c:260 src/bin/e_eap_editor.c:613
+#: src/bin/e_eap_editor.c:677 src/bin/e_entry_dialog.c:62 src/bin/e_exec.c:365
+#: src/bin/e_fm.c:8541 src/bin/e_fm.c:9179 src/bin/e_fm_prop.c:512
+#: src/bin/e_int_border_remember.c:324 src/bin/e_int_border_remember.c:524
+#: src/bin/e_module.c:403 src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_utils.c:640 src/modules/conf_dpms/e_int_config_dpms.c:64
 #: src/modules/conf_dpms/e_int_config_dpms.c:85
 #: src/modules/conf_imc/e_int_config_imc_import.c:112
 #: src/modules/conf_mime/e_int_config_mime_edit.c:283
-#: src/modules/conf_profiles/e_int_config_profiles.c:365
+#: src/modules/conf_profiles/e_int_config_profiles.c:364
 #: src/modules/conf_theme/e_int_config_theme_import.c:113
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:198
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:212
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:327
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:334
 #: src/modules/cpufreq/e_mod_main.c:389 src/modules/cpufreq/e_mod_main.c:416
 #: src/modules/cpufreq/e_mod_main.c:435 src/modules/connman/e_mod_main.c:778
 msgid "OK"
 msgstr "確定"
 
 #: src/bin/e_color_dialog.c:49 src/bin/e_eap_editor.c:615
-#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8580
-#: src/bin/e_fm_prop.c:514 src/modules/conf_imc/e_int_config_imc_import.c:116
+#: src/bin/e_eap_editor.c:679 src/bin/e_entry_dialog.c:63 src/bin/e_fm.c:8543
+#: src/bin/e_fm_prop.c:513 src/modules/conf_imc/e_int_config_imc_import.c:116
 #: src/modules/conf_mime/e_int_config_mime_edit.c:284
-#: src/modules/conf_profiles/e_int_config_profiles.c:366
+#: src/modules/conf_profiles/e_int_config_profiles.c:365
 #: src/modules/conf_theme/e_int_config_theme_import.c:117
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:199
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:216
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:331
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:338
 #: src/modules/syscon/e_syscon.c:97 src/modules/connman/e_mod_main.c:779
 msgid "Cancel"
 msgstr "取消"
 
-#: src/bin/e_config.c:758 src/bin/e_config.c:791
+#: src/bin/e_config.c:760 src/bin/e_config.c:793
 #, fuzzy
 msgid ""
 "Settings data needed upgrading. Your old settings have<br>been wiped and a "
@@ -713,7 +712,7 @@ msgstr ""
 "資料未能提供的功能。<br>新的組態會加入這些功能。您現在可以重新配置您的桌面設"
 "定。<br>抱歉打斷您的配置。<br>"
 
-#: src/bin/e_config.c:775
+#: src/bin/e_config.c:777
 #, fuzzy
 msgid ""
 "Your settings are NEWER than Enlightenment. This is very<br>strange. This "
@@ -726,12 +725,12 @@ msgstr ""
 "Enlightenment 或是從其它地方複製了新版的組態檔<br>否則這不應該發生。這是不好"
 "的,所以為防萬一,您的組態檔已被<br>恢復成預設值。很抱歉為您帶來不便。<br>"
 
-#: src/bin/e_config.c:1750
+#: src/bin/e_config.c:1740
 #, fuzzy
 msgid "Settings Upgraded"
 msgstr "桌面設定"
 
-#: src/bin/e_config.c:1773
+#: src/bin/e_config.c:1763
 #, fuzzy, c-format
 msgid ""
 "An error occured while saving Enlightenment's<br>settings to disk. The error "
@@ -741,7 +740,7 @@ msgstr ""
 "當儲存 Enlightment 設定檔時有錯誤發生。<br>錯誤原因無法確定。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1784
+#: src/bin/e_config.c:1774
 #, fuzzy, c-format
 msgid ""
 "Enlightenment's settings files are too big<br>for the file system they are "
@@ -754,7 +753,7 @@ msgstr ""
 "設定檔應該非常小。<br>請檢查您家目錄的設定。<br><br>發生錯誤的檔案為:<br>%"
 "s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1797
+#: src/bin/e_config.c:1787
 #, fuzzy, c-format
 msgid ""
 "An output error occured when writing the settings<br>files for "
@@ -765,7 +764,7 @@ msgstr ""
 "當寫入 Enlightment 設定檔時有錯誤發生。<br>您的磁碟有問題而且可能需要替換。"
 "<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1808
+#: src/bin/e_config.c:1798
 #, fuzzy, c-format
 msgid ""
 "Enlightenment cannot write its settings file<br>because it ran out of space "
@@ -777,7 +776,7 @@ msgstr ""
 "了磁碟配額。<br><br>發生錯誤的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設"
 "定。<br>"
 
-#: src/bin/e_config.c:1820
+#: src/bin/e_config.c:1810
 #, fuzzy, c-format
 msgid ""
 "Enlightenment unexpectedly had the settings file<br>it was writing closed on "
@@ -787,12 +786,12 @@ msgstr ""
 "Enlightment 要寫入的設定檔未預期的被關閉了。<br>這很不尋常。<br><br>發生錯誤"
 "的檔案為:<br>%s<br><br>此檔案已刪除以防止損壞設定。<br>"
 
-#: src/bin/e_config.c:1845
+#: src/bin/e_config.c:1835
 #, fuzzy
 msgid "Enlightenment Settings Write Problems"
 msgstr "Enlightenment 組態寫入發生問題"
 
-#: src/bin/e_config_dialog.c:205 src/modules/battery/e_mod_main.c:1091
+#: src/bin/e_config_dialog.c:208 src/modules/battery/e_mod_main.c:1094
 #: src/modules/conf_engine/e_mod_main.c:34
 #: src/modules/conf_exebuf/e_mod_main.c:34
 #: src/modules/conf_paths/e_mod_main.c:34
@@ -800,12 +799,12 @@ msgstr "Enlightenment 組態寫入發生問題"
 msgid "Advanced"
 msgstr "進階設定"
 
-#: src/bin/e_config_dialog.c:234
+#: src/bin/e_config_dialog.c:237
 msgid "Basic"
 msgstr "基本設定"
 
-#: src/bin/e_config_dialog.c:259
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:818
+#: src/bin/e_config_dialog.c:262
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:847
 msgid "Apply"
 msgstr "套用"
 
@@ -813,7 +812,7 @@ msgstr "套用"
 #: src/modules/conf_colors/e_int_config_color_classes.c:86
 #: src/modules/conf_fonts/e_int_config_fonts.c:99
 #: src/modules/conf_paths/e_int_config_paths.c:83
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:197
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:225
 msgid "Modules"
 msgstr "模組"
 
@@ -822,40 +821,40 @@ msgstr "模組"
 msgid "Extensions"
 msgstr "擴充套件"
 
-#: src/bin/e_container.c:117
+#: src/bin/e_container.c:113
 #, c-format
 msgid "Container %d"
 msgstr "容器 %d"
 
-#: src/bin/e_desklock.c:174
+#: src/bin/e_desklock.c:175
 msgid "Error - no PAM support"
 msgstr "錯誤 - 沒有 PAM 支援"
 
-#: src/bin/e_desklock.c:175
+#: src/bin/e_desklock.c:176
 msgid ""
 "No PAM support was built into Enlightenment, so<br>desk locking is disabled."
 msgstr "PAM 支援並沒有被編譯進 Enlightment,<br>所以桌面鎖定功能被停用了。"
 
-#: src/bin/e_desklock.c:241
+#: src/bin/e_desklock.c:240
 msgid "Lock Failed"
 msgstr "無法鎖定"
 
-#: src/bin/e_desklock.c:242
+#: src/bin/e_desklock.c:241
 msgid ""
 "Locking the desktop failed because some application<br>has grabbed either "
 "the keyboard or the mouse or both<br>and their grab is unable to be broken."
 msgstr ""
 "鎖定桌面失敗,因為有些應用程式正在使用鍵盤或<br>滑鼠,而他們的聯結無法打斷。"
 
-#: src/bin/e_desklock.c:333
+#: src/bin/e_desklock.c:325
 msgid "Please enter your unlock password"
 msgstr "請輸入您的解鎖密碼"
 
-#: src/bin/e_desklock.c:709
+#: src/bin/e_desklock.c:689
 msgid "Authentication System Error"
 msgstr "認證系統錯誤"
 
-#: src/bin/e_desklock.c:710
+#: src/bin/e_desklock.c:690
 #, c-format
 msgid ""
 "Authentication via PAM had errors setting up the<br>authentication session. "
@@ -865,22 +864,22 @@ msgstr ""
 "PAM 認證階段設定失敗。<br>錯誤代碼為 <hilight>%i</hilight>。<br>這很糟糕而且"
 "不應該發生,請回報這個錯誤。"
 
-#: src/bin/e_desklock.c:1036 src/bin/e_screensaver.c:95
+#: src/bin/e_desklock.c:1016 src/bin/e_screensaver.c:95
 msgid "Activate Presentation Mode?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1040
+#: src/bin/e_desklock.c:1020
 msgid ""
 "You unlocked desktop too fast.<br><br>Would you like to enable "
 "<b>presentation</b> mode and temporarily disable screen saver, lock and "
 "power saving?"
 msgstr ""
 
-#: src/bin/e_desklock.c:1051 src/bin/e_screensaver.c:110
+#: src/bin/e_desklock.c:1031 src/bin/e_screensaver.c:110
 msgid "No, but increase timeout"
 msgstr ""
 
-#: src/bin/e_desklock.c:1054 src/bin/e_screensaver.c:113
+#: src/bin/e_desklock.c:1034 src/bin/e_screensaver.c:113
 msgid "No, and stop asking"
 msgstr ""
 
@@ -904,7 +903,7 @@ msgstr ""
 msgid "Desktop Entry Editor"
 msgstr "Desktop Entry 編輯器"
 
-#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:400
+#: src/bin/e_eap_editor.c:461 src/bin/e_fm_prop.c:399
 #: src/modules/conf_fonts/e_int_config_fonts.c:96
 #: src/modules/conf_mime/e_int_config_mime_edit.c:145
 msgid "Icon"
@@ -950,7 +949,7 @@ msgstr "類別"
 msgid "Mime Types"
 msgstr "檔案類型"
 
-#: src/bin/e_eap_editor.c:534
+#: src/bin/e_eap_editor.c:534 src/bin/e_int_border_remember.c:751
 #, fuzzy
 msgid "Options"
 msgstr "填滿選項"
@@ -983,23 +982,23 @@ msgstr "選擇圖示"
 msgid "Select an Executable"
 msgstr "選擇一個執行檔"
 
-#: src/bin/e_entry.c:493 src/bin/e_fm.c:8080
+#: src/bin/e_entry.c:493 src/bin/e_fm.c:8043
 #: src/modules/conf_applications/e_int_config_apps.c:269
-#: src/modules/conf_profiles/e_int_config_profiles.c:123
+#: src/modules/conf_profiles/e_int_config_profiles.c:122
 #: src/modules/conf_shelves/e_int_config_shelf.c:81
 #: src/modules/ibar/e_mod_config.c:112
 msgid "Delete"
 msgstr "刪除"
 
-#: src/bin/e_entry.c:503 src/bin/e_fm.c:7987
+#: src/bin/e_entry.c:503 src/bin/e_fm.c:7950
 msgid "Cut"
 msgstr "剪下"
 
-#: src/bin/e_entry.c:511 src/bin/e_fm.c:6101 src/bin/e_fm.c:8001
+#: src/bin/e_entry.c:511 src/bin/e_fm.c:6075 src/bin/e_fm.c:7964
 msgid "Copy"
 msgstr "複製"
 
-#: src/bin/e_entry.c:519 src/bin/e_fm.c:7826 src/bin/e_fm.c:8014
+#: src/bin/e_entry.c:519 src/bin/e_fm.c:7789 src/bin/e_fm.c:7977
 msgid "Paste"
 msgstr "貼上"
 
@@ -1007,345 +1006,345 @@ msgstr "貼上"
 msgid "Select All"
 msgstr "全選"
 
-#: src/bin/e_exec.c:221 src/bin/e_utils.c:201
+#: src/bin/e_exec.c:225 src/bin/e_utils.c:200
 #: src/modules/conf_imc/e_int_config_imc.c:278
 #: src/modules/conf_imc/e_int_config_imc.c:518
 msgid "Run Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_exec.c:222 src/bin/e_utils.c:202
+#: src/bin/e_exec.c:226 src/bin/e_utils.c:201
 #: src/modules/conf_imc/e_int_config_imc.c:279
 #: src/modules/conf_imc/e_int_config_imc.c:519
 #, 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:318
+#: src/bin/e_exec.c:356
 msgid "Application run error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:320
+#: src/bin/e_exec.c:358
 #, 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:421
+#: src/bin/e_exec.c:454
 msgid "Application Execution Error"
 msgstr "應用程式執行錯誤"
 
-#: src/bin/e_exec.c:433
+#: src/bin/e_exec.c:466
 #, c-format
 msgid "%s stopped running unexpectedly."
 msgstr "%s 無預警地停止執行。"
 
-#: src/bin/e_exec.c:439
+#: src/bin/e_exec.c:472
 #, c-format
 msgid "An exit code of %i was returned from %s."
 msgstr "錯誤代碼 %i 被 %s 傳回。"
 
-#: src/bin/e_exec.c:447
+#: src/bin/e_exec.c:480
 #, c-format
 msgid "%s was interrupted by an Interrupt Signal."
 msgstr "%s 被 Interrupt Signal 中斷。"
 
-#: src/bin/e_exec.c:450
+#: src/bin/e_exec.c:483
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
 msgstr "%s 被 Quit Signal 中斷。"
 
-#: src/bin/e_exec.c:454
+#: src/bin/e_exec.c:487
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
 msgstr "%s 被 Abort Signal 中斷。"
 
-#: src/bin/e_exec.c:457
+#: src/bin/e_exec.c:490
 #, c-format
 msgid "%s was interrupted by a Floating Point Error."
 msgstr "%s 被 FPE Signal 中斷。"
 
-#: src/bin/e_exec.c:461
+#: src/bin/e_exec.c:494
 #, c-format
 msgid "%s was interrupted by an Uninterruptable Kill Signal."
 msgstr "%s 被 Kill Signal 中斷。"
 
-#: src/bin/e_exec.c:465
+#: src/bin/e_exec.c:498
 #, c-format
 msgid "%s was interrupted by a Segmentation Fault."
 msgstr "%s 被 Segmentation Fault 中斷。"
 
-#: src/bin/e_exec.c:469
+#: src/bin/e_exec.c:502
 #, c-format
 msgid "%s was interrupted by a Broken Pipe."
 msgstr "%s 被 Broken Pipe 中斷。"
 
-#: src/bin/e_exec.c:472
+#: src/bin/e_exec.c:505
 #, c-format
 msgid "%s was interrupted by a Termination Signal."
 msgstr "%s 被 Terminal Signal 中斷。"
 
-#: src/bin/e_exec.c:476
+#: src/bin/e_exec.c:509
 #, c-format
 msgid "%s was interrupted by a Bus Error."
 msgstr "%s 被 Bus Error 中斷。"
 
-#: src/bin/e_exec.c:479
+#: src/bin/e_exec.c:512
 #, c-format
 msgid "%s was interrupted by the signal number %i."
 msgstr "%s 被 Signal %i 中斷。"
 
-#: src/bin/e_exec.c:535
+#: src/bin/e_exec.c:568
 msgid ""
 "***The remaining output has been truncated. Save the output to view.***\n"
 msgstr "*** 剩下的輸出被刪節了。儲存輸出以供檢視。***\n"
 
-#: src/bin/e_exec.c:597 src/bin/e_exec.c:671 src/bin/e_exec.c:678
+#: src/bin/e_exec.c:630 src/bin/e_exec.c:704 src/bin/e_exec.c:711
 msgid "Error Logs"
 msgstr "錯誤紀錄檔"
 
-#: src/bin/e_exec.c:603 src/bin/e_exec.c:679
+#: src/bin/e_exec.c:636 src/bin/e_exec.c:712
 msgid "There was no error message."
 msgstr "沒有錯誤訊息。"
 
-#: src/bin/e_exec.c:607 src/bin/e_exec.c:686
+#: src/bin/e_exec.c:640 src/bin/e_exec.c:719
 msgid "Save This Message"
 msgstr "儲存訊息"
 
-#: src/bin/e_exec.c:611 src/bin/e_exec.c:690
+#: src/bin/e_exec.c:644 src/bin/e_exec.c:723
 #, c-format
 msgid "This error log will be saved as %s/%s.log"
 msgstr "錯誤紀錄檔已被儲存到 %s/%s.log"
 
-#: src/bin/e_exec.c:637
+#: src/bin/e_exec.c:670
 msgid "Error Information"
 msgstr "錯誤資訊"
 
-#: src/bin/e_exec.c:645
+#: src/bin/e_exec.c:678
 msgid "Error Signal Information"
 msgstr "錯誤 Signal 資訊"
 
-#: src/bin/e_exec.c:655 src/bin/e_exec.c:662
+#: src/bin/e_exec.c:688 src/bin/e_exec.c:695
 msgid "Output Data"
 msgstr "輸出資料"
 
-#: src/bin/e_exec.c:663
+#: src/bin/e_exec.c:696
 msgid "There was no output."
 msgstr "沒有輸入。"
 
-#: src/bin/e_fm.c:941
+#: src/bin/e_fm.c:945
 #, fuzzy
 msgid "Nonexistent path"
 msgstr "不存在的路徑"
 
-#: src/bin/e_fm.c:945
+#: src/bin/e_fm.c:949
 #, fuzzy, c-format
 msgid "%s doesn't exist."
 msgstr "不存在 %s"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 #, fuzzy
 msgid "Mount Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_fm.c:3039
+#: src/bin/e_fm.c:3017
 msgid "Can't mount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 #, fuzzy
 msgid "Unmount Error"
 msgstr "執行錯誤"
 
-#: src/bin/e_fm.c:3055
+#: src/bin/e_fm.c:3033
 msgid "Can't unmount device"
 msgstr ""
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 #, fuzzy
 msgid "Eject Error"
 msgstr "執行時錯誤"
 
-#: src/bin/e_fm.c:3070
+#: src/bin/e_fm.c:3048
 msgid "Can't eject device"
 msgstr ""
 
-#: src/bin/e_fm.c:3708
+#: src/bin/e_fm.c:3685
 #, c-format
 msgid "%i Files"
 msgstr "%i 筆檔案"
 
-#: src/bin/e_fm.c:6114 src/bin/e_fm.c:7834 src/bin/e_fm.c:8022
+#: src/bin/e_fm.c:6088 src/bin/e_fm.c:7797 src/bin/e_fm.c:7985
 #, fuzzy
 msgid "Link"
 msgstr "線性"
 
-#: src/bin/e_fm.c:6122 src/bin/e_fm.c:9001 src/bin/e_fm.c:9139
+#: src/bin/e_fm.c:6096 src/bin/e_fm.c:8964 src/bin/e_fm.c:9102
 #, fuzzy
 msgid "Abort"
 msgstr "關於"
 
-#: src/bin/e_fm.c:7753 src/bin/e_fm.c:7913
+#: src/bin/e_fm.c:7716 src/bin/e_fm.c:7876
 #, fuzzy
 msgid "Inherit parent settings"
 msgstr "選取設定"
 
-#: src/bin/e_fm.c:7762 src/bin/e_fm.c:7922
+#: src/bin/e_fm.c:7725 src/bin/e_fm.c:7885
 #: src/modules/fileman/e_mod_config.c:208
 msgid "View Mode"
 msgstr "顯式模式"
 
-#: src/bin/e_fm.c:7769 src/bin/e_fm.c:7929
+#: src/bin/e_fm.c:7732 src/bin/e_fm.c:7892
 msgid "Refresh View"
 msgstr "重新整理"
 
-#: src/bin/e_fm.c:7777 src/bin/e_fm.c:7937
+#: src/bin/e_fm.c:7740 src/bin/e_fm.c:7900
 msgid "Show Hidden Files"
 msgstr "顯示隱藏的檔案"
 
-#: src/bin/e_fm.c:7789 src/bin/e_fm.c:7949
+#: src/bin/e_fm.c:7752 src/bin/e_fm.c:7912
 msgid "Remember Ordering"
 msgstr "記住順序"
 
-#: src/bin/e_fm.c:7798 src/bin/e_fm.c:7958
+#: src/bin/e_fm.c:7761 src/bin/e_fm.c:7921
 msgid "Sort Now"
 msgstr "排列檔案"
 
-#: src/bin/e_fm.c:7810 src/bin/e_fm.c:7973
+#: src/bin/e_fm.c:7773 src/bin/e_fm.c:7936
 #: src/modules/conf_paths/e_int_config_paths.c:208
 msgid "New Directory"
 msgstr "新目錄"
 
-#: src/bin/e_fm.c:8088
+#: src/bin/e_fm.c:8051
 msgid "Rename"
 msgstr "重新命名"
 
-#: src/bin/e_fm.c:8107
+#: src/bin/e_fm.c:8070
 msgid "Unmount"
 msgstr ""
 
-#: src/bin/e_fm.c:8112
+#: src/bin/e_fm.c:8075
 #, fuzzy
 msgid "Mount"
 msgstr "選單項目"
 
-#: src/bin/e_fm.c:8117
+#: src/bin/e_fm.c:8080
 msgid "Eject"
 msgstr ""
 
-#: src/bin/e_fm.c:8127
+#: src/bin/e_fm.c:8090
 msgid "Properties"
 msgstr "屬性"
 
-#: src/bin/e_fm.c:8362 src/bin/e_fm.c:8415
+#: src/bin/e_fm.c:8325 src/bin/e_fm.c:8378
 #, fuzzy
 msgid "Use default"
 msgstr "使用預設值"
 
-#: src/bin/e_fm.c:8388 src/modules/fileman/e_mod_config.c:213
+#: src/bin/e_fm.c:8351 src/modules/fileman/e_mod_config.c:213
 msgid "Grid Icons"
 msgstr "對齊圖示"
 
-#: src/bin/e_fm.c:8396 src/modules/fileman/e_mod_config.c:215
+#: src/bin/e_fm.c:8359 src/modules/fileman/e_mod_config.c:215
 msgid "Custom Icons"
 msgstr "自訂圖示"
 
-#: src/bin/e_fm.c:8404 src/modules/fileman/e_mod_config.c:223
+#: src/bin/e_fm.c:8367 src/modules/fileman/e_mod_config.c:223
 msgid "List"
 msgstr "列表"
 
-#: src/bin/e_fm.c:8429
+#: src/bin/e_fm.c:8392
 #, fuzzy, c-format
 msgid "Icon Size (%d)"
 msgstr "圖示大小"
 
-#: src/bin/e_fm.c:8475 src/bin/e_fm.c:8681
+#: src/bin/e_fm.c:8438 src/bin/e_fm.c:8644
 #, fuzzy
 msgid "Set background..."
 msgstr "設定為桌布"
 
-#: src/bin/e_fm.c:8480 src/bin/e_fm.c:8724
+#: src/bin/e_fm.c:8443 src/bin/e_fm.c:8687
 #, fuzzy
 msgid "Set overlay..."
 msgstr "置物架內容物"
 
-#: src/bin/e_fm.c:8579 src/modules/conf_theme/e_int_config_theme.c:1025
+#: src/bin/e_fm.c:8542 src/modules/conf_theme/e_int_config_theme.c:1022
 msgid "Clear"
 msgstr "清除"
 
-#: src/bin/e_fm.c:8803
+#: src/bin/e_fm.c:8766
 msgid "Create a new Directory"
 msgstr "建立新目錄"
 
-#: src/bin/e_fm.c:8804
+#: src/bin/e_fm.c:8767
 msgid "New Directory Name:"
 msgstr "新目錄名稱"
 
-#: src/bin/e_fm.c:8858
+#: src/bin/e_fm.c:8821
 #, c-format
 msgid "Rename %s to:"
 msgstr "重新命名 %s 成:"
 
-#: src/bin/e_fm.c:8860
+#: src/bin/e_fm.c:8823
 msgid "Rename File"
 msgstr "重新命名檔案"
 
-#: src/bin/e_fm.c:9000 src/bin/e_fm.c:9138
+#: src/bin/e_fm.c:8963 src/bin/e_fm.c:9101
 #, fuzzy
 msgid "Retry"
 msgstr "重新啟動"
 
-#: src/bin/e_fm.c:9004 src/bin/e_fm.c:9144 src/modules/wizard/page_030.c:83
+#: src/bin/e_fm.c:8967 src/bin/e_fm.c:9107 src/modules/wizard/page_030.c:85
 #, fuzzy
 msgid "Error"
 msgstr "執行時錯誤"
 
-#: src/bin/e_fm.c:9007
+#: src/bin/e_fm.c:8970
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9059
+#: src/bin/e_fm.c:9022
 msgid "No to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9061
+#: src/bin/e_fm.c:9024
 msgid "Yes to all"
 msgstr ""
 
-#: src/bin/e_fm.c:9064
+#: src/bin/e_fm.c:9027
 #, fuzzy
 msgid "Warning"
 msgstr "正在啟動"
 
-#: src/bin/e_fm.c:9067
+#: src/bin/e_fm.c:9030
 #, fuzzy, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9140
+#: src/bin/e_fm.c:9103
 msgid "Ignore this"
 msgstr ""
 
-#: src/bin/e_fm.c:9141
+#: src/bin/e_fm.c:9104
 msgid "Ignore all"
 msgstr ""
 
-#: src/bin/e_fm.c:9146
+#: src/bin/e_fm.c:9109
 #, c-format
 msgid "An error occured while performing an operation.<br>%s"
 msgstr ""
 
-#: src/bin/e_fm.c:9292
+#: src/bin/e_fm.c:9255
 msgid "Confirm Delete"
 msgstr "確定刪除"
 
-#: src/bin/e_fm.c:9297
+#: src/bin/e_fm.c:9260
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight> ?"
 msgstr "您是否確定刪除<br><hilight>%s</hilight>?"
 
-#: src/bin/e_fm.c:9303
+#: src/bin/e_fm.c:9266
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected files in:<br><hilight>%s</"
@@ -1357,144 +1356,149 @@ msgstr ""
 msgid "File Properties"
 msgstr "檔案屬性"
 
-#: src/bin/e_fm_prop.c:338
+#: src/bin/e_fm_prop.c:337
 msgid "File:"
 msgstr "檔案:"
 
-#: src/bin/e_fm_prop.c:345 src/bin/e_widget_fsel.c:328
+#: src/bin/e_fm_prop.c:344 src/bin/e_widget_fsel.c:327
 msgid "Size:"
 msgstr "大小:"
 
-#: src/bin/e_fm_prop.c:352
+#: src/bin/e_fm_prop.c:351
 msgid "Last Modified:"
 msgstr "修改日期:"
 
-#: src/bin/e_fm_prop.c:359
+#: src/bin/e_fm_prop.c:358
 msgid "File Type:"
 msgstr "檔案類型:"
 
-#: src/bin/e_fm_prop.c:366
+#: src/bin/e_fm_prop.c:365
 msgid "Permissions"
 msgstr "權限"
 
-#: src/bin/e_fm_prop.c:367 src/bin/e_widget_fsel.c:344
+#: src/bin/e_fm_prop.c:366 src/bin/e_widget_fsel.c:343
 msgid "Owner:"
 msgstr "擁有者:"
 
-#: src/bin/e_fm_prop.c:373
+#: src/bin/e_fm_prop.c:372
 msgid "Others can read"
 msgstr "其他人可以讀取"
 
-#: src/bin/e_fm_prop.c:375
+#: src/bin/e_fm_prop.c:374
 msgid "Others can write"
 msgstr "其他人可以寫入"
 
-#: src/bin/e_fm_prop.c:377
+#: src/bin/e_fm_prop.c:376
 msgid "Owner can read"
 msgstr "擁有者可以讀取"
 
-#: src/bin/e_fm_prop.c:379
+#: src/bin/e_fm_prop.c:378
 msgid "Owner can write"
 msgstr "擁有者可以寫入"
 
-#: src/bin/e_fm_prop.c:385 src/bin/e_widget_fsel.c:307
-#: src/modules/conf_theme/e_int_config_theme.c:1033
+#: src/bin/e_fm_prop.c:384 src/bin/e_widget_fsel.c:306
+#: src/modules/conf_theme/e_int_config_theme.c:1030
 #: src/modules/conf_transitions/e_int_config_transitions.c:167
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:154
 msgid "Preview"
 msgstr "預覽"
 
-#: src/bin/e_fm_prop.c:432
+#: src/bin/e_fm_prop.c:431
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:218
 #: src/modules/conf_screensaver/e_int_config_screensaver.c:231
 msgid "Default"
 msgstr "預設值"
 
-#: src/bin/e_fm_prop.c:435
+#: src/bin/e_fm_prop.c:434
 msgid "Thumbnail"
 msgstr "縮圖"
 
-#: src/bin/e_fm_prop.c:438
+#: src/bin/e_fm_prop.c:437
 #: src/modules/conf_desklock/e_int_config_desklock.c:425
 msgid "Custom"
 msgstr "自訂"
 
-#: src/bin/e_fm_prop.c:448
+#: src/bin/e_fm_prop.c:447
 msgid "Use this icon for all files of this type"
 msgstr "所有同類型的檔案都使用此圖示"
 
-#: src/bin/e_fm_prop.c:456
+#: src/bin/e_fm_prop.c:455
 msgid "Link Information"
 msgstr "Link 資訊"
 
-#: src/bin/e_fm_prop.c:502 src/modules/conf_mime/e_int_config_mime_edit.c:272
+#: src/bin/e_fm_prop.c:501 src/modules/conf_mime/e_int_config_mime_edit.c:272
 msgid "Select an Image"
 msgstr "選擇一張圖片"
 
-#: src/bin/e_fm_hal.c:189
+#: src/bin/e_fm_hal.c:183
 #, c-format
 msgid "%llu TiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:191
+#: src/bin/e_fm_hal.c:185
 #, c-format
 msgid "%llu GiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:193
+#: src/bin/e_fm_hal.c:187
 #, c-format
 msgid "%llu MiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:195
+#: src/bin/e_fm_hal.c:189
 #, c-format
 msgid "%llu KiB"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:197
+#: src/bin/e_fm_hal.c:191
 #, c-format
 msgid "%llu B"
 msgstr ""
 
-#: src/bin/e_fm_hal.c:228
+#: src/bin/e_fm_hal.c:222
 #, fuzzy, c-format
 msgid "Unknown Volume"
 msgstr "末知"
 
-#: src/bin/e_fm_hal.c:322
+#: src/bin/e_fm_hal.c:320
 msgid "Removable Device"
 msgstr ""
 
-#: src/bin/e_gadcon.c:1290 src/modules/gadman/e_mod_gadman.c:683
+#: src/bin/e_gadcon.c:1339
+#, fuzzy
+msgid "Move this gadget to"
+msgstr "移除這個小工具"
+
+#: src/bin/e_gadcon.c:1359 src/modules/gadman/e_mod_gadman.c:703
 msgid "Plain"
 msgstr "一般"
 
-#: src/bin/e_gadcon.c:1299 src/modules/gadman/e_mod_gadman.c:691
+#: src/bin/e_gadcon.c:1368 src/modules/gadman/e_mod_gadman.c:711
 msgid "Inset"
 msgstr "嵌入"
 
-#: src/bin/e_gadcon.c:1308 src/bin/e_int_config_modules.c:41
-#: src/modules/gadman/e_mod_gadman.c:727
+#: src/bin/e_gadcon.c:1377 src/bin/e_int_config_modules.c:41
+#: src/modules/gadman/e_mod_gadman.c:747
 msgid "Appearance"
 msgstr "外觀"
 
-#: src/bin/e_gadcon.c:1316
+#: src/bin/e_gadcon.c:1385
 msgid "Automatically scroll contents"
 msgstr "自動捲動內容"
 
-#: src/bin/e_gadcon.c:1323
+#: src/bin/e_gadcon.c:1392
 msgid "Able to be resized"
 msgstr "可改變大小"
 
-#: src/bin/e_gadcon.c:1335 src/modules/gadman/e_mod_gadman.c:762
+#: src/bin/e_gadcon.c:1404 src/modules/gadman/e_mod_gadman.c:782
 msgid "Begin move/resize this gadget"
 msgstr "開始移動或改變這個小工具大小"
 
-#: src/bin/e_gadcon.c:1341 src/modules/gadman/e_mod_gadman.c:768
+#: src/bin/e_gadcon.c:1412 src/modules/gadman/e_mod_gadman.c:790
 msgid "Remove this gadget"
 msgstr "移除這個小工具"
 
-#: src/bin/e_gadcon.c:1814
+#: src/bin/e_gadcon.c:1891
 msgid "Stop move/resize this gadget"
 msgstr "停止移動或改變這個小工具大小"
 
@@ -1504,7 +1508,7 @@ msgid ""
 "on this screen. Aborting startup.\n"
 msgstr "另一份 Enlightment 正在執行,無法啟動新的。\n"
 
-#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:565
+#: src/bin/e_int_border_locks.c:67 src/bin/e_int_border_menu.c:571
 msgid "Window Locks"
 msgstr "視窗鎖定"
 
@@ -1538,21 +1542,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:511
+#: src/bin/e_int_border_remember.c:702
 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:513 src/bin/e_int_shelf_config.c:536
-#: src/bin/e_int_shelf_config.c:640
-#: src/modules/conf_fonts/e_int_config_fonts.c:443
+#: src/bin/e_int_border_remember.c:705 src/bin/e_int_shelf_config.c:599
+#: src/bin/e_int_shelf_config.c:704
+#: src/modules/conf_fonts/e_int_config_fonts.c:442
 #: src/modules/conf_fonts/e_int_config_fonts.c:637
 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:537 src/bin/e_int_border_prop.c:469
-#: src/bin/e_int_border_remember.c:515 src/bin/e_int_shelf_config.c:575
+#: src/bin/e_int_border_menu.c:543 src/bin/e_int_border_prop.c:469
+#: src/bin/e_int_border_remember.c:708 src/bin/e_int_shelf_config.c:639
 msgid "Stacking"
 msgstr "堆疊"
 
@@ -1561,12 +1565,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:523
+#: src/bin/e_int_border_remember.c:720
 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:527
+#: src/bin/e_int_border_remember.c:726
 msgid "Shaded state"
 msgstr "捲起狀態"
 
@@ -1575,7 +1579,7 @@ msgid "Maximized state"
 msgstr "最大化狀態"
 
 #: src/bin/e_int_border_locks.c:323 src/bin/e_int_border_locks.c:342
-#: src/bin/e_int_border_remember.c:529
+#: src/bin/e_int_border_remember.c:729
 msgid "Fullscreen state"
 msgstr "全螢幕狀態"
 
@@ -1583,7 +1587,7 @@ msgstr "全螢幕狀態"
 msgid "Lock me from changing:"
 msgstr "鎖住我改變:"
 
-#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:519
+#: src/bin/e_int_border_locks.c:344 src/bin/e_int_border_remember.c:714
 msgid "Border style"
 msgstr "邊框樣式"
 
@@ -1633,118 +1637,119 @@ msgstr "解除固定於桌面"
 msgid "More..."
 msgstr "匯入..."
 
-#: src/bin/e_int_border_menu.c:165
+#: src/bin/e_int_border_menu.c:171
 msgid "Iconify"
 msgstr "圖示化"
 
-#: src/bin/e_int_border_menu.c:362
+#: src/bin/e_int_border_menu.c:368
 msgid "Maximize vertically"
 msgstr "垂直最大化"
 
-#: src/bin/e_int_border_menu.c:373
+#: src/bin/e_int_border_menu.c:379
 msgid "Maximize horizontally"
 msgstr "水平最大化"
 
-#: src/bin/e_int_border_menu.c:384
+#: src/bin/e_int_border_menu.c:390
 msgid "Unmaximize"
 msgstr "解除最大化"
 
-#: src/bin/e_int_border_menu.c:485
+#: src/bin/e_int_border_menu.c:491
 #, fuzzy
 msgid "Keyboard Shortcut"
 msgstr "新增鍵盤快速鍵"
 
-#: src/bin/e_int_border_menu.c:491
+#: src/bin/e_int_border_menu.c:497
 #, fuzzy
 msgid "To Favorites Menu"
 msgstr "「我的最愛」選單"
 
-#: src/bin/e_int_border_menu.c:496
+#: src/bin/e_int_border_menu.c:502
 #, fuzzy
 msgid "To Launcher"
 msgstr "加入到 IBar"
 
-#: src/bin/e_int_border_menu.c:518 src/modules/conf_borders/e_mod_main.c:37
+#: src/bin/e_int_border_menu.c:524 src/modules/conf_borders/e_mod_main.c:37
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:321
 msgid "Border"
 msgstr "邊框"
 
-#: src/bin/e_int_border_menu.c:527
+#: src/bin/e_int_border_menu.c:533
 msgid "Skip"
 msgstr "略過"
 
-#: src/bin/e_int_border_menu.c:546 src/bin/e_int_border_prop.c:433
+#: src/bin/e_int_border_menu.c:552 src/bin/e_int_border_prop.c:433
 #: src/modules/conf_colors/e_int_config_color_classes.c:514
 msgid "State"
 msgstr "狀態"
 
-#: src/bin/e_int_border_menu.c:557
+#: src/bin/e_int_border_menu.c:563
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:115
 msgid "Remember"
 msgstr "記住"
 
-#: src/bin/e_int_border_menu.c:573 src/bin/e_int_border_prop.c:75
+#: src/bin/e_int_border_menu.c:579 src/bin/e_int_border_prop.c:75
 msgid "Window Properties"
 msgstr "視窗屬性"
 
-#: src/bin/e_int_border_menu.c:808
+#: src/bin/e_int_border_menu.c:814
 msgid "Always On Top"
 msgstr "最上層顯示"
 
-#: src/bin/e_int_border_menu.c:819
+#: src/bin/e_int_border_menu.c:825
 #: 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:260
 msgid "Normal"
 msgstr "正常"
 
-#: src/bin/e_int_border_menu.c:830
+#: src/bin/e_int_border_menu.c:836
 msgid "Always Below"
 msgstr "最下層顯示"
 
-#: src/bin/e_int_border_menu.c:922
+#: src/bin/e_int_border_menu.c:928
 msgid "Select Border Style"
 msgstr "選擇邊框樣式"
 
-#: src/bin/e_int_border_menu.c:934
+#: src/bin/e_int_border_menu.c:940
 msgid "Use E17 Default Icon Preference"
 msgstr "使用 E17 預設圖示偏好"
 
-#: src/bin/e_int_border_menu.c:943
+#: src/bin/e_int_border_menu.c:949
 msgid "Use Application Provided Icon "
 msgstr "使用應用程式圖示"
 
-#: src/bin/e_int_border_menu.c:951
+#: src/bin/e_int_border_menu.c:957
 msgid "Use User Defined Icon"
 msgstr "使用使用者自訂圖示"
 
-#: src/bin/e_int_border_menu.c:1012 src/bin/e_int_border_prop.c:473
+#: src/bin/e_int_border_menu.c:1018 src/bin/e_int_border_prop.c:473
 msgid "Shaded"
 msgstr "捲起"
 
-#: src/bin/e_int_border_menu.c:1025 src/bin/e_int_border_prop.c:472
+#: src/bin/e_int_border_menu.c:1031 src/bin/e_int_border_prop.c:472
 msgid "Sticky"
 msgstr "相黏"
 
-#: src/bin/e_int_border_menu.c:1038 src/bin/e_int_border_prop.c:477
+#: src/bin/e_int_border_menu.c:1047 src/bin/e_int_border_prop.c:477
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:117
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:140
 msgid "Fullscreen"
 msgstr "全螢幕"
 
-#: src/bin/e_int_border_menu.c:1063 src/modules/conf_winlist/e_mod_main.c:35
+#: src/bin/e_int_border_menu.c:1072 src/modules/conf_winlist/e_mod_main.c:35
 msgid "Window List"
 msgstr "視窗列表"
 
-#: src/bin/e_int_border_menu.c:1073 src/modules/pager/e_mod_main.c:261
-#: src/modules/pager/e_mod_main.c:2837 src/modules/pager/e_mod_main.c:2844
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2853
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2857
-#: src/modules/pager/e_mod_main.c:2890 src/modules/pager/e_mod_main.c:2891
-#: src/modules/pager/e_mod_main.c:2892 src/modules/pager/e_mod_main.c:2893
+#: src/bin/e_int_border_menu.c:1082 src/modules/pager/e_mod_main.c:261
+#: src/modules/pager/e_mod_main.c:2843 src/modules/pager/e_mod_main.c:2850
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2859
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2863
+#: src/modules/pager/e_mod_main.c:2896 src/modules/pager/e_mod_main.c:2897
+#: src/modules/pager/e_mod_main.c:2898 src/modules/pager/e_mod_main.c:2899
 msgid "Pager"
 msgstr "桌面切換器"
 
-#: src/bin/e_int_border_menu.c:1083
+#: src/bin/e_int_border_menu.c:1092
 #, fuzzy
 msgid "Taskbar"
 msgstr "略過工作列"
@@ -1761,7 +1766,7 @@ msgstr "ICCCM"
 msgid "ICCCM Properties"
 msgstr "ICCCM 屬性"
 
-#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:480
+#: src/bin/e_int_border_prop.c:419 src/bin/e_int_border_remember.c:662
 msgid "Title"
 msgstr "標題"
 
@@ -1853,11 +1858,11 @@ msgstr "NetWM 屬性"
 msgid "Modal"
 msgstr ""
 
-#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:537
+#: src/bin/e_int_border_prop.c:474 src/bin/e_int_border_remember.c:741
 msgid "Skip Taskbar"
 msgstr "略過工作列"
 
-#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:535
+#: src/bin/e_int_border_prop.c:475 src/bin/e_int_border_remember.c:738
 msgid "Skip Pager"
 msgstr "略過桌面切換器"
 
@@ -1865,15 +1870,15 @@ msgstr "略過桌面切換器"
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/bin/e_int_border_remember.c:75
+#: src/bin/e_int_border_remember.c:85
 msgid "Window Remember"
 msgstr "記住視窗"
 
-#: src/bin/e_int_border_remember.c:244
+#: src/bin/e_int_border_remember.c:307
 msgid "Window properties are not a unique match"
 msgstr "視窗比對屬性並不唯一"
 
-#: src/bin/e_int_border_remember.c:247
+#: src/bin/e_int_border_remember.c:310
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
 "as size, location, border style etc.) to<br>a window that <hilight>does not "
@@ -1893,11 +1898,11 @@ msgstr ""
 "是,<br>你只需按下<hilight>套用</hilight>或者<hilight>確定</hilight>則你的設"
 "定就會被接受。<br>如果你不確定,按下<hilight>取消</hilight>就全無影響。"
 
-#: src/bin/e_int_border_remember.c:333 src/bin/e_int_border_remember.c:363
+#: src/bin/e_int_border_remember.c:515
 msgid "No match properties set"
 msgstr "未設定比對屬性"
 
-#: src/bin/e_int_border_remember.c:336
+#: src/bin/e_int_border_remember.c:518
 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 "
@@ -1908,110 +1913,105 @@ msgstr ""
 "視窗,卻<hilight>沒有指定如何記住</hilight>他們。<br><br>你必須至少指定一種的"
 "方法來記下此視窗。"
 
-#: src/bin/e_int_border_remember.c:366
-msgid ""
-"You are trying to ask Enlightenment to remember to apply<br>properties (such "
-"as size, location, border style etc.) to<br>a window that <hilight>does not "
-"have unique properties</hilight>.<br><br>This means it shares Name/Class, "
-"Transience, Role etc. properties<br>with more than 1 other window on the "
-"screen and remembering<br>properties for this window will apply to all other "
-"windows<br>that match these properties.<br><br>You may wish to enable the "
-"<hilight>Match only one window</hilight> option if<br>you only intend one "
-"instance of this window to be modified, with<br>additional instances not "
-"being modified.<br><br>This is just a warning in case you did not intend "
-"this to happen.<br>If you did, simply press <hilight>Apply</hilight> or "
-"<hilight>OK</hilight> buttons<br>and your settings will be accepted. Press "
-"<hilight>Cancel</hilight> if you<br>are not sure and nothing will be "
-"affected."
-msgstr ""
-"您正嘗試要 Enlightment 套用屬性<br>(例如大小、位置、邊界樣式等等)<br>到一個"
-"<hilight>沒有獨立屬性</hilight>的視窗。<br><br>這表示它與一個以上螢幕上的視窗"
-"分享名稱/類別,Transience,<br>角色等等屬性,而此一視窗的設定會套用到所有符合"
-"這些屬性的視窗上。<br><br>你也許會想開啟<hilight>只匹配單一視窗</hilight>的選"
-"項,<br>如果你這只希望這個視窗被改變。<br><br>這只是個警告,以防這並不是您預"
-"期的行為。如果這的確是,<br>你只需按下<hilight>套用</hilight>或者<hilight>確"
-"定</hilight>則你的設定就會被接受。<br>如果你不確定,按下<hilight>取消</"
-"hilight>就全無影響。"
-
-#: src/bin/e_int_border_remember.c:443
+#: src/bin/e_int_border_remember.c:614
 msgid "Nothing"
 msgstr "ç„¡"
 
-#: src/bin/e_int_border_remember.c:445
+#: src/bin/e_int_border_remember.c:616
 msgid "Size and Position"
 msgstr "大小與位置"
 
-#: src/bin/e_int_border_remember.c:447 src/bin/e_int_border_remember.c:517
+#: src/bin/e_int_border_remember.c:618 src/bin/e_int_border_remember.c:711
 msgid "Locks"
 msgstr "鎖定值"
 
-#: src/bin/e_int_border_remember.c:449
+#: src/bin/e_int_border_remember.c:620
 msgid "Size, Position and Locks"
 msgstr "大小、位置與鎖定值"
 
-#: src/bin/e_int_border_remember.c:451
+#: src/bin/e_int_border_remember.c:622
 msgid "Everything"
 msgstr "全部"
 
-#: src/bin/e_int_border_remember.c:464
+#: src/bin/e_int_border_remember.c:635
 msgid "Remember using"
 msgstr "使用下列特徵來記住視窗:"
 
-#: src/bin/e_int_border_remember.c:470
-msgid "Window name and class"
-msgstr "視窗名稱與類別"
+#: src/bin/e_int_border_remember.c:638
+#, fuzzy
+msgid "Window name"
+msgstr "視窗名稱"
+
+#: src/bin/e_int_border_remember.c:650
+#, fuzzy
+msgid "Window class"
+msgstr "視窗類別"
 
-#: src/bin/e_int_border_remember.c:490
+#: src/bin/e_int_border_remember.c:674
 msgid "Window Role"
 msgstr "視窗腳色"
 
-#: src/bin/e_int_border_remember.c:499
+#: src/bin/e_int_border_remember.c:686
 msgid "Window type"
 msgstr "視窗類型"
 
-#: src/bin/e_int_border_remember.c:506
+#: src/bin/e_int_border_remember.c:694
+msgid "wildcard matches are allowed"
+msgstr ""
+
+#: src/bin/e_int_border_remember.c:696
 msgid "Transience"
 msgstr ""
 
-#: src/bin/e_int_border_remember.c:510
+#: src/bin/e_int_border_remember.c:701
 msgid "Properties to remember"
 msgstr "記住下列屬性:"
 
-#: src/bin/e_int_border_remember.c:521
+#: src/bin/e_int_border_remember.c:717
 msgid "Icon Preference"
 msgstr "圖示偏好"
 
-#: src/bin/e_int_border_remember.c:525
+#: src/bin/e_int_border_remember.c:723
 msgid "Virtual Desktop"
 msgstr "虛擬桌面"
 
-#: src/bin/e_int_border_remember.c:531
+#: src/bin/e_int_border_remember.c:732
 msgid "Current Screen"
 msgstr "目前螢幕"
 
-#: src/bin/e_int_border_remember.c:533
+#: src/bin/e_int_border_remember.c:735
 msgid "Skip Window List"
 msgstr "略過視窗列表"
 
-#: src/bin/e_int_border_remember.c:541
+#: src/bin/e_int_border_remember.c:744
+#, fuzzy
+msgid "Application file or name (.desktop)"
+msgstr "應用程式執行錯誤"
+
+#: src/bin/e_int_border_remember.c:752
 msgid "Match only one window"
 msgstr "只匹配單一視窗"
 
-#: src/bin/e_int_border_remember.c:546
-msgid "Start this program on login"
-msgstr "登入時啟動此程式"
-
-#: src/bin/e_int_border_remember.c:550
+#: src/bin/e_int_border_remember.c:756
 msgid "Always focus on start"
 msgstr ""
 
+#: src/bin/e_int_border_remember.c:760
+#, fuzzy
+msgid "Keep current properties"
+msgstr "改變圖示屬性"
+
+#: src/bin/e_int_border_remember.c:766
+msgid "Start this program on login"
+msgstr "登入時啟動此程式"
+
 #: src/bin/e_int_config_modules.c:42 src/bin/e_int_menus.c:210
 #: src/modules/battery/e_mod_main.c:176 src/modules/conf/e_conf.c:120
 #: src/modules/conf/e_conf.c:131 src/modules/conf_dialogs/e_mod_main.c:34
 #: src/modules/conf_profiles/e_mod_main.c:20 src/modules/ibar/e_mod_main.c:314
 #: src/modules/ibar/e_mod_main.c:828 src/modules/ibox/e_mod_main.c:319
 #: src/modules/ibox/e_mod_main.c:716 src/modules/pager/e_mod_main.c:815
-#: src/modules/temperature/e_mod_main.c:282 src/modules/mixer/e_mod_main.c:662
+#: src/modules/temperature/e_mod_main.c:281 src/modules/mixer/e_mod_main.c:662
 #: src/modules/connman/e_mod_main.c:1077
 #, fuzzy
 msgid "Settings"
@@ -2032,24 +2032,24 @@ msgstr "置物架 #"
 msgid "Module Settings"
 msgstr "設定模組"
 
-#: src/bin/e_int_config_modules.c:181
+#: src/bin/e_int_config_modules.c:180
 msgid "Available Modules"
 msgstr "可用模組"
 
-#: src/bin/e_int_config_modules.c:188
+#: src/bin/e_int_config_modules.c:187
 msgid "Load Module"
 msgstr "載入模組"
 
-#: src/bin/e_int_config_modules.c:195
+#: src/bin/e_int_config_modules.c:194
 msgid "Loaded Modules"
 msgstr "已載入模組"
 
-#: src/bin/e_int_config_modules.c:202
+#: src/bin/e_int_config_modules.c:201
 msgid "Unload Module"
 msgstr "卸除模組"
 
-#: src/bin/e_int_config_modules.c:212 src/bin/e_int_config_modules.c:632
-#: src/bin/e_int_config_modules.c:649 src/bin/e_int_config_modules.c:674
+#: src/bin/e_int_config_modules.c:211 src/bin/e_int_config_modules.c:631
+#: src/bin/e_int_config_modules.c:648 src/bin/e_int_config_modules.c:673
 #: src/bin/e_int_gadcon_config.c:148 src/bin/e_int_gadcon_config.c:183
 #: src/bin/e_int_gadcon_config.c:205
 msgid "Description: Unavailable"
@@ -2085,8 +2085,8 @@ msgstr "移除小工具"
 msgid "Toolbar Settings"
 msgstr "限制設定"
 
-#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:514
-#: src/bin/e_int_shelf_config.c:588
+#: src/bin/e_int_toolbar_config.c:82 src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:652
 msgid "Layout"
 msgstr "版面配置"
 
@@ -2112,12 +2112,12 @@ msgid "Favorite Applications"
 msgstr "我的最愛"
 
 #: src/bin/e_int_menus.c:117
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:157
-#: src/modules/wizard/page_070.c:198
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:185
+#: src/modules/wizard/page_070.c:202
 msgid "Applications"
 msgstr "應用程式"
 
-#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1094
+#: src/bin/e_int_menus.c:141 src/bin/e_int_menus.c:1081
 #: 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
@@ -2126,7 +2126,7 @@ msgstr "應用程式"
 msgid "Windows"
 msgstr "視窗"
 
-#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1148
+#: src/bin/e_int_menus.c:149 src/bin/e_int_menus.c:1135
 msgid "Lost Windows"
 msgstr "迷路的視窗"
 
@@ -2163,130 +2163,129 @@ msgstr "(無任何應用程式)"
 msgid "Set Virtual Desktops"
 msgstr "虛擬桌面"
 
-#: src/bin/e_int_menus.c:1100 src/bin/e_int_menus.c:1283
+#: src/bin/e_int_menus.c:1087 src/bin/e_int_menus.c:1271
 msgid "(No Windows)"
 msgstr "(無任何視窗)"
 
-#: src/bin/e_int_menus.c:1194 src/bin/e_int_menus.c:1297
+#: src/bin/e_int_menus.c:1181 src/bin/e_int_menus.c:1283
 msgid "No name!!"
 msgstr "無名稱!!"
 
-#: src/bin/e_int_menus.c:1375
+#: src/bin/e_int_menus.c:1362
 msgid "(No Shelves)"
 msgstr "(無任何置物架)"
 
-#: src/bin/e_int_menus.c:1388 src/bin/e_shelf.c:1144
+#: src/bin/e_int_menus.c:1374 src/bin/e_shelf.c:166 src/bin/e_shelf.c:1168
 #: src/modules/conf_shelves/e_int_config_shelf.c:132
 msgid "Shelf #"
 msgstr "置物架 #"
 
-#: src/bin/e_int_menus.c:1441
+#: src/bin/e_int_menus.c:1427
 msgid "Add A Shelf"
 msgstr "新增置物架"
 
-#: src/bin/e_int_menus.c:1448
+#: src/bin/e_int_menus.c:1434
 msgid "Delete A Shelf"
 msgstr "移除置物架"
 
-#: src/bin/e_int_shelf_config.c:75 src/bin/e_shelf.c:1698
+#: src/bin/e_int_shelf_config.c:76 src/bin/e_shelf.c:1700
 #: src/modules/conf_shelves/e_int_config_shelf.c:43
 msgid "Shelf Settings"
 msgstr "置物架設定"
 
-#: src/bin/e_int_shelf_config.c:538
+#: src/bin/e_int_shelf_config.c:601
 #: src/modules/conf_fonts/e_int_config_fonts.c:253
 msgid "Tiny"
 msgstr "微小"
 
-#: src/bin/e_int_shelf_config.c:540
+#: src/bin/e_int_shelf_config.c:603
 #: src/modules/conf_fonts/e_int_config_fonts.c:100
 #: src/modules/conf_fonts/e_int_config_fonts.c:259
 msgid "Small"
 msgstr "小"
 
-#: src/bin/e_int_shelf_config.c:542 src/modules/dropshadow/e_mod_config.c:126
+#: src/bin/e_int_shelf_config.c:605 src/modules/dropshadow/e_mod_config.c:126
 msgid "Medium"
 msgstr "中"
 
-#: src/bin/e_int_shelf_config.c:544
+#: src/bin/e_int_shelf_config.c:607
 #: src/modules/conf_fonts/e_int_config_fonts.c:102
 msgid "Large"
 msgstr "大"
 
-#: src/bin/e_int_shelf_config.c:546
+#: src/bin/e_int_shelf_config.c:609
 #: src/modules/conf_fonts/e_int_config_fonts.c:283
 msgid "Huge"
 msgstr "巨大"
 
-#: src/bin/e_int_shelf_config.c:552 src/bin/e_int_shelf_config.c:676
+#: src/bin/e_int_shelf_config.c:615 src/bin/e_int_shelf_config.c:742
 #, fuzzy
 msgid "Set Contents..."
 msgstr "置物架內容物"
 
-#: src/bin/e_int_shelf_config.c:577
+#: src/bin/e_int_shelf_config.c:641
 msgid "Above Everything"
 msgstr "最上層顯示"
 
-#: src/bin/e_int_shelf_config.c:579
+#: src/bin/e_int_shelf_config.c:643
 msgid "Below Windows"
 msgstr "視窗下層顯示"
 
-#: src/bin/e_int_shelf_config.c:581
+#: src/bin/e_int_shelf_config.c:645
 msgid "Below Everything"
 msgstr "最下層顯示"
 
-#: src/bin/e_int_shelf_config.c:583
+#: src/bin/e_int_shelf_config.c:647
 msgid "Allow windows to overlap the shelf"
 msgstr "允許視窗覆蓋置物架"
 
-#: src/bin/e_int_shelf_config.c:630
+#: src/bin/e_int_shelf_config.c:694
 msgid "Shrink to Content Size"
 msgstr "縮小到內容物大小"
 
-#: src/bin/e_int_shelf_config.c:641
+#: src/bin/e_int_shelf_config.c:705
 #, c-format
 msgid "%3.0f pixels"
 msgstr "%3.0f 像素"
 
-#: src/bin/e_int_shelf_config.c:646
-#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#: src/bin/e_int_shelf_config.c:710
 msgid "Styles"
 msgstr "樣式"
 
-#: src/bin/e_int_shelf_config.c:684
+#: src/bin/e_int_shelf_config.c:750
 msgid "Auto Hide"
 msgstr "自動隱藏"
 
-#: src/bin/e_int_shelf_config.c:685
+#: src/bin/e_int_shelf_config.c:751
 msgid "Auto-hide the shelf"
 msgstr "自動隱藏置物架"
 
-#: src/bin/e_int_shelf_config.c:689
+#: src/bin/e_int_shelf_config.c:755
 msgid "Show on mouse in"
 msgstr "滑鼠移過時顯示"
 
-#: src/bin/e_int_shelf_config.c:693
+#: src/bin/e_int_shelf_config.c:759
 msgid "Show on mouse click"
 msgstr "滑鼠點擊時顯示"
 
-#: src/bin/e_int_shelf_config.c:697
+#: src/bin/e_int_shelf_config.c:763
 msgid "Hide timeout"
 msgstr "隱藏逾時"
 
-#: src/bin/e_int_shelf_config.c:701 src/bin/e_int_shelf_config.c:710
+#: src/bin/e_int_shelf_config.c:767 src/bin/e_int_shelf_config.c:776
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f 秒"
 
-#: src/bin/e_int_shelf_config.c:706
+#: src/bin/e_int_shelf_config.c:772
 msgid "Hide duration"
 msgstr "隱藏持續時間"
 
-#: src/bin/e_int_shelf_config.c:722
+#: src/bin/e_int_shelf_config.c:788
 msgid "Show on all Desktops"
 msgstr "顯示於全部桌面"
 
-#: src/bin/e_int_shelf_config.c:724
+#: src/bin/e_int_shelf_config.c:790
 msgid "Show on specified Desktops"
 msgstr "顯示於指定桌面"
 
@@ -2502,7 +2501,7 @@ msgstr "開始國際化支援"
 msgid "Enlightenment cannot set up its intl system."
 msgstr "Enlightenment 無法建立國際化系統。"
 
-#: src/bin/e_main.c:659
+#: src/bin/e_main.c:664
 msgid ""
 "Enlightenment cannot set up init screen.\n"
 "Perhaps you are out of memory?"
@@ -2510,11 +2509,11 @@ msgstr ""
 "Enlightenment 無法建立初始螢幕。\n"
 "可能是記憶體不足?"
 
-#: src/bin/e_main.c:671
+#: src/bin/e_main.c:676
 msgid "Testing Format Support"
 msgstr "測試格式支援"
 
-#: src/bin/e_main.c:682
+#: src/bin/e_main.c:687
 msgid ""
 "Enlightenment found Evas can't create a buffer canvas. Please check\n"
 "Evas has Software Buffer engine support.\n"
@@ -2522,7 +2521,7 @@ msgstr ""
 "Enlightment 發現 Evas 無法創造緩衝畫面。請確認\n"
 "Evas 支援軟體緩衝引擎。\n"
 
-#: src/bin/e_main.c:693
+#: src/bin/e_main.c:698
 msgid ""
 "Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
 "loader support.\n"
@@ -2530,7 +2529,7 @@ msgstr ""
 "Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
 "Evas 支援 PNG 檔讀取。\n"
 
-#: src/bin/e_main.c:702
+#: src/bin/e_main.c:707
 msgid ""
 "Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
 "loader support.\n"
@@ -2538,7 +2537,7 @@ msgstr ""
 "Enlightment 發現 Evas 無法讀入 JPEG 檔案。請確認\n"
 "Evas 支援 JPEG 檔案讀取。\n"
 
-#: src/bin/e_main.c:711
+#: src/bin/e_main.c:716
 msgid ""
 "Enlightenment found Evas can't load EET files. Check Evas has EET\n"
 "loader support.\n"
@@ -2546,7 +2545,7 @@ msgstr ""
 "Enlightment 發現 Evas 無法讀入 EET 檔案。請確認\n"
 "Evas 支援 EET 檔案讀取。\n"
 
-#: src/bin/e_main.c:722
+#: src/bin/e_main.c:727
 #, fuzzy
 msgid ""
 "Enlightenment found Evas can't load the 'Sans' font. Check Evas has "
@@ -2556,11 +2555,11 @@ msgstr ""
 "Enlightment 發現 Evas 無法讀入 PNG 檔案。請確認\n"
 "Evas 支援 PNG 檔讀取。\n"
 
-#: src/bin/e_main.c:732
+#: src/bin/e_main.c:737
 msgid "Setup Screens"
 msgstr "設定螢幕"
 
-#: src/bin/e_main.c:737
+#: src/bin/e_main.c:742
 msgid ""
 "Enlightenment set up window management for all the screens on your system\n"
 "failed. Perhaps another window manager is running?\n"
@@ -2568,195 +2567,195 @@ msgstr ""
 "Enlightenment 在你所有的screen上建立視窗管理都失敗。\n"
 "可能有另一個視窗管理程式正在執行?\n"
 
-#: src/bin/e_main.c:743
+#: src/bin/e_main.c:748
 msgid "Setup Screensaver"
 msgstr "設定螢幕保護程式"
 
-#: src/bin/e_main.c:748
+#: src/bin/e_main.c:753
 msgid "Enlightenment cannot configure the X screensaver."
 msgstr "Enlightenment 無法設定 X 螢幕保護程式。"
 
-#: src/bin/e_main.c:752
+#: src/bin/e_main.c:757
 msgid "Setup Desklock"
 msgstr "設定桌面鎖定"
 
-#: src/bin/e_main.c:757
+#: src/bin/e_main.c:762
 msgid "Enlightenment cannot set up its desk locking system."
 msgstr "Enlightenment 無法建立他的桌面鎖定系統。"
 
-#: src/bin/e_main.c:770
+#: src/bin/e_main.c:775
 msgid "Setting up Paths"
 msgstr "設定路徑"
 
-#: src/bin/e_main.c:787
+#: src/bin/e_main.c:792
 msgid "Setup System Controls"
 msgstr "設定系統控制"
 
-#: src/bin/e_main.c:792
+#: src/bin/e_main.c:797
 msgid "Enlightenment cannot initialize the System Command system.\n"
 msgstr "Enlightenment 無法初始化系統命令系統。\n"
 
-#: src/bin/e_main.c:797
+#: src/bin/e_main.c:802
 msgid "Setup Actions"
 msgstr "設定行動"
 
-#: src/bin/e_main.c:802
+#: src/bin/e_main.c:807
 msgid "Enlightenment cannot set up its actions system."
 msgstr "Enlightenment 無法建立他的動作系統。"
 
-#: src/bin/e_main.c:806
+#: src/bin/e_main.c:811
 msgid "Setup Execution System"
 msgstr "設定執行系統"
 
-#: src/bin/e_main.c:811
+#: src/bin/e_main.c:816
 msgid "Enlightenment cannot set up its exec system."
 msgstr "Enlightenment 無法建立他的執行系統。"
 
-#: src/bin/e_main.c:816
-msgid "Setup Remembers"
-msgstr "設定記憶值"
-
-#: src/bin/e_main.c:821
-msgid "Enlightenment cannot setup remember settings."
-msgstr "Enlightenment 無法設定他的設定記憶系統。"
-
-#: src/bin/e_main.c:829
+#: src/bin/e_main.c:824
 msgid "Setup FM"
 msgstr "設定 FM"
 
-#: src/bin/e_main.c:834
+#: src/bin/e_main.c:829
 msgid "Enlightenment cannot initialize the File manager.\n"
 msgstr "Enlightenment 無法初始文件管理器。\n"
 
-#: src/bin/e_main.c:849
+#: src/bin/e_main.c:844
 msgid "Setup Message System"
 msgstr "設定訊息系統"
 
-#: src/bin/e_main.c:854
+#: src/bin/e_main.c:849
 msgid "Enlightenment cannot set up its msg system."
 msgstr "Enlightenment 無法建立他的訊息系統。"
 
-#: src/bin/e_main.c:859
+#: src/bin/e_main.c:854
 msgid "Setup DND"
 msgstr "設定拖放"
 
-#: src/bin/e_main.c:864
+#: src/bin/e_main.c:859
 msgid "Enlightenment cannot set up its dnd system."
 msgstr "Enlightenment 無法建立他的拖放系統。"
 
-#: src/bin/e_main.c:869
+#: src/bin/e_main.c:864
 #, fuzzy
 msgid "Setup Grab Input Handling"
 msgstr "設定輸入攫取處理系統"
 
-#: src/bin/e_main.c:874
+#: src/bin/e_main.c:869
 msgid "Enlightenment cannot set up its input grab handling system."
 msgstr "Enlightenment 無法建立他的輸入擷取處理系統。"
 
-#: src/bin/e_main.c:879
+#: src/bin/e_main.c:874
 msgid "Setup Modules"
 msgstr "設定模組"
 
-#: src/bin/e_main.c:884
+#: src/bin/e_main.c:879
 msgid "Enlightenment cannot set up its module system."
 msgstr "Enlightenment 無法建立他的模組系統。"
 
+#: src/bin/e_main.c:884
+msgid "Setup Remembers"
+msgstr "設定記憶值"
+
 #: src/bin/e_main.c:889
+msgid "Enlightenment cannot setup remember settings."
+msgstr "Enlightenment 無法設定他的設定記憶系統。"
+
+#: src/bin/e_main.c:894
 msgid "Setup Color Classes"
 msgstr "設定顏色類別"
 
-#: src/bin/e_main.c:894
+#: src/bin/e_main.c:899
 msgid "Enlightenment cannot set up its color class system."
 msgstr "Enlightenment 無法建立他的顏色類別系統。"
 
-#: src/bin/e_main.c:899
+#: src/bin/e_main.c:904
 msgid "Setup Gadcon"
 msgstr "設定小工具控制"
 
-#: src/bin/e_main.c:904
+#: src/bin/e_main.c:909
 msgid "Enlightenment cannot set up its gadget control system."
 msgstr "Enlightenment 無法建立他的小工具控制系統。"
 
-#: src/bin/e_main.c:909
+#: src/bin/e_main.c:914
 msgid "Setup DPMS"
 msgstr "設定 DPMS"
 
-#: src/bin/e_main.c:914
+#: src/bin/e_main.c:919
 msgid "Enlightenment cannot configure the DPMS settings."
 msgstr "Enlightenment 無法設定 DPMS 設定。"
 
-#: src/bin/e_main.c:918
+#: src/bin/e_main.c:923
 #, fuzzy
 msgid "Set Up Powersave modes"
 msgstr "設定 CPU 電源管理原則"
 
-#: src/bin/e_main.c:922
+#: src/bin/e_main.c:927
 #, fuzzy
 msgid "Enlightenment cannot set up its powersave modes."
 msgstr "Enlightenment 無法建立他的彈出系統。"
 
-#: src/bin/e_main.c:927
+#: src/bin/e_main.c:932
 msgid "Setup Wallpaper"
 msgstr "設定桌布"
 
-#: src/bin/e_main.c:932
+#: src/bin/e_main.c:937
 msgid "Enlightenment cannot set up its desktop background system."
 msgstr "Enlightenment 無法建立桌面背景系統。"
 
-#: src/bin/e_main.c:937
+#: src/bin/e_main.c:942
 msgid "Setup Mouse"
 msgstr "設定滑鼠"
 
-#: src/bin/e_main.c:942
+#: src/bin/e_main.c:947
 #, fuzzy
 msgid "Enlightenment cannot configure the mouse settings."
 msgstr "Enlightenment 無法設定 DPMS 設定。"
 
-#: src/bin/e_main.c:947
+#: src/bin/e_main.c:952
 msgid "Setup Bindings"
 msgstr "設定快速鍵"
 
-#: src/bin/e_main.c:952
+#: src/bin/e_main.c:957
 msgid "Enlightenment cannot set up its bindings system."
 msgstr "Enlightenment 無法建立他的連接系統。"
 
-#: src/bin/e_main.c:957
+#: src/bin/e_main.c:962
 msgid "Setup Popups"
 msgstr "設定彈出視窗"
 
-#: src/bin/e_main.c:962
+#: src/bin/e_main.c:967
 msgid "Enlightenment cannot set up its popup system."
 msgstr "Enlightenment 無法建立他的彈出系統。"
 
-#: src/bin/e_main.c:967
+#: src/bin/e_main.c:972
 msgid "Setup Shelves"
 msgstr "設定置物架"
 
-#: src/bin/e_main.c:972
+#: src/bin/e_main.c:977
 msgid "Enlightenment cannot set up its shelf system."
 msgstr "Enlightenment 無法建立他的置物架系統。"
 
-#: src/bin/e_main.c:977
+#: src/bin/e_main.c:982
 msgid "Setup Thumbnailer"
 msgstr "設定縮圖"
 
-#: src/bin/e_main.c:982
+#: src/bin/e_main.c:987
 msgid "Enlightenment cannot initialize the Thumbnailing system.\n"
 msgstr "Enlightenment 無法初始化縮圖系統。\n"
 
-#: src/bin/e_main.c:987
+#: src/bin/e_main.c:992
 msgid "Set Up File Ordering"
 msgstr "設定檔案排序"
 
-#: src/bin/e_main.c:991
+#: src/bin/e_main.c:996
 msgid "Enlightenment cannot set up its order file system."
 msgstr "Enlightenment 無法建立他的有序檔案系統。"
 
-#: src/bin/e_main.c:1026
+#: src/bin/e_main.c:1031
 msgid "Load Modules"
 msgstr "載入模組"
 
-#: src/bin/e_main.c:1034
+#: src/bin/e_main.c:1039
 msgid ""
 "Enlightenment crashed early on start and has<br>been restarted. All modules "
 "have been disabled<br>and will not be loaded to help remove any "
@@ -2767,11 +2766,11 @@ msgstr ""
 "您<br>\n"
 "從設定檔中移除任何問題模組。<br>模組設定對話框應可讓您重新選擇模組。"
 
-#: src/bin/e_main.c:1041
+#: src/bin/e_main.c:1046
 msgid "Enlightenment crashed early on start and has been restarted"
 msgstr "Enlightment 在啟動途中當機,已經重新啟動。"
 
-#: src/bin/e_main.c:1042
+#: src/bin/e_main.c:1047
 msgid ""
 "Enlightenment crashed early on start and has been restarted.<br>All modules "
 "have been disabled and will not be loaded to help<br>remove any problem "
@@ -2782,15 +2781,15 @@ msgstr ""
 "您<br>\n"
 "從設定檔中移除任何問題模組。<br><br>模組設定對話框應可讓您重新選擇模組。"
 
-#: src/bin/e_main.c:1050
+#: src/bin/e_main.c:1055
 msgid "Configure Shelves"
 msgstr "設定置物架"
 
-#: src/bin/e_main.c:1061
+#: src/bin/e_main.c:1066
 msgid "Almost Done"
 msgstr "快好了"
 
-#: src/bin/e_module.c:117
+#: src/bin/e_module.c:126
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>No module named %s could be "
@@ -2798,11 +2797,11 @@ msgid ""
 msgstr ""
 "載入模組 %s 時發生錯誤。<br>在模組的搜尋路徑<br>沒有找到名為 %s 的模組。<br>"
 
-#: src/bin/e_module.c:121 src/bin/e_module.c:134 src/bin/e_module.c:151
+#: src/bin/e_module.c:130 src/bin/e_module.c:143 src/bin/e_module.c:160
 msgid "Error loading Module"
 msgstr "載入模組時發生錯誤"
 
-#: src/bin/e_module.c:128 src/bin/e_module.c:145
+#: src/bin/e_module.c:137 src/bin/e_module.c:154
 #, c-format
 msgid ""
 "There was an error loading module named: %s<br>The full path to this module "
@@ -2811,11 +2810,11 @@ msgstr ""
 "載入模組 %s 時發生錯誤。<br>該模組的完整路徑是:<br>%s<br>錯誤報告如下:<br>%"
 "s<br>"
 
-#: src/bin/e_module.c:150
+#: src/bin/e_module.c:159
 msgid "Module does not contain all needed functions"
 msgstr "模組並末包含所有必需之功能"
 
-#: src/bin/e_module.c:164
+#: src/bin/e_module.c:173
 #, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a minimum "
@@ -2825,12 +2824,12 @@ msgstr ""
 "模組 API 錯誤<br>模組初始化錯誤: %s<br>要求最小的模組 API 版本號: %i。"
 "<br>Enlightenment給的模組版本化: %i。<br>"
 
-#: src/bin/e_module.c:169
+#: src/bin/e_module.c:178
 #, c-format
 msgid "Enlightenment %s Module"
 msgstr "Enlightenment %s 模組"
 
-#: src/bin/e_module.c:497
+#: src/bin/e_module.c:501
 msgid "Would you like to unload this module?<br>"
 msgstr "您是否要卸除這個模組?<br>"
 
@@ -2841,30 +2840,30 @@ msgid ""
 "power saving?"
 msgstr ""
 
-#: src/bin/e_shelf.c:1272 src/modules/conf_shelves/e_int_config_shelf.c:281
+#: src/bin/e_shelf.c:1296 src/modules/conf_shelves/e_int_config_shelf.c:281
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您是否確定移除這個置物架?"
 
-#: src/bin/e_shelf.c:1273
+#: src/bin/e_shelf.c:1297
 msgid ""
 "You requested to delete this shelf.<br><br>Are you sure you want to delete "
 "it?"
 msgstr "您要求移除此置物架。<br><br>您是否確定移除?"
 
-#: src/bin/e_shelf.c:1688 src/bin/e_toolbar.c:325
+#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:325
 msgid "Stop Moving/Resizing Items"
 msgstr "停止移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1690 src/bin/e_toolbar.c:327
+#: src/bin/e_shelf.c:1692 src/bin/e_toolbar.c:327
 msgid "Begin Moving/Resizing Items"
 msgstr "開始移動或改變項目大小"
 
-#: src/bin/e_shelf.c:1703
+#: src/bin/e_shelf.c:1705
 #, fuzzy
 msgid "Set Shelf Contents"
 msgstr "置物架內容物"
 
-#: src/bin/e_shelf.c:1708
+#: src/bin/e_shelf.c:1710
 msgid "Delete this Shelf"
 msgstr "移除這個置物架"
 
@@ -2881,11 +2880,11 @@ msgstr "檢查系統權限"
 msgid "System Check Done"
 msgstr "完成系統權限檢查"
 
-#: src/bin/e_sys.c:314
+#: src/bin/e_sys.c:312
 msgid "Logout problems"
 msgstr "登出時發生問題"
 
-#: src/bin/e_sys.c:317
+#: src/bin/e_sys.c:315
 msgid ""
 "Logout is taking too long. Some<br>applications refuse to close.<br>Do you "
 "want to finish the logout<br>anyway without closing these<br>applications "
@@ -2894,32 +2893,32 @@ msgstr ""
 "登出花了過長時間。<br>有些應用程式拒絕關閉。<br>您是否仍要在不先關閉<br>這些"
 "程式的情況下登出?"
 
-#: src/bin/e_sys.c:323
+#: src/bin/e_sys.c:321
 msgid "Logout now"
 msgstr "立刻登出"
 
-#: src/bin/e_sys.c:324
+#: src/bin/e_sys.c:322
 msgid "Wait longer"
 msgstr "等待登出"
 
-#: src/bin/e_sys.c:325
+#: src/bin/e_sys.c:323
 msgid "Cancel Logout"
 msgstr "取消登出"
 
-#: src/bin/e_sys.c:363
+#: src/bin/e_sys.c:362
 msgid "Logout in progress"
 msgstr "登出中"
 
-#: src/bin/e_sys.c:366
+#: src/bin/e_sys.c:365
 #, fuzzy
 msgid "Logout in progress.<br><hilight>Please wait.</hilight>"
 msgstr "登出中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:395 src/bin/e_sys.c:456
+#: src/bin/e_sys.c:391 src/bin/e_sys.c:452
 msgid "Enlightenment is busy with another request"
 msgstr "Enlightenment 仍在處理其它請求。"
 
-#: src/bin/e_sys.c:401
+#: src/bin/e_sys.c:397
 #, fuzzy
 msgid ""
 "Logging out.<br>You cannot perform other system actions<br>once a logout has "
@@ -2927,7 +2926,7 @@ msgid ""
 msgstr ""
 "Enlightment 正在登出中。<br>一旦開始登出,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:409
+#: src/bin/e_sys.c:405
 #, fuzzy
 msgid ""
 "Powering off.<br>You cannot do any other system actions<br>once a shutdown "
@@ -2935,7 +2934,7 @@ msgid ""
 msgstr ""
 "Enlightment 正在關機中。<br>一旦開始關機,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:416
+#: src/bin/e_sys.c:412
 #, fuzzy
 msgid ""
 "Resetting.<br>You cannot do any other system actions<br>once a reboot has "
@@ -2944,7 +2943,7 @@ msgstr ""
 "Enlightment 正在重新開機中。<br>一旦開始重新開機,<br>您就不能執行任何系統動"
 "作。"
 
-#: src/bin/e_sys.c:423
+#: src/bin/e_sys.c:419
 #, fuzzy
 msgid ""
 "Suspending.<br>Until suspend is complete you cannot perform<br>any other "
@@ -2952,7 +2951,7 @@ msgid ""
 msgstr ""
 "Enlightment 正在待機中。<br>一旦開始待機,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:430
+#: src/bin/e_sys.c:426
 #, fuzzy
 msgid ""
 "Hibernating.<br>You cannot perform an other system actions<br>until this is "
@@ -2960,62 +2959,62 @@ msgid ""
 msgstr ""
 "Enlightment 正在休眠中。<br>一旦開始休眠,<br>您就不能執行任何系統動作。"
 
-#: src/bin/e_sys.c:437 src/bin/e_sys.c:483
+#: src/bin/e_sys.c:433 src/bin/e_sys.c:479
 msgid "EEK! This should not happen"
 msgstr "哎呀!怎麼會發生這種事"
 
-#: src/bin/e_sys.c:463
+#: src/bin/e_sys.c:459
 msgid "Power off failed."
 msgstr ""
 
-#: src/bin/e_sys.c:468
+#: src/bin/e_sys.c:464
 #, fuzzy
 msgid "Reset failed."
 msgstr "desktop 檔"
 
-#: src/bin/e_sys.c:473
+#: src/bin/e_sys.c:469
 #, fuzzy
 msgid "Suspend failed."
 msgstr "待機時間"
 
-#: src/bin/e_sys.c:478
+#: src/bin/e_sys.c:474
 #, fuzzy
 msgid "Hibernate failed."
 msgstr "無法休眠"
 
-#: src/bin/e_sys.c:535
+#: src/bin/e_sys.c:531
 msgid "Power off"
 msgstr ""
 
-#: src/bin/e_sys.c:538
+#: src/bin/e_sys.c:534
 #, fuzzy
 msgid "Power off.<br><hilight>Please wait.</hilight>"
 msgstr "重新開機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:562
+#: src/bin/e_sys.c:558
 #, fuzzy
 msgid "Resetting"
 msgstr "桌面設定"
 
-#: src/bin/e_sys.c:565
+#: src/bin/e_sys.c:561
 #, fuzzy
 msgid "Resetting.<br><hilight>Please wait.</hilight>"
 msgstr "重新開機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:588
+#: src/bin/e_sys.c:584
 msgid "Suspending"
 msgstr "待機中"
 
-#: src/bin/e_sys.c:591
+#: src/bin/e_sys.c:587
 #, fuzzy
 msgid "Suspending.<br><hilight>Please wait.</hilight>"
 msgstr "待機中。<br><hilight>請稍候。</hilight>"
 
-#: src/bin/e_sys.c:614
+#: src/bin/e_sys.c:610
 msgid "Hibernating"
 msgstr "休眠中"
 
-#: src/bin/e_sys.c:617
+#: src/bin/e_sys.c:613
 #, fuzzy
 msgid "Hibernating.<br><hilight>Please wait.</hilight>"
 msgstr "休眠中。<br><hilight>請稍候。</hilight>"
@@ -3034,11 +3033,11 @@ msgstr "設定為佈景主題"
 msgid "Set Toolbar Contents"
 msgstr "設定置物架內容物"
 
-#: src/bin/e_utils.c:246
+#: src/bin/e_utils.c:245
 msgid "Cannot exit - immortal windows."
 msgstr "無法退出 - 不朽之視窗。"
 
-#: src/bin/e_utils.c:247
+#: src/bin/e_utils.c:246
 msgid ""
 "Some windows are left still around with the Lifespan lock enabled. This "
 "means<br>that Enlightenment will not allow itself to exit until these "
@@ -3047,77 +3046,77 @@ msgstr ""
 "部份視窗仍處於生命周期鎖定中。這意味著 Enlightenment 不允許自己退出,<br>除非"
 "這些視窗被關閉,或者移除生命周期鎖定。<br>"
 
-#: src/bin/e_utils.c:811
+#: src/bin/e_utils.c:804
 #, c-format
 msgid "%'.0f Bytes"
 msgstr "%'.0f 位元組"
 
-#: src/bin/e_utils.c:815
+#: src/bin/e_utils.c:808
 #, c-format
 msgid "%'.0f KB"
 msgstr "%'.0f KB"
 
-#: src/bin/e_utils.c:819
+#: src/bin/e_utils.c:812
 #, c-format
 msgid "%'.0f MB"
 msgstr "%'.0f MB"
 
-#: src/bin/e_utils.c:823
+#: src/bin/e_utils.c:816
 #, c-format
 msgid "%'.1f GB"
 msgstr "%'.1f GB"
 
-#: src/bin/e_utils.c:843
+#: src/bin/e_utils.c:836
 #, c-format
 msgid "In the Future"
 msgstr "末來"
 
-#: src/bin/e_utils.c:848
+#: src/bin/e_utils.c:841
 #, c-format
 msgid "In the last Minute"
 msgstr "一分鐘內"
 
-#: src/bin/e_utils.c:850
+#: src/bin/e_utils.c:843
 #, c-format
 msgid "%li Years ago"
 msgstr "%li 年前"
 
-#: src/bin/e_utils.c:852
+#: src/bin/e_utils.c:845
 #, c-format
 msgid "%li Months ago"
 msgstr "%li 個月前"
 
-#: src/bin/e_utils.c:854
+#: src/bin/e_utils.c:847
 #, c-format
 msgid "%li Weeks ago"
 msgstr "%li 星期前"
 
-#: src/bin/e_utils.c:856
+#: src/bin/e_utils.c:849
 #, c-format
 msgid "%li Days ago"
 msgstr "%li 天前"
 
-#: src/bin/e_utils.c:858
+#: src/bin/e_utils.c:851
 #, c-format
 msgid "%li Hours ago"
 msgstr "%li 小時前"
 
-#: src/bin/e_utils.c:860
+#: src/bin/e_utils.c:853
 #, c-format
 msgid "%li Minutes ago"
 msgstr "%li 分鐘前"
 
-#: src/bin/e_utils.c:866
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1107
+#: src/bin/e_utils.c:859
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1180
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1134
-#: src/modules/conf_profiles/e_int_config_profiles.c:251
-#: src/modules/wizard/page_020.c:21 src/modules/wizard/page_020.c:29
+#: src/modules/conf_profiles/e_int_config_profiles.c:250
+#: src/modules/wizard/page_020.c:22 src/modules/wizard/page_020.c:30
 msgid "Unknown"
 msgstr "末知"
 
 #: src/bin/e_widget_config_list.c:63
 #: src/modules/conf_applications/e_int_config_apps.c:243
-#: src/modules/conf_profiles/e_int_config_profiles.c:121
+#: src/modules/conf_profiles/e_int_config_profiles.c:120
 #: src/modules/conf_shelves/e_int_config_shelf.c:79
 #: src/modules/ibar/e_mod_config.c:110
 msgid "Add"
@@ -3137,51 +3136,51 @@ msgstr "往上"
 msgid "Down"
 msgstr "往下"
 
-#: src/bin/e_widget_fsel.c:293
+#: src/bin/e_widget_fsel.c:292
 msgid "Add to Favorites"
 msgstr "加入「我的最愛」選單"
 
-#: src/bin/e_widget_fsel.c:299
+#: src/bin/e_widget_fsel.c:298
 #: src/modules/conf_desklock/e_int_config_desklock.c:305
 #: src/modules/conf_imc/e_int_config_imc.c:834
 #: src/modules/conf_startup/e_int_config_startup.c:275
-#: src/modules/conf_theme/e_int_config_theme.c:402
+#: src/modules/conf_theme/e_int_config_theme.c:405
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:519
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:649
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:651
 #: src/modules/gadman/e_mod_config.c:193
 msgid "Go up a Directory"
 msgstr "到上一層目錄"
 
-#: src/bin/e_widget_fsel.c:360
+#: src/bin/e_widget_fsel.c:359
 msgid "Permissions:"
 msgstr "權限:"
 
-#: src/bin/e_widget_fsel.c:376
+#: src/bin/e_widget_fsel.c:375
 msgid "Modified:"
 msgstr "修改日期:"
 
-#: src/bin/e_widget_fsel.c:615
+#: src/bin/e_widget_fsel.c:614
 #, c-format
 msgid "You"
 msgstr "您"
 
-#: src/bin/e_widget_fsel.c:664
+#: src/bin/e_widget_fsel.c:663
 #, c-format
 msgid "Protected"
 msgstr "受保護的"
 
-#: src/bin/e_widget_fsel.c:666 src/bin/e_widget_fsel.c:675
-#: src/bin/e_widget_fsel.c:684
+#: src/bin/e_widget_fsel.c:665 src/bin/e_widget_fsel.c:674
+#: src/bin/e_widget_fsel.c:683
 #, c-format
 msgid "Read Only"
 msgstr "唯讀"
 
-#: src/bin/e_widget_fsel.c:673 src/bin/e_widget_fsel.c:682
+#: src/bin/e_widget_fsel.c:672 src/bin/e_widget_fsel.c:681
 #, c-format
 msgid "Forbidden"
 msgstr "禁止讀寫"
 
-#: src/bin/e_widget_fsel.c:691
+#: src/bin/e_widget_fsel.c:690
 msgid "Read-Write"
 msgstr "讀寫"
 
@@ -3198,63 +3197,63 @@ msgstr "基本設定"
 msgid "Show alert when battery is low"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_config.c:137
+#: src/modules/battery/e_mod_config.c:138
 #, fuzzy
 msgid "Check every:"
 msgstr "電量檢查間隔:"
 
-#: src/modules/battery/e_mod_config.c:139
+#: src/modules/battery/e_mod_config.c:140
 #: src/modules/conf_performance/e_int_config_performance.c:149
 #: src/modules/temperature/e_mod_config.c:379
 #, fuzzy, c-format
 msgid "%1.0f ticks"
 msgstr "%1.0f ç­†"
 
-#: src/modules/battery/e_mod_config.c:141
+#: src/modules/battery/e_mod_config.c:143
 #, fuzzy
 msgid "Polling"
 msgstr "一般"
 
-#: src/modules/battery/e_mod_config.c:144
+#: src/modules/battery/e_mod_config.c:147
 #, fuzzy
 msgid "Show alert on low battery"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_config.c:146
+#: src/modules/battery/e_mod_config.c:150
 #, fuzzy
 msgid "Alert when at:"
 msgstr "可用電量低於此時間時發出警告:"
 
-#: src/modules/battery/e_mod_config.c:148
+#: src/modules/battery/e_mod_config.c:152
 #, fuzzy, c-format
 msgid "%1.0f min"
 msgstr "%1.0f 分鐘"
 
-#: src/modules/battery/e_mod_config.c:150
+#: src/modules/battery/e_mod_config.c:155
 #, fuzzy, c-format
 msgid "%1.0f %%"
 msgstr "%3.0f%%"
 
-#: src/modules/battery/e_mod_config.c:152
+#: src/modules/battery/e_mod_config.c:158
 msgid "Auto dismiss in..."
 msgstr ""
 
-#: src/modules/battery/e_mod_config.c:154
+#: src/modules/battery/e_mod_config.c:161
 #, fuzzy, c-format
 msgid "%1.0f sec"
 msgstr "%1.1f 秒"
 
-#: src/modules/battery/e_mod_config.c:156
+#: src/modules/battery/e_mod_config.c:164
 #, fuzzy
 msgid "Alert"
 msgstr "加速"
 
-#: src/modules/battery/e_mod_config.c:161
+#: src/modules/battery/e_mod_config.c:170
 #, fuzzy
 msgid "Auto Detect"
 msgstr "自動隱藏"
 
-#: src/modules/battery/e_mod_config.c:163
+#: src/modules/battery/e_mod_config.c:172
 #: 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
@@ -3262,13 +3261,13 @@ msgstr "自動隱藏"
 msgid "Internal"
 msgstr "內部"
 
-#: src/modules/battery/e_mod_config.c:165
+#: src/modules/battery/e_mod_config.c:174
 #: src/modules/fileman/e_mod_config.c:280
 #, fuzzy
 msgid "HAL"
 msgstr "ALT"
 
-#: src/modules/battery/e_mod_config.c:168
+#: src/modules/battery/e_mod_config.c:177
 msgid "Hardware"
 msgstr ""
 
@@ -3276,25 +3275,25 @@ msgstr ""
 msgid "Battery"
 msgstr "電池"
 
-#: src/modules/battery/e_mod_main.c:844
+#: src/modules/battery/e_mod_main.c:847
 #, fuzzy
 msgid "Your battery is low!"
 msgstr "電量不足時發出警告"
 
-#: src/modules/battery/e_mod_main.c:846
+#: src/modules/battery/e_mod_main.c:849
 msgid "AC power is recommended."
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:921
+#: src/modules/battery/e_mod_main.c:924
 msgid "N/A"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:992 src/modules/battery/e_mod_main.c:994
-#: src/modules/battery/e_mod_main.c:1001 src/modules/battery/e_mod_main.c:1003
+#: src/modules/battery/e_mod_main.c:995 src/modules/battery/e_mod_main.c:997
+#: src/modules/battery/e_mod_main.c:1004 src/modules/battery/e_mod_main.c:1006
 msgid "ERROR"
 msgstr ""
 
-#: src/modules/battery/e_mod_main.c:1093
+#: src/modules/battery/e_mod_main.c:1096
 #, fuzzy
 msgid "Battery Meter"
 msgstr "電池"
@@ -3303,23 +3302,23 @@ msgstr "電池"
 msgid "Clock"
 msgstr "時鐘"
 
-#: src/modules/conf/e_mod_main.c:140 src/modules/conf/e_mod_main.c:144
-#: src/modules/conf/e_mod_main.c:164 src/modules/conf/e_mod_main.c:265
+#: src/modules/conf/e_mod_main.c:149 src/modules/conf/e_mod_main.c:153
+#: src/modules/conf/e_mod_main.c:173 src/modules/conf/e_mod_main.c:274
 #, fuzzy
 msgid "Settings Panel"
 msgstr "桌面設定"
 
-#: src/modules/conf/e_mod_main.c:235
+#: src/modules/conf/e_mod_main.c:244
 #, fuzzy
 msgid "Presentation"
 msgstr "桌面設定"
 
-#: src/modules/conf/e_mod_main.c:242
+#: src/modules/conf/e_mod_main.c:251
 #, fuzzy
 msgid "Offline"
 msgstr "關機時間"
 
-#: src/modules/conf/e_mod_main.c:270
+#: src/modules/conf/e_mod_main.c:279
 #, fuzzy
 msgid "Modes"
 msgstr "模組"
@@ -3346,7 +3345,7 @@ msgid "Restart Applications"
 msgstr "自動重新啟動之應用程式"
 
 #: src/modules/conf_applications/e_int_config_apps.c:236
-#: src/modules/fileman/e_fwin.c:1924
+#: src/modules/fileman/e_fwin.c:1869
 msgid "All Applications"
 msgstr "全部應用程式"
 
@@ -3370,12 +3369,12 @@ msgstr "其它 IBar 應用程式"
 
 #: src/modules/conf_applications/e_mod_main.c:41
 #: src/modules/conf_clientlist/e_mod_main.c:34
-#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:79
+#: src/modules/conf_menus/e_mod_main.c:34 src/modules/wizard/page_030.c:81
 msgid "Menus"
 msgstr "選單"
 
 #: src/modules/conf_borders/e_int_config_borders.c:30
-#: src/modules/conf_borders/e_int_config_borders.c:197
+#: src/modules/conf_borders/e_int_config_borders.c:202
 msgid "Default Border Style"
 msgstr "預設邊框樣式"
 
@@ -3383,14 +3382,14 @@ msgstr "預設邊框樣式"
 msgid "Window Border Selection"
 msgstr "選擇視窗邊框"
 
-#: src/modules/conf_borders/e_int_config_borders.c:242
+#: src/modules/conf_borders/e_int_config_borders.c:247
 msgid "Remember this Border for this window next time it appears"
 msgstr "記住這個視窗的邊框樣式"
 
 #: 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
-#: src/modules/conf_icon_theme/e_mod_main.c:34
+#: src/modules/conf_icon_theme/e_mod_main.c:21
 #: src/modules/conf_mouse_cursor/e_mod_main.c:34
 #: src/modules/conf_scale/e_mod_main.c:34
 #: src/modules/conf_startup/e_mod_main.c:34
@@ -3417,7 +3416,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:656
+#: src/modules/conf_fonts/e_int_config_fonts.c:664
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:349
 #: src/modules/conf_transitions/e_int_config_transitions.c:152
 #: src/modules/conf_transitions/e_int_config_transitions.c:204
@@ -3687,9 +3686,9 @@ msgid "Desktop Name"
 msgstr "桌面名稱"
 
 #: src/modules/conf_desk/e_int_config_desk.c:150
-#: src/modules/conf_profiles/e_int_config_profiles.c:353
+#: src/modules/conf_profiles/e_int_config_profiles.c:352
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:120
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:106
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:135
 msgid "Name:"
 msgstr "名稱:"
 
@@ -3758,10 +3757,10 @@ msgstr "%1.0f 分鐘"
 #: src/modules/conf_desklock/e_int_config_desklock.c:298
 #: src/modules/conf_imc/e_int_config_imc.c:822
 #: src/modules/conf_startup/e_int_config_startup.c:262
-#: src/modules/conf_theme/e_int_config_theme.c:391
-#: src/modules/conf_theme/e_int_config_theme.c:790
+#: src/modules/conf_theme/e_int_config_theme.c:394
+#: src/modules/conf_theme/e_int_config_theme.c:787
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:509
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:639
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:641
 #: src/modules/gadman/e_mod_config.c:186
 msgid "Personal"
 msgstr "個人"
@@ -3793,8 +3792,8 @@ msgstr "顯示於螢幕區域 #:"
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:170
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:174
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:178
-#: src/modules/conf_mouse/e_int_config_mouse.c:109
 #: src/modules/conf_mouse/e_int_config_mouse.c:115
+#: src/modules/conf_mouse/e_int_config_mouse.c:121
 #: src/modules/fileman/e_mod_config.c:229
 #, c-format
 msgid "%1.0f"
@@ -3917,48 +3916,53 @@ msgstr ""
 msgid "Virtual Desktops"
 msgstr "虛擬桌面"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:36
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:37
 msgid "Dialog Settings"
 msgstr "對話框設定"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:87
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:94
 #: src/modules/conf_engine/e_int_config_engine.c:94
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:114
 #: src/modules/conf_exebuf/e_int_config_exebuf.c:167
+#: src/modules/conf_fonts/e_int_config_fonts.c:649
 #: src/modules/conf_performance/e_int_config_performance.c:94
 #: src/modules/conf_performance/e_int_config_performance.c:134
 #: src/modules/conf_winlist/e_int_config_winlist.c:144
-#: src/modules/ibox/e_mod_config.c:100 src/modules/pager/e_mod_config.c:119
+#: src/modules/ibox/e_mod_config.c:99 src/modules/pager/e_mod_config.c:119
 #: src/modules/pager/e_mod_config.c:159 src/modules/mixer/conf_gadget.c:193
 #: src/modules/mixer/conf_module.c:96
 msgid "General Settings"
 msgstr "一般設定"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:89
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:96
 msgid "Disable Confirmation Dialogs"
 msgstr "停用確認對話框"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:91
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
 #, fuzzy
 msgid "Normal Windows"
 msgstr "(無任何視窗)"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:98
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:105
 #, fuzzy
 msgid "Default Settings Dialogs Mode"
 msgstr "預設對話框模式"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:101
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:140
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:108
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:152
 msgid "Basic Mode"
 msgstr "基本模式"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:103
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:142
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:110
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:154
 msgid "Advanced Mode"
 msgstr "進階模式"
 
-#: src/modules/conf_dialogs/e_int_config_dialogs.c:137
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:116
+msgid "Remember size and position of dialogs"
+msgstr ""
+
+#: src/modules/conf_dialogs/e_int_config_dialogs.c:149
 msgid "Default Dialog Mode"
 msgstr "預設對話框模式"
 
@@ -4028,31 +4032,31 @@ msgstr "重新啟動"
 msgid "Screen Resolution Settings"
 msgstr "螢幕解析度設定"
 
-#: src/modules/conf_display/e_int_config_display.c:405
+#: src/modules/conf_display/e_int_config_display.c:404
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/modules/conf_display/e_int_config_display.c:412
+#: src/modules/conf_display/e_int_config_display.c:411
 msgid "Restore on login"
 msgstr "登入時復原"
 
-#: src/modules/conf_display/e_int_config_display.c:416
+#: src/modules/conf_display/e_int_config_display.c:415
 msgid "Refresh"
 msgstr "更新頻率"
 
-#: src/modules/conf_display/e_int_config_display.c:475
+#: src/modules/conf_display/e_int_config_display.c:474
 msgid "Rotation"
 msgstr "旋轉"
 
-#: src/modules/conf_display/e_int_config_display.c:494
+#: src/modules/conf_display/e_int_config_display.c:493
 msgid "Mirroring"
 msgstr "鏡射"
 
-#: src/modules/conf_display/e_int_config_display.c:641
+#: src/modules/conf_display/e_int_config_display.c:640
 msgid "Missing Features"
 msgstr "缺少的功能"
 
-#: src/modules/conf_display/e_int_config_display.c:642
+#: src/modules/conf_display/e_int_config_display.c:641
 #, fuzzy
 msgid ""
 "Your X Display Server is missing support for<br>the <hilight>XRandR</"
@@ -4065,11 +4069,11 @@ msgstr ""
 "援。<br>在這個情況下您無法改變您的螢幕解晰度。這也有可能是因為 "
 "<hilight>ecore</hilight><br>在編譯時沒有偵測到 XRandR。"
 
-#: src/modules/conf_display/e_int_config_display.c:654
+#: src/modules/conf_display/e_int_config_display.c:653
 msgid "No Refresh Rates Found"
 msgstr "找不到可用之更新頻率"
 
-#: src/modules/conf_display/e_int_config_display.c:655
+#: src/modules/conf_display/e_int_config_display.c:654
 msgid ""
 "No refresh rates were reported by your X Display Server.<br>If you are "
 "running a nested X Display Server, then<br>this is to be expected. However, "
@@ -4128,7 +4132,7 @@ msgid "Power Management"
 msgstr "電源管理"
 
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:6
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:12
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:13
 #: 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
@@ -4138,84 +4142,89 @@ msgstr "<ç„¡>"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:7
 msgid ""
 "Please select an edge,<br>or click <hilight>Close</hilight> to abort."
-"<br><br>To change the delay of this action,<br>use the slider:"
+"<br><br>You can either specify a delay of this<br> action using the slider, "
+"or make it<br>respond to edge clicks:"
 msgstr ""
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:105
 #, fuzzy
 msgid "Edge Binding Settings"
 msgstr "快速鍵設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:232
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:258
 #: src/modules/conf_edgebindings/e_mod_main.c:35
 #, fuzzy
 msgid "Edge Bindings"
 msgstr "快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:237
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:263
 #, fuzzy
 msgid "Add Edge"
 msgstr "新增小工具"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:266
 #, fuzzy
 msgid "Delete Edge"
 msgstr "刪除按鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:244
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:270
 #, fuzzy
 msgid "Modify Edge"
 msgstr "修改按鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:248
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:239
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:291
 msgid "Delete All"
 msgstr "全部刪除"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:252
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:278
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:243
 msgid "Restore Default Bindings"
 msgstr "回復成預設快速鍵"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:283
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:248
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:301
 msgid "Action"
 msgstr "動作"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:264
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:290
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:255
 #: src/modules/conf_mousebindings/e_int_config_mousebindings.c:308
 msgid "Action Params"
 msgstr "動作參數"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:274
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:300
 #, fuzzy
 msgid "General Options"
 msgstr "一般設定"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:275
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:301
 #, fuzzy
 msgid "Allow binding activation with fullscreen windows"
 msgstr "允許上移到全螢幕視窗上層"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:816
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #, fuzzy
 msgid "Edge Binding Sequence"
 msgstr "快速鍵序列"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:828
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:857
 #, fuzzy, c-format
 msgid "%.2f seconds"
 msgstr "%2.2f 秒"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1102
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:862
+msgid "Clickable edge"
+msgstr ""
+
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1175
 #, fuzzy
 msgid "Binding Edge Error"
 msgstr "設定快速鍵時發生錯誤"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1103
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1176
 #, fuzzy, c-format
 msgid ""
 "The binding key sequence, that you choose, is already used by <br><hilight>%"
@@ -4224,27 +4233,27 @@ msgstr ""
 "您選擇的快速鍵序列已被 <br><hilight>%s</hilight> 動作使用。<br>請選擇其它快速"
 "鍵序列"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1240
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1313
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1276
-#: src/modules/gadman/e_mod_gadman.c:789
+#: src/modules/gadman/e_mod_gadman.c:811
 msgid "CTRL"
 msgstr "CTRL"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1245
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1318
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1281
-#: src/modules/gadman/e_mod_gadman.c:794
+#: src/modules/gadman/e_mod_gadman.c:816
 msgid "ALT"
 msgstr "ALT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1251
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1324
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1287
-#: src/modules/gadman/e_mod_gadman.c:800
+#: src/modules/gadman/e_mod_gadman.c:822
 msgid "SHIFT"
 msgstr "SHIFT"
 
-#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1257
+#: src/modules/conf_edgebindings/e_int_config_edgebindings.c:1330
 #: src/modules/conf_keybindings/e_int_config_keybindings.c:1293
-#: src/modules/gadman/e_mod_gadman.c:806
+#: src/modules/gadman/e_mod_gadman.c:828
 msgid "WIN"
 msgstr "WIN"
 
@@ -4543,18 +4552,17 @@ msgstr "真的很大"
 msgid "%d pixels"
 msgstr "%d 像素"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:428
+#: src/modules/conf_fonts/e_int_config_fonts.c:427
 msgid "Enable Custom Font Classes"
 msgstr "啟用自訂字型類別"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:435
-#: src/modules/conf_fonts/e_int_config_fonts.c:620
+#: src/modules/conf_fonts/e_int_config_fonts.c:434
 #: 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:452
+#: src/modules/conf_fonts/e_int_config_fonts.c:451
 msgid "Basic preview text: 123: 我的天空!"
 msgstr "Basic preview text: 123: 我的天空!"
 
@@ -4562,38 +4570,53 @@ msgstr "Basic preview text: 123: 我的天空!"
 msgid "Font Classes"
 msgstr "字型類別"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:613
+#: src/modules/conf_fonts/e_int_config_fonts.c:612
 msgid "Enable Font Class"
 msgstr "啟用字型類別"
 
+#: src/modules/conf_fonts/e_int_config_fonts.c:619
+#, fuzzy
+msgid "Font"
+msgstr "å­—åž‹"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:628
+#, fuzzy
+msgid "Style"
+msgstr "樣式"
+
 #: src/modules/conf_fonts/e_int_config_fonts.c:645
+msgid "Advanced Preview Text.. 我真的会写中文"
+msgstr "Advanced Preview Text.. 我真的会写中文"
+
+#: src/modules/conf_fonts/e_int_config_fonts.c:653
 msgid "Hinting"
 msgstr "Hinting"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:648
+#: src/modules/conf_fonts/e_int_config_fonts.c:656
 msgid "Bytecode"
 msgstr "Bytecode"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:652
+#: src/modules/conf_fonts/e_int_config_fonts.c:660
 #: src/modules/cpufreq/e_mod_main.c:227 src/modules/cpufreq/e_mod_main.c:261
 msgid "Automatic"
 msgstr "自動"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:661
+#: src/modules/conf_fonts/e_int_config_fonts.c:669
 msgid "Font Fallbacks"
 msgstr "備用字型"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:662
+#: src/modules/conf_fonts/e_int_config_fonts.c:670
 msgid "Fallback Name"
 msgstr "備用字型名稱"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:674
+#: src/modules/conf_fonts/e_int_config_fonts.c:682
 msgid "Enable Fallbacks"
 msgstr "啟用備用字型"
 
-#: src/modules/conf_fonts/e_int_config_fonts.c:683
-msgid "Advanced Preview Text.. 我真的会写中文"
-msgstr "Advanced Preview Text.. 我真的会写中文"
+#: src/modules/conf_fonts/e_int_config_fonts.c:691
+#, fuzzy
+msgid "Hinting / Fallbacks"
+msgstr "備用字型"
 
 #: src/modules/conf_icon_theme/e_int_config_icon_themes.c:43
 msgid "Icon Theme Settings"
@@ -4607,7 +4630,7 @@ msgstr "圖示主題"
 msgid "Icon theme overrides general theme"
 msgstr ""
 
-#: src/modules/conf_icon_theme/e_mod_main.c:35
+#: src/modules/conf_icon_theme/e_mod_main.c:22
 msgid "Icon Theme"
 msgstr "圖示主題"
 
@@ -4676,7 +4699,7 @@ msgid ""
 msgstr "複製檔案時發生錯誤,Enlightenment 無法匯入組態。"
 
 #: src/modules/conf_imc/e_mod_main.c:34 src/modules/conf_intl/e_mod_main.c:34
-#: src/modules/wizard/page_010.c:140
+#: src/modules/wizard/page_010.c:142
 msgid "Language"
 msgstr "語言"
 
@@ -4851,7 +4874,7 @@ msgid "Autoscroll Cursor Margin"
 msgstr "自動捲動游標邊界"
 
 #: src/modules/conf_menus/e_int_config_menus.c:194
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:160
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
 msgid "Miscellaneous Options"
 msgstr "雜項選項"
 
@@ -5031,26 +5054,26 @@ msgstr "游標大小"
 msgid "Mouse Cursor"
 msgstr "滑鼠游標"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:36
+#: src/modules/conf_mouse/e_int_config_mouse.c:37
 #: src/modules/conf_mouse/e_mod_main.c:35
 #, fuzzy
 msgid "Mouse Settings"
 msgstr "設定模組"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:97
+#: src/modules/conf_mouse/e_int_config_mouse.c:103
 #, fuzzy
 msgid "Mouse Hand"
 msgstr "滑鼠快速鍵"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:105
+#: src/modules/conf_mouse/e_int_config_mouse.c:111
 msgid "Mouse Acceleration"
 msgstr "滑鼠加速"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:107
+#: src/modules/conf_mouse/e_int_config_mouse.c:113
 msgid "Acceleration"
 msgstr "加速"
 
-#: src/modules/conf_mouse/e_int_config_mouse.c:113
+#: src/modules/conf_mouse/e_int_config_mouse.c:119
 msgid "Threshold"
 msgstr "閥值"
 
@@ -5068,7 +5091,7 @@ msgid "Images"
 msgstr "圖片"
 
 #: src/modules/conf_paths/e_int_config_paths.c:79
-#: src/modules/conf_theme/e_int_config_theme.c:1013
+#: src/modules/conf_theme/e_int_config_theme.c:1010
 msgid "Themes"
 msgstr "佈景主題"
 
@@ -5169,36 +5192,36 @@ msgstr "%1.0f ç­†"
 msgid "Performance"
 msgstr "效能"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:56
+#: src/modules/conf_profiles/e_int_config_profiles.c:55
 msgid "Profile Selector"
 msgstr "Profile 選擇器"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:107
+#: src/modules/conf_profiles/e_int_config_profiles.c:106
 msgid "Available Profiles"
 msgstr "可用 Profile"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:116
-#: src/modules/wizard/page_020.c:118
+#: src/modules/conf_profiles/e_int_config_profiles.c:115
+#: src/modules/wizard/page_020.c:121
 #, fuzzy
 msgid "Select a profile"
 msgstr "選擇 Edj 檔"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:125
+#: src/modules/conf_profiles/e_int_config_profiles.c:124
 #, fuzzy
 msgid "Reset"
 msgstr "改變大小"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:281
+#: src/modules/conf_profiles/e_int_config_profiles.c:280
 #, fuzzy, c-format
 msgid "You want to delete the \"%s\" profile.<br><br>Are you sure?"
 msgstr "您要求移除此置物架。<br><br>您是否確定移除?"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:285
+#: src/modules/conf_profiles/e_int_config_profiles.c:284
 #, fuzzy
 msgid "Delete OK?"
 msgstr "刪除按鍵"
 
-#: src/modules/conf_profiles/e_int_config_profiles.c:350
+#: src/modules/conf_profiles/e_int_config_profiles.c:349
 msgid "Add New Profile"
 msgstr "新增 Profile"
 
@@ -5370,24 +5393,24 @@ msgstr "å•Ÿå‹•"
 msgid "Theme Selector"
 msgstr "佈景主題選擇器"
 
-#: src/modules/conf_theme/e_int_config_theme.c:431
+#: src/modules/conf_theme/e_int_config_theme.c:434
 #, fuzzy
 msgid " Import..."
 msgstr "匯入..."
 
-#: src/modules/conf_theme/e_int_config_theme.c:435
+#: src/modules/conf_theme/e_int_config_theme.c:438
 msgid " Online..."
 msgstr ""
 
-#: src/modules/conf_theme/e_int_config_theme.c:1004
+#: src/modules/conf_theme/e_int_config_theme.c:1001
 msgid "Theme Categories"
 msgstr "佈景主題分類"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1022
+#: src/modules/conf_theme/e_int_config_theme.c:1019
 msgid "Assign"
 msgstr "指定"
 
-#: src/modules/conf_theme/e_int_config_theme.c:1028
+#: src/modules/conf_theme/e_int_config_theme.c:1025
 msgid "Clear All"
 msgstr "全部清除"
 
@@ -5442,38 +5465,38 @@ msgid "Wallpaper Settings"
 msgstr "桌布設定"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:546
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:674
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:676
 msgid "Use Theme Wallpaper"
 msgstr "使用佈景主題桌布"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:551
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:679
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:681
 msgid "Picture..."
 msgstr "圖片..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:554
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:682
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:684
 msgid "Gradient..."
 msgstr "漸層..."
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper.c:560
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:688
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:690
 msgid "Online..."
 msgstr ""
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:708
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:710
 msgid "Where to place the Wallpaper"
 msgstr "將桌布置於"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:709
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
 msgid "All Desktops"
 msgstr "所有桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:711
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
 msgid "This Desktop"
 msgstr "此桌面"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper.c:715
 msgid "This Screen"
 msgstr "此螢幕"
 
@@ -5494,14 +5517,14 @@ msgid "Fill Options"
 msgstr "填滿選項"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:167
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:152
-#: src/modules/gadman/e_mod_gadman.c:711
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:153
+#: src/modules/gadman/e_mod_gadman.c:731
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
 #: src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c:172
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:154
-#: src/modules/gadman/e_mod_gadman.c:719
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:155
+#: src/modules/gadman/e_mod_gadman.c:739
 msgid "Vertical"
 msgstr "åž‚ç›´"
 
@@ -5567,40 +5590,40 @@ msgstr "使用原始檔案"
 msgid "%3.0f%%"
 msgstr "%3.0f%%"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:274
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:275
 msgid "Select a Picture..."
 msgstr "選擇圖片..."
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:607
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:613
 msgid "Picture Import Error"
 msgstr "圖片匯入時發生錯誤"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:608
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:614
 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:698
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:708
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:793
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:803
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:702
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:712
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:795
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:805
 msgid "Wallpaper Import Error"
 msgstr "匯入桌布時發生錯誤"
 
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:699
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:794
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:703
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:796
 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:709
-#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:804
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:713
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_import.c:806
 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:118
+#: src/modules/conf_wallpaper/e_int_config_wallpaper_web.c:117
 #, fuzzy
 msgid "Exchange wallpapers"
 msgstr "佈景主題桌布"
@@ -5713,14 +5736,6 @@ msgstr "偏好使用者自訂圖示"
 msgid "Prefer application provided icon"
 msgstr "偏好程式內建圖示"
 
-#: src/modules/conf_window_display/e_int_config_window_display.c:278
-msgid "Internal Windows"
-msgstr "內部視窗"
-
-#: src/modules/conf_window_display/e_int_config_window_display.c:280
-msgid "Always remember internal windows"
-msgstr "總是記住內部視窗"
-
 #: src/modules/conf_window_focus/e_int_config_focus.c:50
 msgid "Focus Settings"
 msgstr "焦點設定"
@@ -5859,17 +5874,12 @@ msgid "Window Maximize Policy"
 msgstr "最大化原則"
 
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:119
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:142
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:143
 msgid "Smart expansion"
 msgstr "智慧型展開"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:121
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:144
-msgid "Expand the window"
-msgstr "展開視窗"
-
 #: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:123
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:146
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:147
 msgid "Fill available space"
 msgstr "填滿可用空間"
 
@@ -5877,20 +5887,20 @@ msgstr "填滿可用空間"
 msgid "Maximize Policy"
 msgstr "最大化原則"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:150
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:151
 #, fuzzy
 msgid "Maximize Directions"
 msgstr "水平最大化"
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:156
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:157
 msgid "Both"
 msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:161
-msgid "Allow window manipulation"
-msgstr "允許視窗操作"
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:166
+msgid "Allow manipulation of maximized windows"
+msgstr ""
 
-#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:163
+#: src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c:170
 msgid "Automatically move/resize windows on shelf autohide"
 msgstr "當置物架自動隱藏時移動或改變視窗大小"
 
@@ -5930,58 +5940,68 @@ msgstr "移動或改變視窗大小時自動上移"
 msgid "Raise when clicking to focus"
 msgstr "點擊取得焦點時自動上移"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:29
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:93
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:33
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:117
 #: 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:95
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:119
+#, fuzzy
+msgid "Remember internal dialogs"
+msgstr "總是記住內部視窗"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#, fuzzy
+msgid "Remember fileman windows"
+msgstr "記住這個視窗"
+
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:124
 #, fuzzy
 msgid "Delete Remember(s)"
 msgstr "設定記憶值"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:105
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:134
 #, fuzzy
 msgid "Details"
 msgstr "預設值"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:108
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:269
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:137
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:297
 #, fuzzy
 msgid "<No Name>"
 msgstr "圖示名稱"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:111
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:140
 #, fuzzy
 msgid "Class:"
 msgstr "類別"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:113
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:271
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:142
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:299
 #, fuzzy
 msgid "<No Class>"
 msgstr "類別"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:116
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:145
 #, fuzzy
 msgid "Title:"
 msgstr "標題"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:118
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:273
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:147
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:301
 #, fuzzy
 msgid "<No Title>"
 msgstr "標題"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:121
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:150
 #, fuzzy
 msgid "Role:"
 msgstr "角色"
 
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:123
-#: src/modules/conf_window_remembers/e_int_config_remembers.c:275
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:152
+#: src/modules/conf_window_remembers/e_int_config_remembers.c:303
 #, fuzzy
 msgid "<No Role>"
 msgstr "<ç„¡>"
@@ -6357,7 +6377,7 @@ msgid "Show Toolbar"
 msgstr "陰影顏色"
 
 #: src/modules/fileman/e_mod_config.c:267
-#: src/modules/gadman/e_mod_gadman.c:755
+#: src/modules/gadman/e_mod_gadman.c:775
 msgid "Behavior"
 msgstr ""
 
@@ -6374,98 +6394,98 @@ msgstr ""
 msgid "Open filemanager on mount"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:1463
+#: src/modules/fileman/e_fwin.c:1412
 msgid "Go to Parent Directory"
 msgstr "到上一層目錄"
 
-#: src/modules/fileman/e_fwin.c:1525
+#: src/modules/fileman/e_fwin.c:1474
 #, fuzzy
 msgid "Other application..."
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:1544 src/modules/fileman/e_fwin.c:1875
+#: src/modules/fileman/e_fwin.c:1493 src/modules/fileman/e_fwin.c:1820
 msgid "Open"
 msgstr "é–‹å•Ÿ"
 
-#: src/modules/fileman/e_fwin.c:1549 src/modules/fileman/e_fwin.c:1873
+#: src/modules/fileman/e_fwin.c:1498 src/modules/fileman/e_fwin.c:1818
 msgid "Open with..."
 msgstr "以特定程式開啟..."
 
-#: src/modules/fileman/e_fwin.c:1893
+#: src/modules/fileman/e_fwin.c:1838
 #, fuzzy
 msgid "Known Applications"
 msgstr "應用程式"
 
-#: src/modules/fileman/e_fwin.c:1903
+#: src/modules/fileman/e_fwin.c:1848
 msgid "Specific Applications"
 msgstr "特定應用程式"
 
-#: src/modules/fileman/e_fwin.c:1945
+#: src/modules/fileman/e_fwin.c:1890
 #, fuzzy
 msgid "Custom Command"
 msgstr "執行指令"
 
-#: src/modules/fileman/e_fwin.c:2201
+#: src/modules/fileman/e_fwin.c:2146
 #: src/modules/fileman_opinfo/e_mod_main.c:94
 #, c-format
 msgid "Copying is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2204
+#: src/modules/fileman/e_fwin.c:2149
 #: src/modules/fileman_opinfo/e_mod_main.c:97
 #, c-format
 msgid "Moving is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2207
+#: src/modules/fileman/e_fwin.c:2152
 #: src/modules/fileman_opinfo/e_mod_main.c:100
 #, c-format
 msgid "Deleting is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2210
+#: src/modules/fileman/e_fwin.c:2155
 #: src/modules/fileman_opinfo/e_mod_main.c:103
 #, c-format
 msgid "Unknown operation from slave is aborted"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2220
+#: src/modules/fileman/e_fwin.c:2165
 #: src/modules/fileman_opinfo/e_mod_main.c:113
 #, c-format
 msgid "Copy of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2222
+#: src/modules/fileman/e_fwin.c:2167
 #: src/modules/fileman_opinfo/e_mod_main.c:115
 #, c-format
 msgid "Copying %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2226
+#: src/modules/fileman/e_fwin.c:2171
 #: src/modules/fileman_opinfo/e_mod_main.c:119
 #, c-format
 msgid "Move of %s done"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2228
+#: src/modules/fileman/e_fwin.c:2173
 #: src/modules/fileman_opinfo/e_mod_main.c:121
 #, c-format
 msgid "Moving %s (eta: %d sec)"
 msgstr ""
 
-#: src/modules/fileman/e_fwin.c:2232
+#: src/modules/fileman/e_fwin.c:2177
 #: src/modules/fileman_opinfo/e_mod_main.c:125
 #, fuzzy, c-format
 msgid "Delete done"
 msgstr "刪除按鍵"
 
-#: src/modules/fileman/e_fwin.c:2234
+#: src/modules/fileman/e_fwin.c:2179
 #: src/modules/fileman_opinfo/e_mod_main.c:127
 #, fuzzy, c-format
 msgid "Deleting files..."
 msgstr "desktop 檔"
 
-#: src/modules/fileman/e_fwin.c:2237
+#: src/modules/fileman/e_fwin.c:2182
 #: src/modules/fileman_opinfo/e_mod_main.c:130
 #, c-format
 msgid "Unknow operation from slave %d"
@@ -6492,17 +6512,17 @@ msgstr ""
 msgid "To: %s"
 msgstr ""
 
-#: src/modules/fileman_opinfo/e_mod_main.c:330
+#: src/modules/fileman_opinfo/e_mod_main.c:329
 #, fuzzy, c-format
 msgid "Processing %d operation(s)"
 msgstr "隱藏持續時間"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:334
+#: src/modules/fileman_opinfo/e_mod_main.c:333
 #, fuzzy
 msgid "Filemanager is idle"
 msgstr "檔案管理員"
 
-#: src/modules/fileman_opinfo/e_mod_main.c:415
+#: src/modules/fileman_opinfo/e_mod_main.c:414
 msgid "EFM Operation Info"
 msgstr ""
 
@@ -6547,21 +6567,21 @@ msgstr "背景"
 msgid "Gadgets"
 msgstr "Widgets"
 
-#: src/modules/gadman/e_mod_gadman.c:703
+#: src/modules/gadman/e_mod_gadman.c:723
 #, fuzzy
 msgid "Free"
 msgstr "法羅文"
 
-#: src/modules/gadman/e_mod_gadman.c:735
+#: src/modules/gadman/e_mod_gadman.c:755
 #, fuzzy
 msgid "Always on desktop"
 msgstr "最上層顯示"
 
-#: src/modules/gadman/e_mod_gadman.c:745
+#: src/modules/gadman/e_mod_gadman.c:765
 msgid "On top pressing"
 msgstr ""
 
-#: src/modules/gadman/e_mod_gadman.c:774
+#: src/modules/gadman/e_mod_gadman.c:796
 #, fuzzy
 msgid "Add other gadgets"
 msgstr "新增小工具"
@@ -6601,7 +6621,7 @@ msgstr "選取的 Bar source"
 msgid "Icon Labels"
 msgstr "圖示標籤"
 
-#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:101
+#: src/modules/ibar/e_mod_config.c:124 src/modules/ibox/e_mod_config.c:100
 msgid "Show Icon Label"
 msgstr "顯示圖示標籤"
 
@@ -6662,45 +6682,45 @@ msgstr "建立圖示"
 msgid "Add Application"
 msgstr "新增應用程式"
 
-#: src/modules/ibox/e_mod_config.c:52
+#: src/modules/ibox/e_mod_config.c:51
 #, fuzzy
 msgid "IBox Settings"
 msgstr "登入方塊設定"
 
-#: src/modules/ibox/e_mod_config.c:105
+#: src/modules/ibox/e_mod_config.c:104
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/modules/ibox/e_mod_config.c:110
+#: src/modules/ibox/e_mod_config.c:109
 msgid "Display Title"
 msgstr "顯示標題"
 
-#: src/modules/ibox/e_mod_config.c:115
+#: src/modules/ibox/e_mod_config.c:114
 msgid "Display Class"
 msgstr "顯示類別"
 
-#: src/modules/ibox/e_mod_config.c:120
+#: src/modules/ibox/e_mod_config.c:119
 msgid "Display Icon Name"
 msgstr "顯示圖示名稱"
 
-#: src/modules/ibox/e_mod_config.c:125
+#: src/modules/ibox/e_mod_config.c:124
 #, fuzzy
 msgid "Display Border Caption"
 msgstr "顯示資訊"
 
-#: src/modules/ibox/e_mod_config.c:155
+#: src/modules/ibox/e_mod_config.c:154
 msgid "Show windows from all screens"
 msgstr "顯示所有螢幕上的視窗"
 
-#: src/modules/ibox/e_mod_config.c:160
+#: src/modules/ibox/e_mod_config.c:159
 msgid "Show windows from current screen"
 msgstr "顯示目前螢幕上的視窗"
 
-#: src/modules/ibox/e_mod_config.c:169
+#: src/modules/ibox/e_mod_config.c:168
 msgid "Show windows from all desktops"
 msgstr "顯示所有桌面上的視窗"
 
-#: src/modules/ibox/e_mod_config.c:174
+#: src/modules/ibox/e_mod_config.c:173
 msgid "Show windows from active desktop"
 msgstr "顯示目前桌面上的視窗"
 
@@ -6721,12 +6741,12 @@ msgstr "滑鼠捲動時切換桌面"
 msgid "Show desktop names"
 msgstr "顯示桌面圖示"
 
-#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:203
+#: src/modules/pager/e_mod_config.c:128 src/modules/pager/e_mod_config.c:205
 #, fuzzy
 msgid "Popup Settings"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:204
+#: src/modules/pager/e_mod_config.c:129 src/modules/pager/e_mod_config.c:206
 #, fuzzy
 msgid "Show popup on desktop change"
 msgstr "切換桌面時顯示彈出訊息"
@@ -6736,75 +6756,75 @@ msgstr "切換桌面時顯示彈出訊息"
 msgid "Show popup for urgent windows"
 msgstr "在緊急視窗上顯示彈出訊息"
 
-#: src/modules/pager/e_mod_config.c:167
+#: src/modules/pager/e_mod_config.c:169
 msgid "Select and Slide button"
 msgstr "選取與滑動按鍵"
 
-#: src/modules/pager/e_mod_config.c:169 src/modules/pager/e_mod_config.c:176
-#: src/modules/pager/e_mod_config.c:183 src/modules/pager/e_mod_config.c:401
-#: src/modules/pager/e_mod_config.c:406 src/modules/pager/e_mod_config.c:411
+#: src/modules/pager/e_mod_config.c:171 src/modules/pager/e_mod_config.c:178
+#: src/modules/pager/e_mod_config.c:185 src/modules/pager/e_mod_config.c:403
+#: src/modules/pager/e_mod_config.c:408 src/modules/pager/e_mod_config.c:413
 #, c-format
 msgid "Click to set"
 msgstr "點擊以設定"
 
-#: src/modules/pager/e_mod_config.c:174
+#: src/modules/pager/e_mod_config.c:176
 #, fuzzy
 msgid "Drag and Drop button"
 msgstr "拖放按鍵 (保持相對位置)"
 
-#: src/modules/pager/e_mod_config.c:181
+#: src/modules/pager/e_mod_config.c:183
 #, fuzzy
 msgid "Drag whole desktop"
 msgstr "虛擬桌面"
 
-#: src/modules/pager/e_mod_config.c:190
+#: src/modules/pager/e_mod_config.c:192
 msgid "Keyaction popup height"
 msgstr ""
 
-#: src/modules/pager/e_mod_config.c:192 src/modules/pager/e_mod_config.c:198
-#: src/modules/pager/e_mod_config.c:211
+#: src/modules/pager/e_mod_config.c:194 src/modules/pager/e_mod_config.c:200
+#: src/modules/pager/e_mod_config.c:213
 #, c-format
 msgid "%.0f px"
 msgstr "%.0f 像素"
 
-#: src/modules/pager/e_mod_config.c:196
+#: src/modules/pager/e_mod_config.c:198
 msgid "Resistance to dragging"
 msgstr "拖曳阻力"
 
-#: src/modules/pager/e_mod_config.c:207
+#: src/modules/pager/e_mod_config.c:209
 #, fuzzy
 msgid "Popup pager height"
 msgstr "彈出訊息速度"
 
-#: src/modules/pager/e_mod_config.c:216 src/modules/pager/e_mod_config.c:236
+#: src/modules/pager/e_mod_config.c:218 src/modules/pager/e_mod_config.c:238
 #, fuzzy
 msgid "Popup speed"
 msgstr "彈出訊息速度"
 
-#: src/modules/pager/e_mod_config.c:220 src/modules/pager/e_mod_config.c:238
+#: src/modules/pager/e_mod_config.c:222 src/modules/pager/e_mod_config.c:240
 #, c-format
 msgid "%1.1f seconds"
 msgstr "%1.1f 秒"
 
-#: src/modules/pager/e_mod_config.c:229
+#: src/modules/pager/e_mod_config.c:231
 #, fuzzy
 msgid "Urgent Window Settings"
 msgstr "視窗列表設定"
 
-#: src/modules/pager/e_mod_config.c:230
+#: src/modules/pager/e_mod_config.c:232
 #, fuzzy
 msgid "Show popup on urgent window"
 msgstr "在緊急視窗上顯示彈出訊息"
 
-#: src/modules/pager/e_mod_config.c:233
+#: src/modules/pager/e_mod_config.c:235
 msgid "Popup on urgent window sticks on the screen"
 msgstr "將緊急視窗上的彈出訊息相黏於螢幕上"
 
-#: src/modules/pager/e_mod_config.c:286
+#: src/modules/pager/e_mod_config.c:288
 msgid "Pager Button Grab"
 msgstr "桌面切換器按鍵擷取"
 
-#: src/modules/pager/e_mod_config.c:288
+#: src/modules/pager/e_mod_config.c:290
 msgid ""
 "Please press a mouse button<br>Press <hilight>Escape</hilight> to abort."
 "<br>Or <hilight>Del</hilight> to reset the button."
@@ -6812,12 +6832,12 @@ msgstr ""
 "請按下任一滑鼠鍵。<br>按下 <hilight>Escape</hilight> 以放棄。<br>或按下 "
 "<hilight>Del</hilight> 以重設此按鍵。"
 
-#: src/modules/pager/e_mod_config.c:343
+#: src/modules/pager/e_mod_config.c:345
 #, fuzzy
 msgid "Attetion"
 msgstr "動作"
 
-#: src/modules/pager/e_mod_config.c:344
+#: src/modules/pager/e_mod_config.c:346
 #, fuzzy
 msgid ""
 "You cannot use the right mouse button in the<br>shelf for this as it is "
@@ -6825,33 +6845,33 @@ msgid ""
 "works in the Popup"
 msgstr "您不能使用滑鼠右鍵。<br>本程式內部已將滑鼠右鍵用於彈出式選單。"
 
-#: src/modules/pager/e_mod_config.c:403 src/modules/pager/e_mod_config.c:408
-#: src/modules/pager/e_mod_config.c:413
+#: src/modules/pager/e_mod_config.c:405 src/modules/pager/e_mod_config.c:410
+#: src/modules/pager/e_mod_config.c:415
 #, c-format
 msgid "Button %i"
 msgstr "按鈕 %i"
 
-#: src/modules/pager/e_mod_main.c:2844
+#: src/modules/pager/e_mod_main.c:2850
 #, fuzzy
 msgid "Show Pager Popup"
 msgstr "桌面切換器彈出訊息設定"
 
-#: src/modules/pager/e_mod_main.c:2851 src/modules/pager/e_mod_main.c:2890
+#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2896
 #, fuzzy
 msgid "Popup Desk Right"
 msgstr "切換到右方桌面"
 
-#: src/modules/pager/e_mod_main.c:2853 src/modules/pager/e_mod_main.c:2891
+#: src/modules/pager/e_mod_main.c:2859 src/modules/pager/e_mod_main.c:2897
 #, fuzzy
 msgid "Popup Desk Left"
 msgstr "切換到左方桌面"
 
-#: src/modules/pager/e_mod_main.c:2855 src/modules/pager/e_mod_main.c:2892
+#: src/modules/pager/e_mod_main.c:2861 src/modules/pager/e_mod_main.c:2898
 #, fuzzy
 msgid "Popup Desk Up"
 msgstr "切換到上方桌面"
 
-#: src/modules/pager/e_mod_main.c:2857 src/modules/pager/e_mod_main.c:2893
+#: src/modules/pager/e_mod_main.c:2863 src/modules/pager/e_mod_main.c:2899
 #, fuzzy
 msgid "Popup Desk Down"
 msgstr "切換到下方桌面"
@@ -6979,7 +6999,7 @@ msgstr "%1.0f F"
 msgid "%1.0f C"
 msgstr "%1.0f C"
 
-#: src/modules/temperature/e_mod_main.c:148
+#: src/modules/temperature/e_mod_main.c:147
 msgid "Temperature"
 msgstr "温度"
 
@@ -6992,17 +7012,17 @@ msgstr "下一步"
 msgid "Welcome to Enlightenment"
 msgstr "歡迎來到 Enlightenment 東京"
 
-#: src/modules/wizard/page_010.c:141 src/modules/wizard/page_020.c:56
+#: src/modules/wizard/page_010.c:143 src/modules/wizard/page_020.c:59
 #, fuzzy
 msgid "Select one"
 msgstr "選擇圖示"
 
-#: src/modules/wizard/page_020.c:55
+#: src/modules/wizard/page_020.c:58
 #, fuzzy
 msgid "Profile"
 msgstr "Profiles"
 
-#: src/modules/wizard/page_030.c:89
+#: src/modules/wizard/page_030.c:91
 msgid ""
 "No menu files were<br>found on your system.<br>Please see "
 "the<br>documentation on<br>www.enlightenment.org<br>for more details "
@@ -7058,17 +7078,17 @@ msgstr "點擊以取得焦點 "
 msgid "Mouse over focuses windows"
 msgstr ""
 
-#: src/modules/wizard/page_070.c:200
+#: src/modules/wizard/page_070.c:204
 #, fuzzy
 msgid "Select Icons to Add"
 msgstr "選擇圖示"
 
-#: src/modules/wizard/page_080.c:62
+#: src/modules/wizard/page_080.c:60
 #, fuzzy
 msgid "Quick Launch"
 msgstr "å•Ÿå‹•"
 
-#: src/modules/wizard/page_080.c:64
+#: src/modules/wizard/page_080.c:62
 #, fuzzy
 msgid "Select Applications"
 msgstr "特定應用程式"
@@ -7211,19 +7231,55 @@ msgstr "特定應用程式"
 msgid "Networks"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:890
+#: src/modules/systray/e_mod_main.c:891
 msgid "Another systray exists"
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:891
+#: src/modules/systray/e_mod_main.c:892
 msgid "There can be only one systray gadget and another one already exists."
 msgstr ""
 
-#: src/modules/systray/e_mod_main.c:1093
+#: src/modules/systray/e_mod_main.c:1094
 #, fuzzy
 msgid "Systray"
 msgstr "系統"
 
+#~ msgid ""
+#~ "You are trying to ask Enlightenment to remember to apply<br>properties "
+#~ "(such as size, location, border style etc.) to<br>a window that "
+#~ "<hilight>does not have unique properties</hilight>.<br><br>This means it "
+#~ "shares Name/Class, Transience, Role etc. properties<br>with more than 1 "
+#~ "other window on the screen and remembering<br>properties for this window "
+#~ "will apply to all other windows<br>that match these properties."
+#~ "<br><br>You may wish to enable the <hilight>Match only one window</"
+#~ "hilight> option if<br>you only intend one instance of this window to be "
+#~ "modified, with<br>additional instances not being modified.<br><br>This is "
+#~ "just a warning in case you did not intend this to happen.<br>If you did, "
+#~ "simply press <hilight>Apply</hilight> or <hilight>OK</hilight> "
+#~ "buttons<br>and your settings will be accepted. Press <hilight>Cancel</"
+#~ "hilight> if you<br>are not sure and nothing will be affected."
+#~ msgstr ""
+#~ "您正嘗試要 Enlightment 套用屬性<br>(例如大小、位置、邊界樣式等等)<br>到"
+#~ "一個<hilight>沒有獨立屬性</hilight>的視窗。<br><br>這表示它與一個以上螢幕"
+#~ "上的視窗分享名稱/類別,Transience,<br>角色等等屬性,而此一視窗的設定會套用"
+#~ "到所有符合這些屬性的視窗上。<br><br>你也許會想開啟<hilight>只匹配單一視窗"
+#~ "</hilight>的選項,<br>如果你這只希望這個視窗被改變。<br><br>這只是個警告,"
+#~ "以防這並不是您預期的行為。如果這的確是,<br>你只需按下<hilight>套用</"
+#~ "hilight>或者<hilight>確定</hilight>則你的設定就會被接受。<br>如果你不確"
+#~ "定,按下<hilight>取消</hilight>就全無影響。"
+
+#~ msgid "Window name and class"
+#~ msgstr "視窗名稱與類別"
+
+#~ msgid "Internal Windows"
+#~ msgstr "內部視窗"
+
+#~ msgid "Expand the window"
+#~ msgstr "展開視窗"
+
+#~ msgid "Allow window manipulation"
+#~ msgstr "允許視窗操作"
+
 #, fuzzy
 #~ msgid "idle"
 #~ msgstr "並排"
@@ -8946,9 +9002,6 @@ msgstr "系統"
 #~ msgid "Window"
 #~ msgstr "視窗"
 
-#~ msgid "Window Name"
-#~ msgstr "視窗名稱"
-
 #~ msgid "Window Title"
 #~ msgstr "視窗標題"
 
@@ -9277,9 +9330,6 @@ msgstr "系統"
 #~ msgid "Lifespan"
 #~ msgstr "生命周期"
 
-#~ msgid "Remember This Window"
-#~ msgstr "記住這個視窗"
-
 #~ msgid "Remember This Instance Only"
 #~ msgstr "只記住這個實體"
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 86f70d7..92891bb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -319,6 +319,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -332,8 +333,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -439,7 +440,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1cf5375..f59ec9e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,7 +16,6 @@ INCLUDES = -I$(top_srcdir) \
 
 bin_PROGRAMS = \
 enlightenment \
-enlightenment_remote \
 enlightenment_imc \
 enlightenment_start \
 enlightenment_fm_open
@@ -33,8 +32,6 @@ ENLIGHTENMENTHEADERS = \
 e.h \
 e_includes.h \
 e_mmx.h \
-e_ipc_handlers.h \
-e_ipc_handlers_list.h \
 e_user.h \
 e_manager.h \
 e_path.h \
@@ -318,13 +315,6 @@ $(enlightenment_src)
 enlightenment_LDFLAGS = -export-dynamic
 enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
 
-enlightenment_remote_SOURCES = \
-e.h \
-e_ipc_codec.c \
-e_remote_main.c
-
-enlightenment_remote_LDADD = @E_REMOTE_LIBS@
-
 enlightenment_imc_SOURCES = \
 e.h \
 e_intl_data.c \
diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in
index caa4c88..9007d1f 100644
--- a/src/bin/Makefile.in
+++ b/src/bin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33,9 +33,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = enlightenment$(EXEEXT) enlightenment_remote$(EXEEXT) \
-	enlightenment_imc$(EXEEXT) enlightenment_start$(EXEEXT) \
-	enlightenment_fm_open$(EXEEXT)
+bin_PROGRAMS = enlightenment$(EXEEXT) enlightenment_imc$(EXEEXT) \
+	enlightenment_start$(EXEEXT) enlightenment_fm_open$(EXEEXT)
 internal_bin_PROGRAMS = enlightenment_init$(EXEEXT) \
 	enlightenment_fm$(EXEEXT) enlightenment_fm_op$(EXEEXT) \
 	enlightenment_sys$(EXEEXT) enlightenment_thumb$(EXEEXT)
@@ -157,10 +156,6 @@ am_enlightenment_init_OBJECTS = e_init_main.$(OBJEXT) \
 	e_xinerama.$(OBJEXT)
 enlightenment_init_OBJECTS = $(am_enlightenment_init_OBJECTS)
 enlightenment_init_DEPENDENCIES =
-am_enlightenment_remote_OBJECTS = e_ipc_codec.$(OBJEXT) \
-	e_remote_main.$(OBJEXT)
-enlightenment_remote_OBJECTS = $(am_enlightenment_remote_OBJECTS)
-enlightenment_remote_DEPENDENCIES =
 am_enlightenment_start_OBJECTS = e_start_main.$(OBJEXT)
 enlightenment_start_OBJECTS = $(am_enlightenment_start_OBJECTS)
 enlightenment_start_DEPENDENCIES =
@@ -186,15 +181,13 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(enlightenment_SOURCES) $(enlightenment_fm_SOURCES) \
 	$(enlightenment_fm_op_SOURCES) \
 	$(enlightenment_fm_open_SOURCES) $(enlightenment_imc_SOURCES) \
-	$(enlightenment_init_SOURCES) $(enlightenment_remote_SOURCES) \
-	$(enlightenment_start_SOURCES) $(enlightenment_sys_SOURCES) \
-	$(enlightenment_thumb_SOURCES)
+	$(enlightenment_init_SOURCES) $(enlightenment_start_SOURCES) \
+	$(enlightenment_sys_SOURCES) $(enlightenment_thumb_SOURCES)
 DIST_SOURCES = $(enlightenment_SOURCES) $(enlightenment_fm_SOURCES) \
 	$(enlightenment_fm_op_SOURCES) \
 	$(enlightenment_fm_open_SOURCES) $(enlightenment_imc_SOURCES) \
-	$(enlightenment_init_SOURCES) $(enlightenment_remote_SOURCES) \
-	$(enlightenment_start_SOURCES) $(enlightenment_sys_SOURCES) \
-	$(enlightenment_thumb_SOURCES)
+	$(enlightenment_init_SOURCES) $(enlightenment_start_SOURCES) \
+	$(enlightenment_sys_SOURCES) $(enlightenment_thumb_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -462,6 +455,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -486,8 +480,6 @@ ENLIGHTENMENTHEADERS = \
 e.h \
 e_includes.h \
 e_mmx.h \
-e_ipc_handlers.h \
-e_ipc_handlers_list.h \
 e_user.h \
 e_manager.h \
 e_path.h \
@@ -770,12 +762,6 @@ $(enlightenment_src)
 
 enlightenment_LDFLAGS = -export-dynamic
 enlightenment_LDADD = @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
-enlightenment_remote_SOURCES = \
-e.h \
-e_ipc_codec.c \
-e_remote_main.c
-
-enlightenment_remote_LDADD = @E_REMOTE_LIBS@
 enlightenment_imc_SOURCES = \
 e.h \
 e_intl_data.c \
@@ -836,8 +822,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -935,9 +921,6 @@ enlightenment_imc$(EXEEXT): $(enlightenment_imc_OBJECTS) $(enlightenment_imc_DEP
 enlightenment_init$(EXEEXT): $(enlightenment_init_OBJECTS) $(enlightenment_init_DEPENDENCIES) 
 	@rm -f enlightenment_init$(EXEEXT)
 	$(LINK) $(enlightenment_init_OBJECTS) $(enlightenment_init_LDADD) $(LIBS)
-enlightenment_remote$(EXEEXT): $(enlightenment_remote_OBJECTS) $(enlightenment_remote_DEPENDENCIES) 
-	@rm -f enlightenment_remote$(EXEEXT)
-	$(LINK) $(enlightenment_remote_OBJECTS) $(enlightenment_remote_LDADD) $(LIBS)
 enlightenment_start$(EXEEXT): $(enlightenment_start_OBJECTS) $(enlightenment_start_DEPENDENCIES) 
 	@rm -f enlightenment_start$(EXEEXT)
 	$(LINK) $(enlightenment_start_OBJECTS) $(enlightenment_start_LDADD) $(LIBS)
@@ -1039,7 +1022,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_powersave.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_prefix.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_remember.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_remote_main.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_resist.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_scale.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_screensaver.Po at am__quote@
@@ -1236,7 +1218,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/bin/e.h b/src/bin/e.h
index 708aad4..5c19be7 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -126,14 +126,12 @@ typedef struct _E_Rect E_Rect;
     { \
        if (list) \
 	 { \
-	    Eina_List *tmp; \
-	    tmp = list; \
-	    list = NULL; \
-	    while (tmp) \
+	    void *data; \
+	    EINA_LIST_FREE(list, data) \
 	      { \
-		 free(tmp->data); \
-		 tmp = eina_list_remove_list(tmp, tmp); \
+		 free(data); \
 	      } \
+	    list = NULL; \
 	 } \
     } \
   while (0)
diff --git a/src/bin/e_about.c b/src/bin/e_about.c
index a39e490..b5dde1e 100644
--- a/src/bin/e_about.c
+++ b/src/bin/e_about.c
@@ -23,7 +23,7 @@ e_about_new(E_Container *con)
    e_obj_dialog_obj_part_text_set
      (od, "e.textblock.about",
       _(
-	"Copyright &copy; 1999-2008, by the Enlightenment Development Team.<br>"
+	"Copyright &copy; 1999-2009, by the Enlightenment Development Team.<br>"
 	"<br>"
 	"We hope you enjoy using this software as much as we enjoyed "
 	"writing it.<br>"
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 0378bbf..494ae09 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1233,6 +1233,8 @@ ACT_FN_GO_EDGE(desk_flip_in_direction)
 	     wev->curr.x = offset;
 	  }
 	 break;
+      default:
+	 break;
      }
 
    current = e_desk_current_get(zone);
@@ -1286,12 +1288,9 @@ ACT_FN_GO(desk_linear_flip_to)
   E_Container *con;		   \
   E_Manager *man;				\
   \
-  for (lm = e_manager_list(); lm; lm = lm->next) {		 \
-    man = lm->data;					   \
-    for (lc = man->containers; lc; lc = lc->next) {	   \
-      con = lc->data;					   \
-      for (lz = con->zones; lz; lz = lz->next) {	   \
-	zone = lz->data;				   \
+  EINA_LIST_FOREACH(e_manager_list(), lm, man) {	   \
+    EINA_LIST_FOREACH(man->containers, lc, con) {	   \
+      EINA_LIST_FOREACH(con->zones, lz, zone) {		   \
 	act;						   \
       }							   \
     }							   \
@@ -1441,26 +1440,20 @@ if ((con_num < 0) || (zone_num < 0)) { \
    E_Manager *man; \
    if ((con_num >= 0) && (zone_num < 0)) /* con=1 zone=all */ { \
 	con = e_util_container_number_get(con_num); \
-	for (l = con->zones; l; l = l->next) { \
-	   zone = l->data; \
+	EINA_LIST_FOREACH(con->zones, l, zone) { \
 	   act; \
 	} } \
    else if ((con_num < 0) && (zone_num >= 0)) /* con=all zone=1 */ { \
-	for (l = e_manager_list(); l; l = l->next) { \
-	   man = l->data; \
-	   for (ll = man->containers; ll; ll = ll->next) { \
-	      con = ll->data; \
+	EINA_LIST_FOREACH(e_manager_list(), l, man) { \
+	   EINA_LIST_FOREACH(man->containers, ll, con) { \
 	      zone = e_container_zone_number_get(con, zone_num); \
 	      if (zone) \
 		act; \
 	   } } } \
    else if ((con_num < 0) && (zone_num < 0)) /* con=all zone=all */ { \
-      for (l = e_manager_list(); l; l = l->next) { \
-	 man = l->data; \
-	 for (ll = man->containers; ll; ll = ll->next) { \
-	    con = ll->data; \
-	    for (lll = con->zones; lll; lll = lll->next) { \
-	       zone = lll->data; \
+      EINA_LIST_FOREACH(e_manager_list(), l, man) { \
+	 EINA_LIST_FOREACH(man->containers, ll, con) { \
+	    EINA_LIST_FOREACH(con->zones, lll, zone) { \
 	       act; \
 	    } } } } } \
 else { \
@@ -2212,6 +2205,65 @@ ACT_FN_GO(shelf_show)
      }
 }
 /***************************************************************************/
+#define ACT_SHELF_SHOW(params, es) \
+if ((!params) || (params && (fnmatch(params, es->name, 0) == 0))) \
+  { \
+     e_shelf_toggle(es, 1); \
+     e_shelf_toggle(es, 0); \
+  }
+ACT_FN_GO_EDGE(shelf_show)
+{
+   Eina_List *l;
+   E_Shelf *es;
+
+   if (params)
+     {
+	for (; *params != '\0'; params++)
+	  if (!isspace(*params))
+	    break;
+	if (*params == '\0')
+	  params = NULL;
+     }
+
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
+     {
+	switch(ev->edge)
+	  {
+	   case E_ZONE_EDGE_LEFT:
+	      if ((es->gadcon->orient == E_GADCON_ORIENT_LEFT ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_LT ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_LB) &&
+		  (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
+		ACT_SHELF_SHOW(params, es);
+	      break;
+	   case E_ZONE_EDGE_RIGHT:
+	      if ((es->gadcon->orient == E_GADCON_ORIENT_RIGHT ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_RT ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_RB) &&
+		  (ev->y >= es->y) && (ev->y <= (es->y + es->h)))
+		ACT_SHELF_SHOW(params, es);
+	      break;
+	   case E_ZONE_EDGE_TOP:
+	      if ((es->gadcon->orient == E_GADCON_ORIENT_TOP ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_TL ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_TR) &&
+		  (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
+		ACT_SHELF_SHOW(params, es);
+	      break;
+	   case E_ZONE_EDGE_BOTTOM:
+	      if ((es->gadcon->orient == E_GADCON_ORIENT_BOTTOM ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_BL ||
+		   es->gadcon->orient == E_GADCON_ORIENT_CORNER_BR) &&
+		  (ev->x >= es->x) && (ev->x <= (es->x + es->w)))
+		ACT_SHELF_SHOW(params, es);
+	      break;
+	   default:
+	      break;
+	  }
+     }
+}
+#undef ACT_SHELF_SHOW
+/***************************************************************************/
 
 typedef struct _Delayed_Action     Delayed_Action;
 
@@ -2367,12 +2419,10 @@ static void
 _delayed_action_key_del(E_Object *obj, const char *params, Ecore_Event_Key *ev)
 {
    Eina_List *l;
-   
-   for (l = _delayed_actions; l; l = l->next)
+   Delayed_Action *da;
+  
+   EINA_LIST_FOREACH(_delayed_actions, l, da) 
      {
-	Delayed_Action *da;
-	
-	da = l->data;
 	if ((da->obj == obj) && (!da->mouse) && 
 	    (!strcmp(da->keyname, ev->keyname)))
 	  {
@@ -2406,12 +2456,10 @@ static void
 _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
 {
    Eina_List *l;
+   Delayed_Action *da;
    
-   for (l = _delayed_actions; l; l = l->next)
+   EINA_LIST_FOREACH(_delayed_actions, l, da)
      {
-	Delayed_Action *da;
-	
-	da = l->data;
 	if ((da->obj == obj) && (da->mouse) && 
 	    (ev->buttons == da->button))
 	  {
@@ -2592,6 +2640,7 @@ e_actions_init(void)
 
    /* shelf_show */
    ACT_GO(shelf_show);
+   ACT_GO_EDGE(shelf_show);
    e_action_predef_name_set(_("Desktop"), _("Show The Shelf"), "shelf_show",
 			    NULL, "shelf name glob: Shelf-* ", 1);
 
@@ -2928,7 +2977,6 @@ e_action_predef_label_get(const char *action, const char *params)
      {
 	EINA_LIST_FOREACH(actg->acts, l2, actd)
           {
-             actd = l2->data;
              if (!strcmp(actd->act_cmd, action))
                {
                   if ((params) && (actd->act_params))
@@ -3002,9 +3050,8 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
    E_Action_Description *actd = NULL;
    Eina_List *l;
 
-   for (l = action_groups; l; l = l->next)
+   EINA_LIST_FOREACH(action_groups, l, actg)
      {
-	actg = l->data;
 	if (!strcmp(actg->act_grp, act_grp))
 	  break;
 	actg = NULL;
@@ -3012,9 +3059,8 @@ e_action_predef_name_del(const char *act_grp, const char *act_name)
 
    if (!actg) return;
 
-   for (l = actg->acts; l; l = l->next)
+   EINA_LIST_FOREACH(actg->acts, l, actd)
      {
-	actd = l->data;
 	if (!strcmp(actd->act_name, act_name))
 	  {
 	     actg->acts = eina_list_remove(actg->acts, actd);
@@ -3043,27 +3089,19 @@ e_action_predef_name_all_del(void)
    E_Action_Group *actg = NULL;
    E_Action_Description *actd = NULL;
 
-   while (action_groups)
+   EINA_LIST_FREE(action_groups, actg)
      {
-	actg = action_groups->data;
-
-	while (actg->acts)
+	EINA_LIST_FREE(actg->acts, actd)
 	  {
-	     actd = actg->acts->data;
-
 	     if (actd->act_name) eina_stringshare_del(actd->act_name);
 	     if (actd->act_cmd) eina_stringshare_del(actd->act_cmd);
 	     if (actd->act_params) eina_stringshare_del(actd->act_params);
 	     if (actd->param_example) eina_stringshare_del(actd->param_example);
 
 	     E_FREE(actd);
-
-	     actg->acts = eina_list_remove_list(actg->acts, actg->acts);
 	  }
 	if (actg->act_grp) eina_stringshare_del(actg->act_grp);
 	E_FREE(actg);
-
-	action_groups = eina_list_remove_list(action_groups, action_groups);
      }
    action_groups = NULL;
 }
diff --git a/src/bin/e_atoms.c b/src/bin/e_atoms.c
index 72207d2..1575186 100644
--- a/src/bin/e_atoms.c
+++ b/src/bin/e_atoms.c
@@ -14,6 +14,7 @@ EAPI Ecore_X_Atom E_ATOM_HIDDEN = 0;
 EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
 EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE = 0;
 EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0;
+EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0;
 
 /* externally accessible functions */
 EAPI int
@@ -29,11 +30,12 @@ e_atoms_init(void)
 	"__E_WINDOW_HIDDEN",
 	"__E_WINDOW_BORDER_SIZE",
 	"__E_ATOM_WINDOW_STATE",
-	"__E_ATOM_WINDOW_STATE_CENTERED"
+        "__E_ATOM_WINDOW_STATE_CENTERED",
+        "__E_ATOM_DESKTOP_FILE"
    };
-   Ecore_X_Atom atoms[10];
+   Ecore_X_Atom atoms[11];
    
-   ecore_x_atoms_get(atom_names, 10, atoms);
+   ecore_x_atoms_get(atom_names, 11, atoms);
    E_ATOM_MANAGED = atoms[0];
    E_ATOM_CONTAINER = atoms[1];
    E_ATOM_ZONE = atoms[2];
@@ -44,6 +46,7 @@ e_atoms_init(void)
    E_ATOM_BORDER_SIZE = atoms[7];
    E_ATOM_WINDOW_STATE = atoms[8];
    E_ATOM_WINDOW_STATE_CENTERED = atoms[9];
+   E_ATOM_DESKTOP_FILE = atoms[10];
    return 1;
 }
 
diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h
index 47ce422..f7fef17 100644
--- a/src/bin/e_atoms.h
+++ b/src/bin/e_atoms.h
@@ -17,6 +17,7 @@ extern EAPI Ecore_X_Atom E_ATOM_MAPPED;
 extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
 extern EAPI Ecore_X_Atom E_ATOM_HIDDEN;
 extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE;
+extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE;
 
 /* extra e window states */
 /* if we add more states, we need to fix
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index ab05368..751343f 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -32,6 +32,7 @@ EAPI int
 e_bg_init(void)
 {
    Eina_List *l = NULL;
+   E_Config_Desktop_Background *cfbg = NULL;
 
    /* Register mime handler */
    bg_hdl = e_fm2_mime_handler_new(_("Set As Background"), 
@@ -44,11 +45,8 @@ e_bg_init(void)
    if (e_config->desktop_default_background)
       e_filereg_register(e_config->desktop_default_background);
 
-   for (l = e_config->desktop_backgrounds; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
      {
-	E_Config_Desktop_Background *cfbg;
-
-	cfbg = l->data;
 	if (!cfbg) continue;
 	e_filereg_register(cfbg->file);
      }
@@ -61,6 +59,7 @@ EAPI int
 e_bg_shutdown(void)
 {
    Eina_List *l = NULL;
+   E_Config_Desktop_Background *cfbg = NULL;
 
    /* Deregister mime handler */
    if (bg_hdl) 
@@ -73,11 +72,8 @@ e_bg_shutdown(void)
    if (e_config->desktop_default_background)
       e_filereg_deregister(e_config->desktop_default_background);
 
-   for (l = e_config->desktop_backgrounds; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
      {
-	E_Config_Desktop_Background *cfbg;
-
-	cfbg = l->data;
 	if (!cfbg) continue;
 	e_filereg_deregister(cfbg->file);
      }
@@ -94,19 +90,18 @@ EAPI const E_Config_Desktop_Background *
 e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 {
    Eina_List *l, *ll, *entries;
-   E_Config_Desktop_Background *bg = NULL;
+   E_Config_Desktop_Background *bg = NULL, *cfbg = NULL;
    const char *bgfile = "";
+   char *entry;
    int current_spec = 0; /* how specific the setting is - we want the least general one that applies */
 
    /* look for desk specific background. */
    if (container_num >= 0 || zone_num >= 0 || desk_x >= 0 || desk_y >= 0)
      {
-	for (l = e_config->desktop_backgrounds; l; l = l->next)
+	EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
 	  {
-	     E_Config_Desktop_Background *cfbg;
 	     int spec;
 
-	     cfbg = l->data;
 	     if (!cfbg) continue;
 	     spec = 0;
 	     if (cfbg->container == container_num) spec++;
@@ -133,9 +128,9 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
 	     entries = edje_file_collection_list(bgfile);
 	     if (entries)
 	       {
-		  for (ll = entries; ll; ll = ll->next)
+		  EINA_LIST_FOREACH(entries, ll, entry)
 		    {
-		       if (!strcmp(ll->data, "e/desktop/background"))
+		       if (!strcmp(entry, "e/desktop/background"))
 			 {
 			    bg = cfbg;
 			    current_spec = spec;
@@ -154,6 +149,7 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
    const E_Config_Desktop_Background *cfbg;
    Eina_List *l, *entries;
    const char *bgfile = "";
+   char *entry;
    int ok = 0;
 
    cfbg = e_bg_config_get(container_num, zone_num, desk_x, desk_y);
@@ -189,9 +185,9 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
 	entries = edje_file_collection_list(bgfile);
 	if (entries)
 	  {
-	     for (l = entries; l; l = l->next)
+	     EINA_LIST_FOREACH(entries, l, entry)
 	       {
-		  if (!strcmp(l->data, "e/desktop/background"))
+		  if (!strcmp(entry, "e/desktop/background"))
 		    {
 		       ok = 1;
 		       break;
@@ -232,7 +228,7 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
 	const char *pfile = "";
 	
 	edje_object_file_get(zone->bg_object, &pfile, NULL);
-	if (!e_util_strcmp(pfile, bgfile)) return;
+	if ((!e_util_strcmp(pfile, bgfile)) && !e_config->desk_flip_pan_bg) return;
      }
    
    if (transition == E_BG_TRANSITION_NONE)
@@ -442,13 +438,11 @@ EAPI void
 e_bg_del(int container, int zone, int desk_x, int desk_y)
 {
    Eina_List *l = NULL;
+   E_Config_Desktop_Background *cfbg = NULL;
    E_Event_Bg_Update *ev;
-   
-   for (l = e_config->desktop_backgrounds; l; l = l->next)
+  
+   EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg) 
      {
-	E_Config_Desktop_Background *cfbg;
-	
-	cfbg = l->data;
 	if (!cfbg) continue;
 	if ((cfbg->container == container) && (cfbg->zone == zone) &&
 	    (cfbg->desk_x == desk_x) && (cfbg->desk_y == desk_y))
@@ -477,15 +471,12 @@ e_bg_update(void)
    E_Container *con;
    E_Zone *zone;
 
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     con = ll->data;
-	     for (lll = con->zones; lll; lll = lll->next)
+	     EINA_LIST_FOREACH(con->zones, lll, zone)
 	       {
-		  zone = lll->data;
 		  e_zone_bg_reconfigure(zone);
 	       }
 	  }
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 2336f1e..ad8c333 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -87,26 +87,11 @@ e_bindings_init(void)
 EAPI int
 e_bindings_shutdown(void)
 {
-   E_Binding_Signal *binds;
-   E_Binding_Mouse *bindm;
-   E_Binding_Wheel *bindw;
-   E_Binding_Edge *binde;
-   E_Binding_Key *bindk;
-
-   EINA_LIST_FREE(mouse_bindings, bindm)
-     _e_bindings_mouse_free(bindm);
-
-   EINA_LIST_FREE(key_bindings, bindk)
-     _e_bindings_key_free(bindk);
-
-   EINA_LIST_FREE(edge_bindings, binde)
-     _e_bindings_edge_free(binde);
-
-   EINA_LIST_FREE(signal_bindings, binds)
-     _e_bindings_signal_free(binds);
-
-   EINA_LIST_FREE(wheel_bindings, bindw)
-     _e_bindings_wheel_free(bindw);
+   E_FREE_LIST(mouse_bindings, _e_bindings_mouse_free);
+   E_FREE_LIST(key_bindings, _e_bindings_key_free);
+   E_FREE_LIST(edge_bindings, _e_bindings_edge_free);
+   E_FREE_LIST(signal_bindings, _e_bindings_signal_free);
+   E_FREE_LIST(wheel_bindings, _e_bindings_wheel_free);
 
    return 1;
 }
@@ -439,18 +424,23 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
    if (action) bind->action = eina_stringshare_add(action);
    if (params) bind->params = eina_stringshare_add(params);
    edge_bindings = eina_list_append(edge_bindings, bind);
+
+   e_util_zone_edge_toggle(edge, 1);
 }
 
 EAPI E_Binding_Edge *
-e_bindings_edge_get(const char *action, E_Zone_Edge edge)
+e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click)
 {
    E_Binding_Edge *bind;
    Eina_List *l;
 
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-	if ((bind->edge == edge) && bind->action &&
-	      action && !strcmp(action, bind->action))
+	if ((bind->edge == edge) &&
+	      ((click && (bind->delay == -1.0))
+	       || (!click && (bind->delay >= 0.0))) &&
+	      bind->action && action &&
+	      !strcmp(action, bind->action))
 	  return bind;
      }
    return NULL;
@@ -461,24 +451,30 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
 {
    E_Binding_Edge *bind;
    Eina_List *l;
+   int ref_count = 0;
 
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-	if ((bind->ctxt == ctxt) &&
-	    (bind->edge == edge) &&
-	    (bind->mod == mod) &&
-	    ((bind->delay * 1000) == (delay * 1000)) &&
-	    (bind->any_mod == any_mod) &&
-	    (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
-	     ((!bind->action) && (!action))) &&
-	    (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
-	     ((!bind->params) && (!params))))
+	if ((bind->edge == edge))
 	  {
-	     _e_bindings_edge_free(bind);
-	     edge_bindings = eina_list_remove_list(edge_bindings, l);
-	     break;
+	     if ((bind->ctxt == ctxt) &&
+		 (bind->mod == mod) &&
+		 ((bind->delay * 1000) == (delay * 1000)) &&
+		 (bind->any_mod == any_mod) &&
+		 (((bind->action) && (action) && (!strcmp(bind->action, action))) ||
+		  ((!bind->action) && (!action))) &&
+		 (((bind->params) && (params) && (!strcmp(bind->params, params))) ||
+		  ((!bind->params) && (!params))))
+	       {
+		  _e_bindings_edge_free(bind);
+		  edge_bindings = eina_list_remove_list(edge_bindings, l);
+	       }
+	     else ref_count++;
 	  }
      }
+
+   if (!ref_count)
+     e_util_zone_edge_toggle(edge, 0);
 }
 
 EAPI E_Action *
@@ -499,7 +495,8 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-	if (((bind->edge == ev->edge)) &&
+	/* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
+	if (((bind->edge == ev->edge)) && (bind->delay >= 0.0) &&
 	    ((bind->any_mod) || (bind->mod == mod)))
 	  {
 	     if (_e_bindings_context_match(bind->ctxt, ctxt))
@@ -543,7 +540,8 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
    if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
    EINA_LIST_FOREACH(edge_bindings, l, bind)
      {
-	if ((bind->edge == ev->edge) &&
+	/* A value of -1.0 for the delay indicates it as a mouse-click binding on that edge */
+	if ((bind->edge == ev->edge) && (bind->delay >= 0.0) &&
 	    ((bind->any_mod) || (bind->mod == mod)))
 	  {
 	     if (_e_bindings_context_match(bind->ctxt, ctxt))
@@ -570,6 +568,71 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
    return act;
 }
 
+EAPI E_Action *
+e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
+{
+   E_Binding_Modifier mod = 0;
+   E_Binding_Edge *bind;
+   E_Desk *current = NULL;
+   E_Action *act = NULL;
+   Eina_List *l;
+   
+   current = e_desk_at_xy_get(ev->zone, ev->zone->desk_x_current, ev->zone->desk_y_current);
+   if (current->fullscreen_borders && (!e_config->fullscreen_flip)) return NULL;
+
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
+   EINA_LIST_FOREACH(edge_bindings, l, bind)
+     {
+	if (((bind->edge == ev->edge)) && (bind->delay == -1.0) &&
+	    ((bind->any_mod) || (bind->mod == mod)))
+	  {
+	     if (_e_bindings_context_match(bind->ctxt, ctxt))
+	       {
+		  act = e_action_find(bind->action);
+		  if (act)
+		    {
+		       if (act->func.go_edge)
+			 act->func.go_edge(obj, bind->params, ev);
+		       else if (act->func.go)
+			 act->func.go(obj, bind->params);
+		    }
+	       }
+	  }
+     }
+   return act;
+}
+
+EAPI E_Action *
+e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
+{
+   E_Binding_Modifier mod = 0;
+   E_Binding_Edge *bind;
+   E_Action *act = NULL;
+   Eina_List *l;
+
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) mod |= E_BINDING_MODIFIER_SHIFT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
+   if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
+   EINA_LIST_FOREACH(edge_bindings, l, bind)
+     {
+	if ((bind->edge == ev->edge) && (bind->delay == -1.0) &&
+	      ((bind->any_mod) || (bind->mod == mod)))
+	  {
+	     if (_e_bindings_context_match(bind->ctxt, ctxt))
+	       {
+		  act = e_action_find(bind->action);
+		  if (act && act->func.end)
+		    act->func.end(obj, bind->params);
+	       }
+	  }
+     }
+   return act;
+}
+
 EAPI void
 e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params)
 {
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index d4d5dd4..3ea24d2 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -116,10 +116,12 @@ EAPI E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Obje
 EAPI E_Action   *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev);
 
 EAPI void        e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
-EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge);
+EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, Eina_Bool click);
 EAPI void        e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay);
 EAPI E_Action   *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
 EAPI E_Action   *e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+EAPI E_Action   *e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
+EAPI E_Action   *e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev);
 
 EAPI void        e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
 EAPI void        e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index e5befdc..ed6da19 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -60,6 +60,9 @@ static int  _e_border_cb_grab_replay(void *data, int type, void *event);
 static void _e_border_cb_drag_finished(E_Drag *drag, int dropped);
 
 static void _e_border_eval(E_Border *bd);
+static void _e_border_eval0(E_Border *bd);
+static void _e_border_container_layout_hook(E_Container *con);
+
 static void _e_border_moveinfo_gather(E_Border *bd, const char *source);
 static void _e_border_resize_handle(E_Border *bd);
 
@@ -102,7 +105,9 @@ static void _e_border_pointer_resize_end(E_Border *bd);
 static void _e_border_pointer_move_begin(E_Border *bd);
 static void _e_border_pointer_move_end(E_Border *bd);
 
-static void _e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd);
+static void _e_border_hook_call(E_Border_Hook_Point hookpoint, void *bd);
+
+static void _e_border_client_move_resize_send(E_Border *bd);
 
 /* local subsystem globals */
 static Eina_List *handlers = NULL;
@@ -242,8 +247,10 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    if (bd->client.argb)
      bd->win = ecore_x_window_manager_argb_new(con->win, 0, 0, bd->w, bd->h);
    else
-     bd->win = ecore_x_window_override_new(con->win, 0, 0, bd->w, bd->h);
-   ecore_x_window_shape_events_select(bd->win, 1);
+     {
+	bd->win = ecore_x_window_override_new(con->win, 0, 0, bd->w, bd->h);
+	ecore_x_window_shape_events_select(bd->win, 1);
+     }
    e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
    e_focus_setup(bd);
@@ -278,6 +285,28 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
 	return NULL;
      }
 
+   /* printf("##- ON MAP CLIENT 0x%x SIZE %ix%i %i:%i\n",
+    * 	  bd->client.win, bd->client.w, bd->client.h, att->x, att->y); */
+
+   /* FIXME: if first_map is 1 then we should ignore the first hide event
+    * or ensure the window is alreayd hidden and events flushed before we
+    * create a border for it */
+   if (first_map)
+     {
+	// printf("##- FIRST MAP\n");
+	bd->x = att->x;
+	bd->y = att->y;
+	bd->changes.pos = 1;
+	bd->re_manage = 1;
+	// needed to be 1 for internal windw and on restart.        
+	// bd->ignore_first_unmap = 2;
+     }
+   
+   bd->client.win = win;
+   bd->zone = e_zone_current_get(con);
+   
+   _e_border_hook_call(E_BORDER_HOOK_NEW_BORDER, bd);   
+
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_border_cb_mouse_in, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_border_cb_mouse_out, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_border_cb_mouse_down, bd));
@@ -285,8 +314,6 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_border_cb_mouse_move, bd));
    bd->handlers = eina_list_append(bd->handlers, ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, _e_border_cb_mouse_wheel, bd));
 
-   bd->client.win = win;
-
    bd->client.icccm.title = NULL;
    bd->client.icccm.name = NULL;
    bd->client.icccm.class = NULL;
@@ -452,23 +479,6 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    bd->changes.size = 1;
    bd->changes.shape = 1;
 
-//   printf("##- ON MAP CLIENT 0x%x SIZE %ix%i\n",
-//	  bd->client.win, bd->client.w, bd->client.h);
-
-   /* FIXME: if first_map is 1 then we should ignore the first hide event
-    * or ensure the window is alreayd hidden and events flushed before we
-    * create a border for it */
-   if (first_map)
-     {
-//	printf("##- FIRST MAP\n");
-	bd->x = att->x;
-	bd->y = att->y;
-	bd->changes.pos = 1;
-	bd->re_manage = 1;
-// needed to be 1 for internal windw and on restart.        
-//	bd->ignore_first_unmap = 2;
-     }
-
    /* just to friggin make java happy - we're DELAYING the reparent until
     * eval time...
     */
@@ -480,8 +490,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
    ecore_x_window_show(bd->client.shell_win);
    bd->shape = e_container_shape_add(con);
 
-   if (e_config->focus_setting != E_FOCUS_NONE)
-     bd->take_focus = 1;
+   bd->take_focus = 1;
    bd->new_client = 1;
    bd->changed = 1;
 
@@ -652,7 +661,7 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
    if (bd->desk->zone != bd->zone)
      e_border_desk_set(bd, e_desk_current_get(bd->zone));
 
-   ev = calloc(1, sizeof(E_Event_Border_Zone_Set));
+   ev = E_NEW(E_Event_Border_Zone_Set, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_zone_set_event");
@@ -662,8 +671,7 @@ e_border_zone_set(E_Border *bd, E_Zone *zone)
    ecore_event_add(E_EVENT_BORDER_ZONE_SET, ev, _e_border_event_border_zone_set_free, NULL);
 
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_ZONE, &bd->zone->num, 1);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -680,9 +688,10 @@ e_border_desk_set(E_Border *bd, E_Desk *desk)
    bd->desk = desk;
    e_border_zone_set(bd, desk->zone);
 
+   _e_border_hook_call(E_BORDER_HOOK_SET_DESK, bd);
    e_hints_window_desktop_set(bd);
 
-   ev = calloc(1, sizeof(E_Event_Border_Desk_Set));
+   ev = E_NEW(E_Event_Border_Desk_Set, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_desk_set_event");
@@ -698,16 +707,13 @@ e_border_desk_set(E_Border *bd, E_Desk *desk)
    if (e_config->transient.desktop)
      {
 	Eina_List *l;
-	for (l = bd->transients; l; l = l->next)
+	E_Border *child;
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     e_border_desk_set(child, bd->desk);
 	  }
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -731,7 +737,7 @@ e_border_show(E_Border *bd)
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
    ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MANAGED, &visible, 1);
 
-   ev = calloc(1, sizeof(E_Event_Border_Show));
+   ev = E_NEW(E_Event_Border_Show, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_show_event");
@@ -792,7 +798,7 @@ e_border_hide(E_Border *bd, int manage)
      {
 	E_Event_Border_Hide *ev;
 	
-	ev = calloc(1, sizeof(E_Event_Border_Hide));
+	ev = E_NEW(E_Event_Border_Hide, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_hide_event");
@@ -802,6 +808,41 @@ e_border_hide(E_Border *bd, int manage)
 }
 
 static void
+_e_border_client_move_resize_send(E_Border *bd)
+{
+   if (bd->internal_ecore_evas)
+     ecore_evas_managed_move(bd->internal_ecore_evas,
+			     bd->x + bd->fx.x + bd->client_inset.l,
+			     bd->y + bd->fx.y + bd->client_inset.t);
+   
+   ecore_x_icccm_move_resize_send(bd->client.win,
+				  bd->x + bd->fx.x + bd->client_inset.l,
+				  bd->y + bd->fx.y + bd->client_inset.t,
+				  bd->client.w,
+				  bd->client.h);
+}
+
+static void
+_e_border_pending_move_resize_add(E_Border *bd, int move, int resize,
+				  int x, int y, int w, int h,
+				  Eina_Bool without_border, unsigned int serial)
+{
+   E_Border_Pending_Move_Resize *pnd;
+
+   pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
+   if (!pnd) return;
+   pnd->resize = resize;
+   pnd->move = move;
+   pnd->without_border = without_border;
+   pnd->x = x;
+   pnd->y = y;
+   pnd->w = w;
+   pnd->h = h;
+   pnd->serial = serial;
+   bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+}
+
+static void
 _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 {
    E_Event_Border_Move *ev;
@@ -809,21 +850,10 @@ _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
-   if ((bd->fullscreen) || 
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) 
-     return;
    ecore_x_window_shadow_tree_flush();
    if (bd->new_client)
      {
-	E_Border_Pending_Move_Resize  *pnd;
-
-	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
-	if (!pnd) return;
-	pnd->move = 1;
-	pnd->x = x;
-	pnd->y = y;
-	pnd->without_border = without_border;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+	_e_border_pending_move_resize_add(bd, 1, 0, x, y, 0, 0, without_border, 0);
 	return;
      }
 
@@ -834,6 +864,7 @@ _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
      }
 
    if ((x == bd->x) && (y == bd->y)) return;
+   bd->maximized = 0;
    bd->pre_res_change.valid = 0;
    bd->x = x;
    bd->y = y;
@@ -846,17 +877,9 @@ _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
      }
 #endif
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+   _e_border_client_move_resize_send(bd);
    _e_border_move_update(bd);
-   ev = calloc(1, sizeof(E_Event_Border_Move));
+   ev = E_NEW(E_Event_Border_Move, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //  e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
@@ -880,6 +903,13 @@ _e_border_move_internal(E_Border *bd, int x, int y, Eina_Bool without_border)
 EAPI void
 e_border_move(E_Border *bd, int x, int y)
 {
+   if (bd->fullscreen)
+     return;
+
+   /* allow border to unshade when it was maximized _and_ shaded */
+   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
+     return;
+
    _e_border_move_internal(bd, x, y, 0);
 }
 
@@ -902,6 +932,13 @@ e_border_move(E_Border *bd, int x, int y)
 EAPI void
 e_border_move_without_border(E_Border *bd, int x, int y)
 {
+   if (bd->fullscreen)
+     return;
+
+   /* allow border to unshade when it was maximized _and_ shaded */
+   if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))
+     return;
+
    _e_border_move_internal(bd, x, y, 1);
 }
 
@@ -939,252 +976,198 @@ e_border_fx_offset(E_Border *bd, int x, int y)
    bd->fx.y = y;
    bd->changed = 1;
    bd->changes.pos = 1;
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    if (bd->moving) _e_border_move_update(bd);
 }
 
 static void
-_e_border_resize_internal(E_Border *bd, int w, int h, Eina_Bool without_border)
+_e_border_move_resize_internal(E_Border *bd, int x, int y, int w, int h, Eina_Bool without_border, Eina_Bool move)
 {
-   E_Event_Border_Resize *ev;
+   E_Event_Border_Move		*mev;
+   E_Event_Border_Resize	*rev;
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
-   if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
-     return;
    ecore_x_window_shadow_tree_flush();
 
    if (bd->new_client)
      {
-	E_Border_Pending_Move_Resize  *pnd;
-
-	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
-	if (!pnd) return;
-	pnd->resize = 1;
-	pnd->without_border = without_border;
-	pnd->w = w;
-	pnd->h = h;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
+	_e_border_pending_move_resize_add(bd, move, 1, x, y, w, h, without_border, 0);
 	return;
      }
 
    if (without_border)
      {
+	x -= bd->client_inset.l;
+	y -= bd->client_inset.t;
 	w += (bd->client_inset.l + bd->client_inset.r);
 	h += (bd->client_inset.t + bd->client_inset.b);
      }
 
-   if ((w == bd->w) && (h == bd->h)) return;
+   if ((!move || ((x == bd->x) && (y == bd->y))) &&
+	(w == bd->w) && (h == bd->h))
+     return;
+
+   bd->maximized = 0;
    bd->pre_res_change.valid = 0;
+   if (move)
+     {
+	bd->changes.pos = 1;
+	bd->x = x;
+	bd->y = y;
+     }
    bd->w = w;
    bd->h = h;
    bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
    bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
-   bd->changed = 1;
-   bd->changes.size = 1;
+
    if ((bd->shaped) || (bd->client.shaped))
      {
 	bd->need_shape_merge = 1;
 	bd->need_shape_export = 1;
      }
-   if (bd->client.netwm.sync.request)
+
+   if (bd->internal_ecore_evas)
      {
-	bd->client.netwm.sync.wait++;
-	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
+	bd->changed = 1;
+	bd->changes.size = 1;
      }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+   else
+     {
+	if (resize && bd->client.netwm.sync.request)
+	  {
+	     bd->client.netwm.sync.wait++;
+	     _e_border_pending_move_resize_add(bd, move, 1, x, y, w, h, without_border,
+					       bd->client.netwm.sync.serial);
+	     ecore_x_netwm_sync_request_send(bd->client.win,
+					     bd->client.netwm.sync.serial++);
+	  }
+	else
+	  {
+	     bd->changed = 1;
+	     bd->changes.size = 1;
+	  }
+     }
+
+   _e_border_client_move_resize_send(bd);
+   
    _e_border_resize_update(bd);
-   ev = calloc(1, sizeof(E_Event_Border_Resize));
-   ev->border = bd;
+   if (move)
+     {
+	mev = E_NEW(E_Event_Border_Move, 1);
+	mev->border = bd;
+	e_object_ref(E_OBJECT(bd));
+	//   e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
+	ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL);
+     }
+   
+   rev = E_NEW(E_Event_Border_Resize, 1);
+   rev->border = bd;
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-   ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
+   ecore_event_add(E_EVENT_BORDER_RESIZE, rev, _e_border_event_border_resize_free, NULL);
    _e_border_zone_update(bd);
 }
 
 /**
- * Resize window to values that already account border decorations.
+ * Move and resize window to values that already account border decorations.
  *
- * This call will consider given size already accounts border
+ * This call will consider given values already accounts border
  * decorations, so it will not be considered later. This will just
  * work properly with borders that have being evaluated and border
  * decorations are known (border->client_inset).
  *
+ * @parm x horizontal position to place window.
+ * @parm y vertical position to place window.
  * @parm w horizontal window size.
  * @parm h vertical window size.
  *
- * @see e_border_resize_without_border()
+ * @see e_border_move_resize_without_border()
  */
 EAPI void
-e_border_resize(E_Border *bd, int w, int h)
+e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
 {
-   _e_border_resize_internal(bd, w, h, 0);
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
+   _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
 }
 
 /**
- * Resize window to values that do not account border decorations yet.
+ * Move and resize window to values that do not account border decorations yet.
  *
- * This call will consider given size does not account border
- * decoration, so these values (border->client_inset) will be
- * accounted automatically. This is specially useful when it is a new
- * client and has not be evaluated yet, in this case
- * border->client_inset will be zeroed and no information is known. It
- * will mark pending requests so border will be accounted on
- * evalutation phase.
+ * This call will consider given values already accounts border
+ * decorations, so it will not be considered later. This will just
+ * work properly with borders that have being evaluated and border
+ * decorations are known (border->client_inset).
  *
+ * @parm x horizontal position to place window.
+ * @parm y vertical position to place window.
  * @parm w horizontal window size.
  * @parm h vertical window size.
  *
- * @see e_border_resize()
+ * @see e_border_move_resize()
  */
 EAPI void
-e_border_resize_without_border(E_Border *bd, int w, int h)
-{
-   _e_border_resize_internal(bd, w, h, 1);
-}
-
-static void
-_e_border_move_resize_internal(E_Border *bd, int x, int y, int w, int h, Eina_Bool without_border)
+e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h)
 {
-   E_Event_Border_Move		*mev;
-   E_Event_Border_Resize	*rev;
-
-   E_OBJECT_CHECK(bd);
-   E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-
-   if ((bd->fullscreen) || 
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) 
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
      return;
-   ecore_x_window_shadow_tree_flush();
 
-   if (bd->new_client)
-     {
-	E_Border_Pending_Move_Resize  *pnd;
-
-	pnd = E_NEW(E_Border_Pending_Move_Resize, 1);
-	if (!pnd) return;
-	pnd->move = 1;
-	pnd->resize = 1;
-	pnd->without_border = without_border;
-	pnd->x = x;
-	pnd->y = y;
-	pnd->w = w;
-	pnd->h = h;
-	bd->pending_move_resize = eina_list_append(bd->pending_move_resize, pnd);
-	return;
-     }
-
-   if (without_border)
-     {
-	x -= bd->client_inset.l;
-	y -= bd->client_inset.t;
-	w += (bd->client_inset.l + bd->client_inset.r);
-	h += (bd->client_inset.t + bd->client_inset.b);
-     }
-
-   if ((x == bd->x) && (y == bd->y) && (w == bd->w) && (h == bd->h)) return;
-   bd->pre_res_change.valid = 0;
-   bd->x = x;
-   bd->y = y;
-   bd->w = w;
-   bd->h = h;
-   bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
-   bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
-   bd->changed = 1;
-   bd->changes.pos = 1;
-   bd->changes.size = 1;
-   if ((bd->shaped) || (bd->client.shaped))
-     {
-	bd->need_shape_merge = 1;
-	bd->need_shape_export = 1;
-     }
-   if (bd->client.netwm.sync.request)
-     {
-	bd->client.netwm.sync.wait++;
-	ecore_x_netwm_sync_request_send(bd->client.win, bd->client.netwm.sync.serial++);
-     }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
-   _e_border_resize_update(bd);
-   mev = calloc(1, sizeof(E_Event_Border_Move));
-   mev->border = bd;
-   e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_move_event");
-   ecore_event_add(E_EVENT_BORDER_MOVE, mev, _e_border_event_border_move_free, NULL);
-
-   rev = calloc(1, sizeof(E_Event_Border_Resize));
-   rev->border = bd;
-   e_object_ref(E_OBJECT(bd));
-//   e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-   ecore_event_add(E_EVENT_BORDER_RESIZE, rev, _e_border_event_border_resize_free, NULL);
-   _e_border_zone_update(bd);
+   _e_border_move_resize_internal(bd, x, y, w, h, 1, 1);
 }
 
 /**
- * Move and resize window to values that already account border decorations.
+ * Resize window to values that already account border decorations.
  *
- * This call will consider given values already accounts border
+ * This call will consider given size already accounts border
  * decorations, so it will not be considered later. This will just
  * work properly with borders that have being evaluated and border
  * decorations are known (border->client_inset).
  *
- * @parm x horizontal position to place window.
- * @parm y vertical position to place window.
  * @parm w horizontal window size.
  * @parm h vertical window size.
  *
- * @see e_border_move_resize_without_border()
+ * @see e_border_resize_without_border()
  */
 EAPI void
-e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
+e_border_resize(E_Border *bd, int w, int h)
 {
-   _e_border_move_resize_internal(bd, x, y, w, h, 0);
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
+   _e_border_move_resize_internal(bd, 0, 0, w, h, 0, 0);
 }
 
 /**
- * Move and resize window to values that do not account border decorations yet.
+ * Resize window to values that do not account border decorations yet.
  *
- * This call will consider given values already accounts border
- * decorations, so it will not be considered later. This will just
- * work properly with borders that have being evaluated and border
- * decorations are known (border->client_inset).
+ * This call will consider given size does not account border
+ * decoration, so these values (border->client_inset) will be
+ * accounted automatically. This is specially useful when it is a new
+ * client and has not be evaluated yet, in this case
+ * border->client_inset will be zeroed and no information is known. It
+ * will mark pending requests so border will be accounted on
+ * evalutation phase.
  *
- * @parm x horizontal position to place window.
- * @parm y vertical position to place window.
  * @parm w horizontal window size.
  * @parm h vertical window size.
  *
- * @see e_border_move_resize()
+ * @see e_border_resize()
  */
 EAPI void
-e_border_move_resize_without_border(E_Border *bd, int x, int y, int w, int h)
+e_border_resize_without_border(E_Border *bd, int w, int h)
 {
-   _e_border_move_resize_internal(bd, x, y, w, h, 1);
+   if ((bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)))
+     return;
+
+   _e_border_move_resize_internal(bd, 0, 0, w, h, 1, 0);
 }
 
 EAPI void
@@ -1204,6 +1187,7 @@ e_border_layer_set(E_Border *bd, int layer)
    if (e_config->transient.layer)
      {
 	Eina_List *l;
+	E_Border *child;
 
 	/* We need to set raise to one, else the child wont
 	 * follow to the new layer. It should be like this,
@@ -1211,11 +1195,8 @@ e_border_layer_set(E_Border *bd, int layer)
 	 * the transients.
 	 */
 	e_config->transient.raise = 1;
-	for (l = bd->transients; l; l = l->next)
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     child->layer = layer;
 	  }
      }
@@ -1227,7 +1208,7 @@ EAPI void
 e_border_raise(E_Border *bd)
 {
    E_Event_Border_Stack *ev;
-   E_Border *last = NULL;
+   E_Border *last = NULL, *child;
    Eina_List *l;
 
    E_OBJECT_CHECK(bd);
@@ -1237,11 +1218,8 @@ e_border_raise(E_Border *bd)
    
    if (e_config->transient.raise)
      {
-	for (l = eina_list_last(bd->transients); l; l = l->prev)
+	EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     /* Don't stack iconic transients. If the user wants these shown,
 	      * thats another option.
 	      */
@@ -1275,7 +1253,7 @@ e_border_raise(E_Border *bd)
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1309,15 +1287,14 @@ e_border_raise(E_Border *bd)
      }
 
    ecore_event_add(E_EVENT_BORDER_STACK, ev, _e_border_event_border_stack_free, NULL);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
 e_border_lower(E_Border *bd)
 {
    E_Event_Border_Stack *ev;
-   E_Border *last = NULL;
+   E_Border *last = NULL, *child;
    Eina_List *l;
 
    E_OBJECT_CHECK(bd);
@@ -1327,11 +1304,8 @@ e_border_lower(E_Border *bd)
    
    if (e_config->transient.lower)
      {
-	for (l = eina_list_last(bd->transients); l; l = l->prev)
+	EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     /* Don't stack iconic transients. If the user wants these shown,
 	      * thats another option.
 	      */
@@ -1365,7 +1339,7 @@ e_border_lower(E_Border *bd)
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1398,8 +1372,7 @@ e_border_lower(E_Border *bd)
      }
 
    ecore_event_add(E_EVENT_BORDER_STACK, ev, _e_border_event_border_stack_free, NULL);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -1407,7 +1380,7 @@ e_border_stack_above(E_Border *bd, E_Border *above)
 {
    /* TODO: Should stack above allow the border to change level */
    E_Event_Border_Stack *ev;
-   E_Border *last = NULL;
+   E_Border *last = NULL, *child;
    Eina_List *l;
 
    E_OBJECT_CHECK(bd);
@@ -1417,11 +1390,8 @@ e_border_stack_above(E_Border *bd, E_Border *above)
    
    if (e_config->transient.raise)
      {
-	for (l = eina_list_last(bd->transients); l; l = l->prev)
+	EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     /* Don't stack iconic transients. If the user wants these shown,
 	      * thats another option.
 	      */
@@ -1436,7 +1406,7 @@ e_border_stack_above(E_Border *bd, E_Border *above)
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1456,8 +1426,7 @@ e_border_stack_above(E_Border *bd, E_Border *above)
      }
 
    ecore_event_add(E_EVENT_BORDER_STACK, ev, _e_border_event_border_stack_free, NULL);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -1465,7 +1434,7 @@ e_border_stack_below(E_Border *bd, E_Border *below)
 {
    /* TODO: Should stack below allow the border to change level */
    E_Event_Border_Stack *ev;
-   E_Border *last = NULL;
+   E_Border *last = NULL, *child;
    Eina_List *l;
 
    E_OBJECT_CHECK(bd);
@@ -1475,11 +1444,8 @@ e_border_stack_below(E_Border *bd, E_Border *below)
    
    if (e_config->transient.lower)
      {
-	for (l = eina_list_last(bd->transients); l; l = l->prev)
+	EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     /* Don't stack iconic transients. If the user wants these shown,
 	      * thats another option.
 	      */
@@ -1494,7 +1460,7 @@ e_border_stack_below(E_Border *bd, E_Border *below)
 	  }
      }
 
-   ev = calloc(1, sizeof(E_Event_Border_Stack));
+   ev = E_NEW(E_Event_Border_Stack, 1);
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
 
@@ -1514,8 +1480,7 @@ e_border_stack_below(E_Border *bd, E_Border *below)
      }
 
    ecore_event_add(E_EVENT_BORDER_STACK, ev, _e_border_event_border_stack_free, NULL);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -1757,7 +1722,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 		    edje_object_signal_emit(focused->icon_object, "e,state,unfocused", "e");
 		  e_focus_event_focus_out(focused);
 		  
-		  ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); 
+		  ev = E_NEW(E_Event_Border_Focus_Out, 1); 
 		  ev->border = focused; 
 		  e_object_ref(E_OBJECT(focused));
 		  
@@ -1815,7 +1780,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	     focused = bd;
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
-	     ev = calloc(1, sizeof(E_Event_Border_Focus_In)); 
+	     ev = E_NEW(E_Event_Border_Focus_In, 1); 
 	     ev->border = bd; 
 	     e_object_ref(E_OBJECT(bd)); 
 	     
@@ -1829,7 +1794,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	     focused = NULL;
 	     // Let send the focus event iff the focus is set explicitly,
 	     // not via callback
-	     ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); 
+	     ev = E_NEW(E_Event_Border_Focus_Out, 1); 
 	     ev->border = bd; 
 	     e_object_ref(E_OBJECT(bd));
 
@@ -1846,87 +1811,85 @@ e_border_shade(E_Border *bd, E_Direction dir)
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)) ||
-       (bd->shading)) return;
+   if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
+       ((bd->maximized) && (!e_config->allow_manip))) return;
    if ((bd->client.border.name) && 
        (!strcmp("borderless", bd->client.border.name))) return;
+
    ecore_x_window_shadow_tree_flush();
-   if (!bd->shaded)
-     {
-	bd->shade.x = bd->x;
-	bd->shade.y = bd->y;
-	bd->shade.dir = dir;
 
-	e_hints_window_shaded_set(bd, 1);
-	e_hints_window_shade_direction_set(bd, dir);
+   bd->shade.x = bd->x;
+   bd->shade.y = bd->y;
+   bd->shade.dir = dir;
 
-	if (e_config->border_shade_animate)
-	  {
-	     bd->shade.start = ecore_loop_time_get();
-	     bd->shading = 1;
-	     bd->changes.shading = 1;
-	     bd->changed = 1;
+   e_hints_window_shaded_set(bd, 1);
+   e_hints_window_shade_direction_set(bd, dir);
 
-	     if (bd->shade.dir == E_DIRECTION_UP ||
-		 bd->shade.dir == E_DIRECTION_LEFT)
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-	     else
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
+   if (e_config->border_shade_animate)
+     {
+	bd->shade.start = ecore_loop_time_get();
+	bd->shading = 1;
+	bd->changes.shading = 1;
+	bd->changed = 1;
 
-	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
-	     edje_object_signal_emit(bd->bg_object, "e,state,shading", "e");
-	  }
+	if (bd->shade.dir == E_DIRECTION_UP ||
+	    bd->shade.dir == E_DIRECTION_LEFT)
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
 	else
-	  {
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  bd->h = bd->client_inset.t + bd->client_inset.b;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_DOWN)
-	       {
-		  bd->h = bd->client_inset.t + bd->client_inset.b;
-		  bd->y = bd->y + bd->client.h;
-		  bd->changes.pos = 1;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client_inset.r;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_RIGHT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client_inset.r;
-		  bd->x = bd->x + bd->client.w;
-		  bd->changes.pos = 1;
-	       }
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
 
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     bd->changes.size = 1;
-	     bd->shaded = 1;
-	     bd->changes.shaded = 1;
-	     bd->changed = 1;
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
-	     e_border_frame_recalc(bd);
-	     ev = calloc(1, sizeof(E_Event_Border_Resize));
-	     ev->border = bd;
-	     /* The resize is added in the animator when animation complete */
-	     /* For non-animated, we add it immediately with the new size */
-	     e_object_ref(E_OBJECT(bd));
-//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-	     ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
+	bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
+	edje_object_signal_emit(bd->bg_object, "e,state,shading", "e");
+     }
+   else
+     {
+	if (bd->shade.dir == E_DIRECTION_UP)
+	  {
+	     bd->h = bd->client_inset.t + bd->client_inset.b;
+	  }
+	else if (bd->shade.dir == E_DIRECTION_DOWN)
+	  {
+	     bd->h = bd->client_inset.t + bd->client_inset.b;
+	     bd->y = bd->y + bd->client.h;
+	     bd->changes.pos = 1;
+	  }
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client_inset.r;
+	  }
+	else if (bd->shade.dir == E_DIRECTION_RIGHT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client_inset.r;
+	     bd->x = bd->x + bd->client.w;
+	     bd->changes.pos = 1;
 	  }
 
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	bd->changes.size = 1;
+	bd->shaded = 1;
+	bd->changes.shaded = 1;
+	bd->changed = 1;
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e");
+	e_border_frame_recalc(bd);
+	ev = E_NEW(E_Event_Border_Resize, 1);
+	ev->border = bd;
+	/* The resize is added in the animator when animation complete */
+	/* For non-animated, we add it immediately with the new size */
+	e_object_ref(E_OBJECT(bd));
+	//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
+	ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -1936,106 +1899,104 @@ e_border_unshade(E_Border *bd, E_Direction dir)
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip)) ||
-       (bd->shading)) return;
+   if ((!bd->shaded) || (bd->shading))
+     return;
+
    ecore_x_window_shadow_tree_flush();
-   if (bd->shaded)
-     {
-	bd->shade.dir = dir;
 
-	e_hints_window_shaded_set(bd, 0);
-	e_hints_window_shade_direction_set(bd, dir);
+   bd->shade.dir = dir;
 
-	if (bd->shade.dir == E_DIRECTION_UP ||
-	    bd->shade.dir == E_DIRECTION_LEFT)
+   e_hints_window_shaded_set(bd, 0);
+   e_hints_window_shade_direction_set(bd, dir);
+
+   if (bd->shade.dir == E_DIRECTION_UP ||
+       bd->shade.dir == E_DIRECTION_LEFT)
+     {
+	bd->shade.x = bd->x;
+	bd->shade.y = bd->y;
+     }
+   else
+     {
+	bd->shade.x = bd->x - bd->client.w;
+	bd->shade.y = bd->y - bd->client.h;
+     }
+   if (e_config->border_shade_animate)
+     {
+	bd->shade.start = ecore_loop_time_get();
+	bd->shading = 1;
+	bd->changes.shading = 1;
+	bd->changed = 1;
+
+	if (bd->shade.dir == E_DIRECTION_UP)
+	  {
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
+	     ecore_x_window_move_resize(bd->client.win, 0,
+					bd->h - (bd->client_inset.t + bd->client_inset.b) -
+					bd->client.h,
+					bd->client.w, bd->client.h);
+	  }
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
 	  {
-	     bd->shade.x = bd->x;
-	     bd->shade.y = bd->y;
+	     ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
+	     ecore_x_window_move_resize(bd->client.win,
+					bd->w - (bd->client_inset.l + bd->client_inset.r) -
+					bd->client.h,
+					0, bd->client.w, bd->client.h);
 	  }
 	else
+	  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
+
+	bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
+	edje_object_signal_emit(bd->bg_object, "e,state,unshading", "e");
+     }
+   else
+     {
+	if (bd->shade.dir == E_DIRECTION_UP)
 	  {
-	     bd->shade.x = bd->x - bd->client.w;
-	     bd->shade.y = bd->y - bd->client.h;
+	     bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
 	  }
-	if (e_config->border_shade_animate)
+	else if (bd->shade.dir == E_DIRECTION_DOWN)
 	  {
-	     bd->shade.start = ecore_loop_time_get();
-	     bd->shading = 1;
-	     bd->changes.shading = 1;
-	     bd->changed = 1;
-
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-		  ecore_x_window_move_resize(bd->client.win, 0,
-					     bd->h - (bd->client_inset.t + bd->client_inset.b) -
-					     bd->client.h,
-					     bd->client.w, bd->client.h);
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_SW);
-		  ecore_x_window_move_resize(bd->client.win,
-					     bd->w - (bd->client_inset.l + bd->client_inset.r) -
-					     bd->client.h,
-					     0, bd->client.w, bd->client.h);
-	       }
-	     else
-	       ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NE);
-
-	     bd->shade.anim = ecore_animator_add(_e_border_shade_animator, bd);
-	     edje_object_signal_emit(bd->bg_object, "e,state,unshading", "e");
+	     bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
+	     bd->y = bd->y - bd->client.h;
+	     bd->changes.pos = 1;
 	  }
-	else
+	else if (bd->shade.dir == E_DIRECTION_LEFT)
 	  {
-	     if (bd->shade.dir == E_DIRECTION_UP)
-	       {
-		  bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_DOWN)
-	       {
-		  bd->h = bd->client_inset.t + bd->client.h + bd->client_inset.b;
-		  bd->y = bd->y - bd->client.h;
-		  bd->changes.pos = 1;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_LEFT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
-	       }
-	     else if (bd->shade.dir == E_DIRECTION_RIGHT)
-	       {
-		  bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
-		  bd->x = bd->x - bd->client.w;
-		  bd->changes.pos = 1;
-	       }
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     bd->changes.size = 1;
-	     bd->shaded = 0;
-	     bd->changes.shaded = 1;
-	     bd->changed = 1;
-	     if ((bd->shaped) || (bd->client.shaped))
-	       {
-		  bd->need_shape_merge = 1;
-		  bd->need_shape_export = 1;
-	       }
-	     edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
-	     e_border_frame_recalc(bd);
-	     ev = calloc(1, sizeof(E_Event_Border_Resize));
-	     ev->border = bd;
-	     /* The resize is added in the animator when animation complete */
-	     /* For non-animated, we add it immediately with the new size */
-	     e_object_ref(E_OBJECT(bd));
-//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
-	     ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
+	     bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
 	  }
-
+	else if (bd->shade.dir == E_DIRECTION_RIGHT)
+	  {
+	     bd->w = bd->client_inset.l + bd->client.w + bd->client_inset.r;
+	     bd->x = bd->x - bd->client.w;
+	     bd->changes.pos = 1;
+	  }
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	bd->changes.size = 1;
+	bd->shaded = 0;
+	bd->changes.shaded = 1;
+	bd->changed = 1;
+	if ((bd->shaped) || (bd->client.shaped))
+	  {
+	     bd->need_shape_merge = 1;
+	     bd->need_shape_export = 1;
+	  }
+	edje_object_signal_emit(bd->bg_object, "e,state,unshaded", "e");
+	e_border_frame_recalc(bd);
+	ev = E_NEW(E_Event_Border_Resize, 1);
+	ev->border = bd;
+	/* The resize is added in the animator when animation complete */
+	/* For non-animated, we add it immediately with the new size */
+	e_object_ref(E_OBJECT(bd));
+	//	     e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
+	ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2089,21 +2050,22 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 	     max = E_MAXIMIZE_NONE;
 	     break;
 	   case E_MAXIMIZE_FULLSCREEN:
-	     if (bd->bg_object)
+	      w = bd->zone->w;
+	      h = bd->zone->h;
+	      
+	      if (bd->bg_object)
 	       {
 		  Evas_Coord cx, cy, cw, ch;
 
-		  edje_object_message_signal_process(bd->bg_object);
 		  edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e");
-		  edje_object_message_signal_process(bd->bg_object);
 		  
-		  evas_object_resize(bd->bg_object, 1000, 1000);
+		  evas_object_resize(bd->bg_object, w, h);
 		  edje_object_calc_force(bd->bg_object);
 		  edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch);
 		  bd->client_inset.l = cx;
-		  bd->client_inset.r = 1000 - (cx + cw);
+		  bd->client_inset.r = w - (cx + cw);
 		  bd->client_inset.t = cy;
-		  bd->client_inset.b = 1000 - (cy + ch);
+		  bd->client_inset.b = h - (cy + ch);
 		  ecore_x_netwm_frame_size_set(bd->client.win,
 					       bd->client_inset.l, bd->client_inset.r,
 					       bd->client_inset.t, bd->client_inset.b);
@@ -2111,8 +2073,6 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 					   bd->client_inset.l, bd->client_inset.r,
 					   bd->client_inset.t, bd->client_inset.b);
 	       }
-	     w = bd->zone->w;
-	     h = bd->zone->h;
 	     e_border_resize_limit(bd, &w, &h);
 	     /* center x-direction */
 	     x1 = bd->zone->x + (bd->zone->w - w) / 2;
@@ -2125,8 +2085,8 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 	       e_border_move_resize(bd, bd->x, y1, bd->w, h);
 	     else if ((max & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
 	       e_border_move_resize(bd, x1, bd->y, w, bd->h);
-
 	     break;
+
 	   case E_MAXIMIZE_SMART:
 	   case E_MAXIMIZE_EXPAND:
 	     x1 = bd->zone->x;
@@ -2157,6 +2117,7 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 	       e_border_move_resize(bd, x1, bd->y, w, bd->h);
 	     edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e");
 	     break;
+
 	   case E_MAXIMIZE_FILL:
 	     x1 = bd->zone->x;
 	     y1 = bd->zone->y;
@@ -2195,8 +2156,7 @@ e_border_maximize(E_Border *bd, E_Maximize max)
 	                             bd->maximized & E_MAXIMIZE_VERTICAL);
 	
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+     e_remember_update(bd);
 }
 
 EAPI void
@@ -2227,9 +2187,7 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
 	       {
 		  Evas_Coord cx, cy, cw, ch;
 		  
-		  edje_object_message_signal_process(bd->bg_object);
 		  edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e");
-		  edje_object_message_signal_process(bd->bg_object);
 		  
 		  evas_object_resize(bd->bg_object, 1000, 1000);
 		  edje_object_calc_force(bd->bg_object);
@@ -2247,7 +2205,10 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
 	       }
 
 	     bd->maximized = E_MAXIMIZE_NONE;
-	     e_border_move_resize(bd, bd->zone->x + bd->saved.x, bd->zone->y + bd->saved.y, bd->saved.w, bd->saved.h);
+	     _e_border_move_resize_internal(bd,
+					    bd->zone->x + bd->saved.x,
+					    bd->zone->y + bd->saved.y,
+					    bd->saved.w, bd->saved.h, 0, 1);
 	     bd->saved.x = bd->saved.y = bd->saved.w = bd->saved.h = 0;
 	     e_hints_window_size_unset(bd);
 	  }
@@ -2278,7 +2239,8 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
 	       }
 
 	     e_border_resize_limit(bd, &w, &h);
-	     e_border_move_resize(bd, x, y, w, h);
+	     
+	     _e_border_move_resize_internal(bd, x, y, w, h, 0, 1);
 	     if (!(bd->maximized & E_MAXIMIZE_DIRECTION))
 	       {
 		  bd->maximized = E_MAXIMIZE_NONE;
@@ -2291,8 +2253,7 @@ e_border_unmaximize(E_Border *bd, E_Maximize max)
 	e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL,
 	                             bd->maximized & E_MAXIMIZE_VERTICAL);
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2386,8 +2347,7 @@ e_border_fullscreen(E_Border *bd, E_Fullscreen policy)
 	bd->client.border.changed = 1;
 	bd->changed = 1;
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2421,8 +2381,7 @@ e_border_unfullscreen(E_Border *bd)
 	bd->client.border.changed = 1;
 	bd->changed = 1;
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2433,7 +2392,7 @@ e_border_iconify(E_Border *bd)
    
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || (bd->shading)) return;
+   if (bd->shading) return;
    ecore_x_window_shadow_tree_flush();
    if (!bd->iconic)
      {
@@ -2454,17 +2413,14 @@ e_border_iconify(E_Border *bd)
    if (e_config->transient.iconify)
      {
 	Eina_List *l;
+	E_Border *child;
 
-	for (l = bd->transients; l; l = l->next)
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     e_border_iconify(child);
 	  }
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2476,7 +2432,7 @@ e_border_uniconify(E_Border *bd)
 
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
-   if ((bd->fullscreen) || (bd->shading)) return;
+   if (bd->shading) return;
    ecore_x_window_shadow_tree_flush();
    if (bd->iconic)
      {
@@ -2499,17 +2455,14 @@ e_border_uniconify(E_Border *bd)
    if (e_config->transient.iconify)
      {
 	Eina_List *l;
+	E_Border *child;
 
-	for (l = bd->transients; l; l = l->next)
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     e_border_uniconify(child);
 	  }
      }
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2527,11 +2480,9 @@ e_border_stick(E_Border *bd)
    if (e_config->transient.desktop)
      {
 	Eina_List *l;
-	for (l = bd->transients; l; l = l->next)
+	E_Border *child;
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     child->sticky = 1;
 	     e_hints_window_sticky_set(child, 1);
 	     e_border_show(child);
@@ -2544,8 +2495,7 @@ e_border_stick(E_Border *bd)
    e_object_ref(E_OBJECT(bd));
 //   e_object_breadcrumb_add(E_OBJECT(bd), "border_stick_event");
    ecore_event_add(E_EVENT_BORDER_STICK, ev, _e_border_event_border_stick_free, NULL);
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2563,11 +2513,9 @@ e_border_unstick(E_Border *bd)
    if (e_config->transient.desktop)
      {
 	Eina_List *l;
-	for (l = bd->transients; l; l = l->next)
+	E_Border *child;
+	EINA_LIST_FOREACH(bd->transients, l, child)
 	  {
-	     E_Border *child;
-
-	     child = l->data;
 	     child->sticky = 0;
 	     e_hints_window_sticky_set(child, 0);
 	  }
@@ -2581,8 +2529,7 @@ e_border_unstick(E_Border *bd)
    ecore_event_add(E_EVENT_BORDER_UNSTICK, ev, _e_border_event_border_unstick_free, NULL);
 
    e_border_desk_set(bd, e_desk_current_get(bd->zone));
-   if (bd->remember)
-     e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 EAPI void
@@ -2665,12 +2612,10 @@ EAPI E_Border *
 e_border_find_by_alarm(Ecore_X_Sync_Alarm alarm)
 {
    Eina_List *l;
-   
-   for (l = borders; l; l = l->next)
+   E_Border *bd;
+  
+   EINA_LIST_FOREACH(borders, l, bd) 
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if ((bd) && (!e_object_is_del(E_OBJECT(bd))) &&
 	    (bd->client.netwm.sync.alarm == alarm))
 	  return bd;
@@ -2688,26 +2633,33 @@ EAPI void
 e_border_idler_before(void)
 {
    Eina_List *ml, *cl;
+   E_Manager *man;
+   E_Container *con;
 
    if (!borders)
      return;
 
-   /* We need to loop two times through the borders.
-    * 1. show windows
-    * 2. hide windows and evaluate rest
-    */
-   for (ml = e_manager_list(); ml; ml = ml->next)
+   EINA_LIST_FOREACH(e_manager_list(), ml, man)
      {
-	E_Manager *man;
-
-	man = ml->data;
-	for (cl = man->containers; cl; cl = cl->next)
+	EINA_LIST_FOREACH(man->containers, cl, con)
 	  {
-	     E_Container *con;
 	     E_Border_List *bl;
 	     E_Border *bd;
-
-	     con = cl->data;
+             
+             // pass 1 - eval0. fetch properties on new or on change and
+             // call hooks to decide what to do - maybe move/resize
+	     bl = e_container_border_list_last(con);
+	     while ((bd = e_container_border_list_prev(bl)))
+	       {
+		  if (bd->changed) _e_border_eval0(bd);
+	       }
+	     e_container_border_list_free(bl);
+             
+             // layout hook - this is where a hook gets to figure out what to
+             // do if anything.
+             _e_border_container_layout_hook(con);
+             
+             // pass 2 - show windows needing show
 	     bl = e_container_border_list_last(con);
 	     while ((bd = e_container_border_list_prev(bl)))
 	       {
@@ -2731,21 +2683,8 @@ e_border_idler_before(void)
 		    }
 	       }
 	     e_container_border_list_free(bl);
-	  }
-     }
-
-   for (ml = e_manager_list(); ml; ml = ml->next)
-     {
-	E_Manager *man;
-
-	man = ml->data;
-	for (cl = man->containers; cl; cl = cl->next)
-	  {
-	     E_Container *con;
-	     E_Border_List *bl;
-	     E_Border *bd;
-
-	     con = cl->data;
+             
+             // pass 3 - hide windows needing hide and eval (main eval)
 	     bl = e_container_border_list_first(con);
 	     while ((bd = e_container_border_list_next(bl)))
 	       {
@@ -3353,12 +3292,10 @@ EAPI void
 e_border_button_bindings_ungrab_all(void)
 {
    Eina_List *l;
-   
-   for (l = borders; l; l = l->next)
+   E_Border *bd;
+
+   EINA_LIST_FOREACH(borders, l, bd)   
      {
-	E_Border *bd;
-	
-	bd = l->data;
 	e_focus_setdown(bd);
 	e_bindings_mouse_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
 	e_bindings_wheel_ungrab(E_BINDING_CONTEXT_BORDER, bd->win);
@@ -3369,12 +3306,10 @@ EAPI void
 e_border_button_bindings_grab_all(void)
 {
    Eina_List *l;
+   E_Border *bd;
    
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)   
      {
-	E_Border *bd;
-	
-	bd = l->data;
 	e_bindings_mouse_grab(E_BINDING_CONTEXT_BORDER, bd->win);
 	e_bindings_wheel_grab(E_BINDING_CONTEXT_BORDER, bd->win);
 	e_focus_setup(bd);
@@ -3397,15 +3332,13 @@ EAPI Eina_List *
 e_border_lost_windows_get(E_Zone *zone)
 {
    Eina_List *list = NULL, *l;
+   E_Border *bd;
    int loss_overlap = 5;
    
    E_OBJECT_CHECK_RETURN(zone, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-	
-	bd = l->data;
 	if (bd->zone)
 	  {
 	     if ((bd->zone == zone) ||
@@ -3522,27 +3455,17 @@ e_border_frame_recalc(E_Border *bd)
 	bd->need_shape_merge = 1;
 	bd->need_shape_export = 1;
      }
-   if (bd->internal_ecore_evas)
-     ecore_evas_managed_move(bd->internal_ecore_evas,
-			     bd->x + bd->fx.x + bd->client_inset.l,
-			     bd->y + bd->fx.y + bd->client_inset.t);
-   ecore_x_icccm_move_resize_send(bd->client.win,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t,
-				  bd->client.w,
-				  bd->client.h);
+   _e_border_client_move_resize_send(bd);
 }
 
 EAPI Eina_List *
 e_border_immortal_windows_get(void)
 {
    Eina_List *list = NULL, *l;
+   E_Border *bd;
    
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-	
-	bd = l->data;
 	if (bd->lock_life)
 	  list = eina_list_append(list, bd);
      }
@@ -3798,11 +3721,7 @@ _e_border_free(E_Border *bd)
 	ecore_poller_del(bd->ping_poller);
 	bd->ping_poller = NULL;
      }
-   while (bd->pending_move_resize)
-     {
-	free(bd->pending_move_resize->data);
-	bd->pending_move_resize = eina_list_remove_list(bd->pending_move_resize, bd->pending_move_resize);
-     }
+   E_FREE_LIST(bd->pending_move_resize, free);
 
    if (bd->shade.anim) ecore_animator_del(bd->shade.anim);
    if (bd->border_menu) e_menu_deactivate(bd->border_menu);
@@ -3929,6 +3848,7 @@ static void
 _e_border_del(E_Border *bd)
 {
    E_Event_Border_Remove *ev;
+   E_Border *child;
 
    if (bd->fullscreen) bd->desk->fullscreen_borders--;
 
@@ -3981,7 +3901,7 @@ _e_border_del(E_Border *bd)
 
    if ((!bd->new_client) && (!stopping))
      {
-	ev = calloc(1, sizeof(E_Event_Border_Remove));
+	ev = E_NEW(E_Event_Border_Remove, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	// e_object_breadcrumb_add(E_OBJECT(bd), "border_remove_event");
@@ -3999,13 +3919,9 @@ _e_border_del(E_Border *bd)
 	  }
 	bd->parent = NULL;
      }
-   while (bd->transients)
+   EINA_LIST_FREE(bd->transients, child)
      {
-	E_Border *child;
-
-	child = bd->transients->data;
 	child->parent = NULL;
-	bd->transients = eina_list_remove_list(bd->transients, bd->transients);
      }
 
    if (bd->leader)
@@ -4022,13 +3938,9 @@ _e_border_del(E_Border *bd)
 	  }
 	bd->leader = NULL;
      }
-   while (bd->group)
+   EINA_LIST_FREE(bd->group, child)
      {
-	E_Border *child;
-
-	child = bd->group->data;
 	child->leader = NULL;
-	bd->group = eina_list_remove_list(bd->group, bd->group);
      }
 }
 
@@ -4365,11 +4277,8 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
 	       }
 	  }
      }
-   ecore_x_icccm_move_resize_send(bd->client.win,
-                                  bd->x + bd->fx.x + bd->client_inset.l,
-                                  bd->y + bd->fx.y + bd->client_inset.t,
-                                  bd->client.w,
-                                  bd->client.h);
+
+   _e_border_client_move_resize_send(bd);
    return 1;
 }
 
@@ -4416,11 +4325,8 @@ _e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
 	else
 	  e_border_resize(bd, w, h);
      }
-   ecore_x_icccm_move_resize_send(bd->client.win,
-                                  bd->x + bd->fx.x + bd->client_inset.l,
-                                  bd->y + bd->fx.y + bd->client_inset.t,
-                                  bd->client.w,
-                                  bd->client.h);
+
+     _e_border_client_move_resize_send(bd);
    return 1;
 }
 
@@ -4810,7 +4716,7 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
    if (!bd) return 1;
 
    if ((bd->shaded) || (bd->shading) ||
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)) ||
+       ((bd->maximized) && (!e_config->allow_manip)) ||
        (bd->fullscreen) || (bd->moving) ||
        (bd->resize_mode != RESIZE_NONE))
      return 1;
@@ -4840,157 +4746,75 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
 
    if (!bd->lock_user_stacking)
      e_border_raise(bd);
-   if (e->direction == RESIZE_TL)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_TL;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_SE);
-     }
-   else if (e->direction == RESIZE_T)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_T;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_S);
-     }
-   else if (e->direction == RESIZE_TR)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_TR;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_SW);
-     }
-   else if (e->direction == RESIZE_R)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_R;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_W);
-     }
-   else if (e->direction == RESIZE_BR)
+   if (e->direction == MOVE)
      {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_BR;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
+	bd->cur_mouse_action = e_action_find("window_move");
 	if (bd->cur_mouse_action)
 	  {
 	     if ((!bd->cur_mouse_action->func.end_mouse) &&
 		 (!bd->cur_mouse_action->func.end))
 	       bd->cur_mouse_action = NULL;
 	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
+	       {
+		  e_object_ref(E_OBJECT(bd->cur_mouse_action));
+		  bd->cur_mouse_action->func.go(E_OBJECT(bd), NULL); 
+	       }
 	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_NW);
+	return 1;
      }
-   else if (e->direction == RESIZE_B)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_B;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_N);
-     }
-   else if (e->direction == RESIZE_BL)
-     {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_BL;
+   if (!_e_border_resize_begin(bd))
+     return 1;
 
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_NE);
-     }
-   else if (e->direction == RESIZE_L)
+   switch(e->direction)
      {
-	if (!_e_border_resize_begin(bd))
-	  return 1;
-	bd->resize_mode = RESIZE_L;
-
-	bd->cur_mouse_action = e_action_find("window_resize");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       e_object_ref(E_OBJECT(bd->cur_mouse_action));
-	  }
-	GRAV_SET(bd, ECORE_X_GRAVITY_E);
+      case RESIZE_TL:
+	 bd->resize_mode = RESIZE_TL;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_SE);
+	 break;
+      case RESIZE_T:
+	 bd->resize_mode = RESIZE_T;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_S);
+	break;
+      case RESIZE_TR:
+	 bd->resize_mode = RESIZE_TR;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_SW);
+	break;
+      case RESIZE_R:
+	 bd->resize_mode = RESIZE_R;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_W);
+	 break;
+      case RESIZE_BR:
+	 bd->resize_mode = RESIZE_BR;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_NW);
+	 break;
+      case RESIZE_B:
+	 bd->resize_mode = RESIZE_B;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_N);
+	 break;
+      case RESIZE_BL:
+	 bd->resize_mode = RESIZE_BL;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_NE);
+	 break;
+      case RESIZE_L:
+	 bd->resize_mode = RESIZE_L;
+	 GRAV_SET(bd, ECORE_X_GRAVITY_E);
+	 break;
+      default:
+	 return 1;
      }
-   else if (e->direction == MOVE)
+   
+   bd->cur_mouse_action = e_action_find("window_resize");
+   if (bd->cur_mouse_action)
      {
-	bd->cur_mouse_action = e_action_find("window_move");
-	if (bd->cur_mouse_action)
-	  {
-	     if ((!bd->cur_mouse_action->func.end_mouse) &&
-		 (!bd->cur_mouse_action->func.end))
-	       bd->cur_mouse_action = NULL;
-	     if (bd->cur_mouse_action)
-	       {
-		  e_object_ref(E_OBJECT(bd->cur_mouse_action));
-		  bd->cur_mouse_action->func.go(E_OBJECT(bd), NULL); 
-	       }
-	  }
+	if ((!bd->cur_mouse_action->func.end_mouse) &&
+	    (!bd->cur_mouse_action->func.end))
+	  bd->cur_mouse_action = NULL;
      }
+   if (bd->cur_mouse_action)
+     e_object_ref(E_OBJECT(bd->cur_mouse_action));
+   
    return 1;
 }
 
@@ -5027,14 +4851,56 @@ _e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Sync_Alarm *e;
-
+   unsigned int serial;
+   
    e = ev;
    bd = e_border_find_by_alarm(e->alarm);
    if (!bd) return 1;
-   bd->client.netwm.sync.wait--;
+
+   if (bd->client.netwm.sync.wait)
+     bd->client.netwm.sync.wait--;
+
+   if (ecore_x_sync_counter_query(bd->client.netwm.sync.counter, &serial))
+     {
+	E_Border_Pending_Move_Resize *pnd = NULL;
+
+	/* skip pending for which we didnt get a reply */
+	while (bd->pending_move_resize)
+	  {
+	     pnd = bd->pending_move_resize->data;
+	     bd->pending_move_resize = eina_list_remove(bd->pending_move_resize, pnd);
+
+	     if (serial == pnd->serial)
+	       break;
+
+	     E_FREE(pnd);
+	  }
+
+	if (pnd)
+	  {
+	     bd->x = pnd->x;
+	     bd->y = pnd->y;
+	     bd->w = pnd->w;
+	     bd->h = pnd->h;
+	     bd->client.w = bd->w - (bd->client_inset.l + bd->client_inset.r);
+	     bd->client.h = bd->h - (bd->client_inset.t + bd->client_inset.b);
+	     E_FREE(pnd);
+	  }
+     }
+
+   bd->changes.size = 1;
+   bd->changes.pos = 1;		  
+
+   _e_border_eval(bd);
+   evas_render(bd->bg_evas);
+
+   ecore_x_pointer_xy_get(e_manager_current_get()->root,
+			  &bd->mouse.current.mx,
+			  &bd->mouse.current.my); 
+
    bd->client.netwm.sync.send_time = ecore_loop_time_get();
-   if (bd->client.netwm.sync.wait <= 0)
-     _e_border_resize_handle(bd);
+   _e_border_resize_handle(bd);
+
    return 1;
 }
 
@@ -5042,13 +4908,11 @@ static int
 _e_border_cb_efreet_desktop_list_change(void *data, int ev_type, void *ev)
 {
    Eina_List *l;
+   E_Border *bd;
    
    /* mark all borders for desktop/icon updates */
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if (!bd->desktop)
 	  {
 	     bd->changes.icon = 1;
@@ -5065,6 +4929,7 @@ _e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
 {
    Efreet_Event_Desktop_Change *event;
    Eina_List *l;
+   E_Border *bd;
 
    event = ev;
    e_init_status_set(_("Desktop file scan"));
@@ -5072,11 +4937,8 @@ _e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
      {
       case EFREET_DESKTOP_CHANGE_ADD:
 	 /* If a desktop is added, make the borders without icon retry */
-	 for (l = borders; l; l = l->next)
+	 EINA_LIST_FOREACH(borders, l, bd)
 	   {
-	      E_Border *bd;
-
-	      bd = l->data;
 	      if (!bd->desktop)
 		{
 		   bd->changes.icon = 1;
@@ -5086,11 +4948,8 @@ _e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
 	 break;
       case EFREET_DESKTOP_CHANGE_REMOVE:
 	 /* If a desktop is removed, drop the .desktop pointer */
-	 for (l = borders; l; l = l->next)
+	 EINA_LIST_FOREACH(borders, l, bd)
 	   {
-	      E_Border *bd;
-
-	      bd = l->data;
 	      if (bd->desktop == event->current)
 		{
 		   efreet_desktop_free(bd->desktop);
@@ -5102,12 +4961,8 @@ _e_border_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
 	 break;
       case EFREET_DESKTOP_CHANGE_UPDATE:
 	 /* If a desktop is updated, point to the new desktop and update the icon */
-	 for (l = borders; l; l = l->next)
+	 EINA_LIST_FOREACH(borders, l, bd)
 	   {
-	      E_Border *bd;
-
-	      bd = l->data;
-
 	      if (bd->desktop == event->previous)
 		{
 		   efreet_desktop_free(bd->desktop);
@@ -5131,13 +4986,11 @@ static int
 _e_border_cb_config_icon_theme(void *data, int ev_type, void *ev)
 {
    Eina_List *l;
+   E_Border *bd;
    
    /* mark all borders for desktop/icon updates */
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	bd->changes.icon = 1;
 	bd->changed = 1;
      }
@@ -5481,15 +5334,14 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 	int x, y, new_x, new_y;
 	int new_w, new_h;
 	Eina_List *skiplist = NULL;
-
 #if 0
+	// FIXME: remove? sync what for when only moving?
 	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
 	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
 	    (bd->client.netwm.sync.alarm) &&
 	    (bd->client.netwm.sync.wait > 1)) return 1;
 #endif
-
 	if ((bd->moveinfo.down.button >= 1) && (bd->moveinfo.down.button <= 3))
 	  {
 	     x = bd->mouse.last_down[bd->moveinfo.down.button - 1].x +
@@ -5520,19 +5372,35 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
      }
    else if (bd->resize_mode != RESIZE_NONE)
      {
-#if 0
-	/* FIXME: it seems we send sync requests we dont get replies to */
-	/* ie our sync wait > 1 often - try eclipse - its slow enough to */
-	/* REALLY show how bad this is */
-	printf("SYNC %i - %3.3f\n", bd->client.netwm.sync.wait,
-	       ecore_loop_time_get() - bd->client.netwm.sync.time);
-	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
-	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
-	    (bd->client.netwm.sync.alarm) &&
-	    (bd->client.netwm.sync.wait > 1)) return 1;
-#endif
-	_e_border_resize_handle(bd);
+	    (bd->client.netwm.sync.alarm))
+	  {
+	     if ((ecore_loop_time_get() - bd->client.netwm.sync.send_time) > 0.5)
+	       {
+		  E_Border_Pending_Move_Resize  *pnd;
+
+		  if (bd->pending_move_resize)
+		    {
+		       bd->changes.pos = 1;
+		       bd->changes.size = 1;
+		       bd->changed = 1;
+		       _e_border_client_move_resize_send(bd);
+		    }
+		  EINA_LIST_FREE(bd->pending_move_resize, pnd)
+		    E_FREE(pnd);
+
+		  bd->client.netwm.sync.wait = 0;
+	       }
+	     /* sync.wait is incremented when resize_handle sends
+	      * sync-request and decremented by sync-alarm cb. so
+	      * we resize here either on initial resize, timeout or
+	      * when no new resize-request was added by sync-alarm cb.
+	      */
+	     if (!bd->client.netwm.sync.wait)
+		  _e_border_resize_handle(bd);
+	  }
+	else
+	  _e_border_resize_handle(bd);
      }
    else
      {
@@ -5660,14 +5528,17 @@ _e_border_post_move_resize_job(void *data)
 }
 
 static void
-_e_border_eval(E_Border *bd)
-{	
-   E_Event_Border_Property *event;
+_e_border_container_layout_hook(E_Container *con)
+{
+   _e_border_hook_call(E_BORDER_HOOK_CONTAINER_LAYOUT, con);
+}
+
+static void
+_e_border_eval0(E_Border *bd)
+{
    int change_urgent = 0;
    int rem_change = 0;
-   int send_event = 1;
-   int zx, zy, zw, zh;
-
+   
    if (e_object_is_del(E_OBJECT(bd)))
      {
 	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border!\n", bd);
@@ -5675,8 +5546,7 @@ _e_border_eval(E_Border *bd)
      }
    
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd);
-   if (bd->zone)
-     e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
    /* fetch any info queued to be fetched */
    if (bd->client.icccm.fetch.client_leader)
      {
@@ -5712,11 +5582,9 @@ _e_border_eval(E_Border *bd)
 		  else
 		    {
 		       Eina_List *l;
-		       for (l = bd->leader->group; l; l = l->next)
+		       E_Border *child;
+		       EINA_LIST_FOREACH(bd->leader->group, l, child)
 			 {
-			    E_Border *child;
-
-			    child = l->data;
 			    if ((child != bd) && (child->focused))
 			      e_border_focus_set(bd, 1, 1);
 			 }
@@ -6193,11 +6061,9 @@ _e_border_eval(E_Border *bd)
 		  else
 		    {
 		       Eina_List *l;
-		       for (l = bd->leader->group; l; l = l->next)
+		       E_Border *child;
+		       EINA_LIST_FOREACH(bd->leader->group, l, child)
 			 {
-			    E_Border *child;
-
-			    child = l->data;
 			    if ((child != bd) && (child->focused))
 			      e_border_focus_set(bd, 1, 1);
 			 }
@@ -6209,10 +6075,9 @@ _e_border_eval(E_Border *bd)
 
    if (bd->new_client)
      {
-	E_Remember *rem = NULL;
 	E_Event_Border_Add *ev;
 
-	ev = calloc(1, sizeof(E_Event_Border_Add));
+	ev = E_NEW(E_Event_Border_Add, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
@@ -6220,248 +6085,22 @@ _e_border_eval(E_Border *bd)
 
 	if ((!bd->lock_border) || (!bd->client.border.name))
 	  bd->client.border.changed = 1;
-	if (!bd->remember)
-	  {
-	     rem = e_remember_find_usable(bd);
-	     if (rem)
-	       {
-		  bd->remember = rem;
-		  e_remember_use(rem);
-	       }
-	  }
-	if (bd->remember)
-	  {
-	     rem  = bd->remember;
-
-	     if (rem->apply & E_REMEMBER_APPLY_ZONE)
-	       {
-		  E_Zone *zone;
-		  
-		  zone = e_container_zone_number_get(bd->zone->container, rem->prop.zone);
-		  if (zone)
-		    e_border_zone_set(bd, zone);
-		  e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
-	       {
-		  E_Desk *desk;
-		  
-		  desk = e_desk_at_xy_get(bd->zone, rem->prop.desk_x, rem->prop.desk_y);
-		  if (desk) 
-		    {
-		       e_border_desk_set(bd, desk);
-		       if (e_config->desk_auto_switch)
-			 e_desk_show(desk);
-		    }
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_SIZE)
-	       {
-		  bd->client.w = rem->prop.w;
-		  bd->client.h = rem->prop.h;
-		  /* we can trust internal windows */
-		  if (bd->internal)
-		    {
-		       if (bd->zone->w != rem->prop.res_x)
-			 {	 
-			    if (bd->client.w > (bd->zone->w - 64))
-			      bd->client.w = bd->zone->w - 64;
-			 }
-		       if (bd->zone->h != rem->prop.res_y)
-			 {	 
-			    if (bd->client.h > (bd->zone->h - 64))
-			      bd->client.h = bd->zone->h - 64;
-			 }
-		       if (bd->client.icccm.min_w > bd->client.w)
-			 bd->client.w = bd->client.icccm.min_w;
-		       if (bd->client.icccm.max_w < bd->client.w)
-			 bd->client.w = bd->client.icccm.max_w;
-		       if (bd->client.icccm.min_h > bd->client.h)
-			 bd->client.h = bd->client.icccm.min_h;
-		       if (bd->client.icccm.max_h < bd->client.h)
-			 bd->client.h = bd->client.icccm.max_h;
-		    }
-		  bd->w = bd->client.w + bd->client_inset.l + bd->client_inset.r;
-		  bd->h = bd->client.h + bd->client_inset.t + bd->client_inset.b;
-		  bd->changes.size = 1;
-		  bd->changes.shape = 1;
-	       }
-	     if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage))
-	       {
-		  bd->x = rem->prop.pos_x;
-		  bd->y = rem->prop.pos_y;
-		  if (bd->zone->w != rem->prop.res_x)
-		    {
-		       int px;
-		       
-		       px = bd->x + (bd->w / 2);
-		       if (px < ((rem->prop.res_x * 1) / 3))
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = rem->prop.pos_x;
-			    else
-			      bd->x = ((rem->prop.pos_x - 0) * bd->zone->w) / 
-			      (rem->prop.res_x / 3);
-			 }
-		       else if (px < ((rem->prop.res_x * 2) / 3))
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = (bd->zone->w / 2) + 
-			      (px - (rem->prop.res_x / 2)) -
-			      (bd->w / 2);
-			    else
-			      bd->x = (bd->zone->w / 2) + 
-			      (((px - (rem->prop.res_x / 2)) * bd->zone->w) / 
-			       (rem->prop.res_x / 3)) -
-			      (bd->w / 2);
-			 }
-		       else
-			 {
-			    if (bd->zone->w >= (rem->prop.res_x / 3))
-			      bd->x = bd->zone->w + 
-			      rem->prop.pos_x - rem->prop.res_x +
-			      (rem->prop.w - bd->client.w);
-			    else
-			      bd->x = bd->zone->w + 
-			      (((rem->prop.pos_x - rem->prop.res_x) * bd->zone->w) /
-			       (rem->prop.res_x / 3)) +
-			      (rem->prop.w - bd->client.w);
-			 }
-		       if ((rem->prop.pos_x >= 0) && (bd->x < 0))
-			 bd->x = 0;
-		       else if (((rem->prop.pos_x + rem->prop.w) < rem->prop.res_x) &&
-				((bd->x + bd->w) > bd->zone->w))
-			 bd->x = bd->zone->w - bd->w;
-		    }
-		  if (bd->zone->h != rem->prop.res_y)
-		    {
-		       int py;
-		       
-		       py = bd->y + (bd->h / 2);
-		       if (py < ((rem->prop.res_y * 1) / 3))
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = rem->prop.pos_y;
-			    else
-			      bd->y = ((rem->prop.pos_y - 0) * bd->zone->h) / 
-			      (rem->prop.res_y / 3);
-			 }
-		       else if (py < ((rem->prop.res_y * 2) / 3))
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = (bd->zone->h / 2) + 
-			      (py - (rem->prop.res_y / 2)) -
-			      (bd->h / 2);
-			    else
-			      bd->y = (bd->zone->h / 2) + 
-			      (((py - (rem->prop.res_y / 2)) * bd->zone->h) / 
-			       (rem->prop.res_y / 3)) -
-			      (bd->h / 2);
-			 }
-		       else
-			 {
-			    if (bd->zone->h >= (rem->prop.res_y / 3))
-			      bd->y = bd->zone->h + 
-			      rem->prop.pos_y - rem->prop.res_y +
-			      (rem->prop.h - bd->client.h);
-			    else
-			      bd->y = bd->zone->h + 
-			      (((rem->prop.pos_y - rem->prop.res_y) * bd->zone->h) /
-			       (rem->prop.res_y / 3)) +
-			      (rem->prop.h - bd->client.h);
-			 }
-		       if ((rem->prop.pos_y >= 0) && (bd->y < 0))
-			 bd->y = 0;
-		       else if (((rem->prop.pos_y + rem->prop.h) < rem->prop.res_y) &&
-				((bd->y + bd->h) > bd->zone->h))
-			 bd->y = bd->zone->h - bd->h;
-		    }
-//		  if (bd->zone->w != rem->prop.res_x)
-//		    bd->x = (rem->prop.pos_x * bd->zone->w) / rem->prop.res_x;
-//		  if (bd->zone->h != rem->prop.res_y)
-//		    bd->y = (rem->prop.pos_y * bd->zone->h) / rem->prop.res_y;
-		  bd->x += bd->zone->x;
-		  bd->y += bd->zone->y;
-		  bd->placed = 1;
-		  bd->changes.pos = 1;
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_LAYER)
-	       {
-		  bd->layer = rem->prop.layer;
-		  if (bd->layer == 100)
-		    e_hints_window_stacking_set(bd, E_STACKING_NONE);
-		  else if (bd->layer == 150)
-		    e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
-		  e_container_border_raise(bd);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_BORDER)
-	       {
-		  if (rem->prop.border)
-		    {
-		       if (bd->bordername) eina_stringshare_del(bd->bordername);
-		       if (rem->prop.border) bd->bordername = eina_stringshare_add(rem->prop.border);
-		       else bd->bordername = NULL;
-		       bd->client.border.changed = 1;
-		    }
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
-	       {
-		  if (rem->prop.fullscreen)
-		    e_border_fullscreen(bd, e_config->fullscreen_policy);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_STICKY)
-	       {
-		  if (rem->prop.sticky) e_border_stick(bd);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_SHADE)
-	       {
-		  if (rem->prop.shaded >= 100)
-		    e_border_shade(bd, rem->prop.shaded - 100);
-		  else if (rem->prop.shaded >= 50)
-		    e_border_unshade(bd, rem->prop.shaded - 50);
-	       }
-	     if (rem->apply & E_REMEMBER_APPLY_LOCKS)
-	       {
-		  bd->lock_user_location = rem->prop.lock_user_location;
-		  bd->lock_client_location = rem->prop.lock_client_location;
-		  bd->lock_user_size = rem->prop.lock_user_size;
-		  bd->lock_client_size = rem->prop.lock_client_size;
-		  bd->lock_user_stacking = rem->prop.lock_user_stacking;
-		  bd->lock_client_stacking = rem->prop.lock_client_stacking;
-		  bd->lock_user_iconify = rem->prop.lock_user_iconify;
-		  bd->lock_client_iconify = rem->prop.lock_client_iconify;
-		  bd->lock_user_desk = rem->prop.lock_user_desk;
-		  bd->lock_client_desk = rem->prop.lock_client_desk;
-		  bd->lock_user_sticky = rem->prop.lock_user_sticky;
-		  bd->lock_client_sticky = rem->prop.lock_client_sticky;
-		  bd->lock_user_shade = rem->prop.lock_user_shade;
-		  bd->lock_client_shade = rem->prop.lock_client_shade;
-		  bd->lock_user_maximize = rem->prop.lock_user_maximize;
-		  bd->lock_client_maximize = rem->prop.lock_client_maximize;
-		  bd->lock_user_fullscreen = rem->prop.lock_user_fullscreen;
-		  bd->lock_client_fullscreen = rem->prop.lock_client_fullscreen;
-		  bd->lock_border = rem->prop.lock_border;
-		  bd->lock_close = rem->prop.lock_close;
-		  bd->lock_focus_in = rem->prop.lock_focus_in;
-		  bd->lock_focus_out = rem->prop.lock_focus_out;
-		  bd->lock_life = rem->prop.lock_life;
-	       }
-	     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)
-	       bd->want_focus = 1;
-	  }
      }
 
+   /* PRE_POST_FETCH calls e_remember apply for new client */
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_POST_FETCH, 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->need_reparent)
+     {     
+	ecore_x_window_save_set_add(bd->client.win);
+	ecore_x_window_reparent(bd->client.win, bd->client.shell_win, 0, 0);
+	if (bd->visible)
+	  ecore_x_window_show(bd->client.win);
+	bd->need_reparent = 0;
+     }
+   
    if ((bd->client.border.changed) && (!bd->shaded) &&
        (!(((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))))
      {
@@ -6630,20 +6269,52 @@ _e_border_eval(E_Border *bd)
 	  }
      }
    
-   if (bd->need_reparent)
-     {     
-	ecore_x_window_save_set_add(bd->client.win);
-	ecore_x_window_reparent(bd->client.win, bd->client.shell_win, 0, 0);
-	if (bd->visible)
-	  ecore_x_window_show(bd->client.win);
-	bd->need_reparent = 0;
+   if (rem_change)
+     e_remember_update(bd);
+   
+   if (change_urgent)
+     {
+	if (bd->client.icccm.urgent)
+	  edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
+	else
+	  edje_object_signal_emit(bd->bg_object, "e,state,not_urgent", "e");
+	E_Event_Border_Urgent_Change *ev;
+
+	ev = E_NEW(E_Event_Border_Urgent_Change, 1);
+	ev->border = bd;
+	e_object_ref(E_OBJECT(bd));
+	ecore_event_add(E_EVENT_BORDER_URGENT_CHANGE, ev,
+	      _e_border_event_border_urgent_change_free, NULL);
      }
    
    _e_border_hook_call(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN, bd);
+}
+
+static void
+_e_border_eval(E_Border *bd)
+{	
+   E_Event_Border_Property *event;
+   E_Border_Pending_Move_Resize *pnd;
+   int rem_change = 0;
+   int send_event = 1;
+
+   if (e_object_is_del(E_OBJECT(bd)))
+     {
+	fprintf(stderr, "ERROR: _e_border_eval(%p) with deleted border! - %d\n", bd, bd->new_client);
+	bd->changed = 0;
+	return;
+     }
+
    _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_NEW_BORDER, bd);
    
    if (bd->new_client)
      {
+	int zx, zy, zw, zh;
+	zx = zy = zw = zh = 0;
+
+	if (bd->zone)
+	  e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
+
 	if (bd->re_manage)
 	  {
 	     bd->x -= bd->client_inset.l;
@@ -6699,10 +6370,13 @@ _e_border_eval(E_Border *bd)
 		       bd->x = att->x;
 		       bd->y = att->y;
 		    }
-		  bd->changes.pos = 1;
-		  bd->placed = 1;
+		  if (e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y))
+		    {
+		       bd->changes.pos = 1;
+		       bd->placed = 1;
+		    }
 	       }
-	     else
+	     if (!bd->placed)
 	       {
 		  /* FIXME: special placement for dialogs etc. etc. etc goes
 		   * here */
@@ -6765,11 +6439,8 @@ _e_border_eval(E_Border *bd)
 		    }
 	       }
 	  }
-	while (bd->pending_move_resize)
+	EINA_LIST_FREE(bd->pending_move_resize, pnd)
 	  {
-	     E_Border_Pending_Move_Resize *pnd;
-
-	     pnd = bd->pending_move_resize->data;
 	     if ((!bd->lock_client_location) && (pnd->move))
 	       {
 		  bd->x = pnd->x;
@@ -6791,17 +6462,13 @@ _e_border_eval(E_Border *bd)
 		  bd->changes.size = 1;
 	       }
 	     free(pnd);
-	     bd->pending_move_resize = eina_list_remove_list(bd->pending_move_resize,
-							     bd->pending_move_resize);
 	  }
 
-     	/* Recreate state */
+	/* Recreate state */
 	e_hints_window_init(bd);
-	
-        if ((bd->client.e.state.centered) && 
+	if ((bd->client.e.state.centered) && 
 	    ((!bd->remember) ||
-	     ((bd->remember) && 
-	      (!(bd->remember->apply & E_REMEMBER_APPLY_POS)))))
+	     ((bd->remember) && (!(bd->remember->apply & E_REMEMBER_APPLY_POS)))))
 	  {
 	     bd->x = zx + (zw - bd->w) / 2;
 	     bd->y = zy + (zh - bd->h) / 2;
@@ -6809,32 +6476,8 @@ _e_border_eval(E_Border *bd)
 	     bd->placed = 1;
 	  }
 
-	if ((bd->internal) && (!bd->remember) && 
-	    (e_config->remember_internal_windows) &&
-	    (!bd->internal_no_remember))
-	  {
-	     E_Remember *rem;
-	     
-	     rem = e_remember_new();
-	     if (rem)
-	       {
-		  rem->match = E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT;
-		  rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
-		  bd->remember = rem;
-		  e_remember_use(rem);
-		  e_remember_update(rem, bd);
-	       }
-	  }
-	
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
+	_e_border_client_move_resize_send(bd);
+
 	/* if the explicit geometry request asks for the app to be
 	 * in another zone - well move it there */
 	  {
@@ -6862,7 +6505,7 @@ _e_border_eval(E_Border *bd)
 	     if ((zone) && (zone != bd->zone))
 	       {
 		  e_border_zone_set(bd, zone);
-		  e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh);
+		  /* e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); */
 	       }
 	  }
      }
@@ -6917,132 +6560,73 @@ _e_border_eval(E_Border *bd)
 	rem_change = 1;
      }
 
-   if ((bd->changes.pos) && (bd->changes.size))
+   if (bd->changes.size)
      {
+	int x = 0, y = 0, xx = 0, yy = 0;
+
 	if ((bd->shaded) && (!bd->shading))
 	  {
 	     evas_obscured_clear(bd->bg_evas);
-//	     if (0)
-//	       {
-//		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-//		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-//							bd);
-//		  bd->post_move = 1;
-//		  bd->post_resize = 1;
-//	       }
-//	     else
-	       {
-		  ecore_x_window_move_resize(bd->win, 
-					     bd->x + bd->fx.x, 
-					     bd->y + bd->fx.y,
-					     bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win, 0, 0, bd->client.w, bd->client.h);
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	     e_container_shape_move(bd->shape,
-				    bd->x + bd->fx.x,
-				    bd->y + bd->fx.y);
 	  }
 	else
 	  {
+	     xx = bd->w - (bd->client_inset.l + bd->client_inset.r);
+	     yy = bd->h - (bd->client_inset.t + bd->client_inset.b);
+	     
 	     evas_obscured_clear(bd->bg_evas);
 	     evas_obscured_rectangle_add(bd->bg_evas,
-					 bd->client_inset.l, bd->client_inset.t,
-					 bd->w - (bd->client_inset.l + bd->client_inset.r),
-					 bd->h - (bd->client_inset.t + bd->client_inset.b));
-//	     if (0)
-//	       {
-//		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-//		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-//							bd);
-//		  bd->post_move = 1;
-//		  bd->post_resize = 1;
-//	       }
-//	     else
-	       {
-		  ecore_x_window_move_resize(bd->win,
-					     bd->x + bd->fx.x,
-					     bd->y + bd->fx.y,
-					     bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     ecore_x_window_move_resize(bd->client.shell_win,
-					bd->client_inset.l, bd->client_inset.t,
-					bd->w - (bd->client_inset.l + bd->client_inset.r),
-					bd->h - (bd->client_inset.t + bd->client_inset.b));
+					 bd->client_inset.l, bd->client_inset.t, xx, yy);
+
 	     if (bd->shading)
 	       {
 		  if (bd->shade.dir == E_DIRECTION_UP)
 		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0,
-						bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						bd->client.h,
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0,
-						    bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						    bd->client.h,
-						    bd->client.w, bd->client.h);
+		       y = yy - bd->client.h;
 		    }
 		  else if (bd->shade.dir == E_DIRECTION_LEFT)
 		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas,
-						bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						bd->client.h,
-						0, bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win,
-						    bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						    bd->client.h,
-						    0, bd->client.w, bd->client.h);
-		    }
-		  else
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0, 0,
-						    bd->client.w, bd->client.h);
-		    }
-	       }
-	     else
-	       {
-		  if (bd->internal_ecore_evas)
-		    ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-					   bd->client.w, bd->client.h);
-		  else
-		    ecore_x_window_move_resize(bd->client.win, 0, 0,
-					       bd->client.w, bd->client.h);
+		       x = xx - bd->client.w;
+		    }		  
 	       }
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	     e_container_shape_move(bd->shape, 
-				    bd->x + bd->fx.x,
-				    bd->y + bd->fx.y);
 	  }
+
+	if (!bd->changes.pos)
+	  {
+	     if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
+	     bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job, bd);
+	     bd->post_resize = 1;
+	  }
+	else
+	  {
+	     ecore_x_window_move_resize(bd->win,
+					bd->x + bd->fx.x,
+					bd->y + bd->fx.y,
+					bd->w, bd->h);
+	  }
+
+	ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
+
+	if ((!bd->shaded) || (bd->shading))
+	  ecore_x_window_move_resize(bd->client.shell_win,
+				     bd->client_inset.l, bd->client_inset.t, xx, yy);
+	
 	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-        ecore_x_icccm_move_resize_send(bd->client.win,
-                                       bd->x + bd->fx.x + bd->client_inset.l,
-                                       bd->y + bd->fx.y + bd->client_inset.t,
-                                       bd->client.w,
-                                       bd->client.h);
+	  ecore_evas_move_resize(bd->internal_ecore_evas, x, y, bd->client.w, bd->client.h);
+	else
+	  ecore_x_window_move_resize(bd->client.win, x, y, bd->client.w, bd->client.h);
+	
+	ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
+	evas_object_resize(bd->bg_object, bd->w, bd->h);
+	e_container_shape_resize(bd->shape, bd->w, bd->h);
+	if (bd->changes.pos)
+	  e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
+
+	_e_border_client_move_resize_send(bd);
+
 	bd->changes.pos = 0;
 	bd->changes.size = 0;
 	rem_change = 1;
-    }
+     }
    else if (bd->changes.pos)
      {
 	if (1)
@@ -7057,129 +6641,12 @@ _e_border_eval(E_Border *bd)
 	     ecore_x_window_move(bd->win, bd->x + bd->fx.x, bd->y + bd->fx.y);
 	  }
 	e_container_shape_move(bd->shape, bd->x + bd->fx.x, bd->y + bd->fx.y);
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
+
+	_e_border_client_move_resize_send(bd);
+
 	bd->changes.pos = 0;
 	rem_change = 1;
      }
-   else if (bd->changes.size)
-     {
-	if (bd->shaded && !bd->shading)
-	  {
-	     evas_obscured_clear(bd->bg_evas);
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (1)
-	       {
-		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-							bd);
-		  bd->post_resize = 1;
-	       }
-	     else
-	       {
-		  ecore_x_window_resize(bd->win, bd->w, bd->h);
-	       }
-	     if (bd->internal_ecore_evas)
-	       ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, bd->client.w, bd->client.h);
-	     else
-	       ecore_x_window_move_resize(bd->client.win, 0, 0, bd->client.w, bd->client.h);
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	  }
-	else
-	  {
-	     evas_obscured_clear(bd->bg_evas);
-	     evas_obscured_rectangle_add(bd->bg_evas,
-					 bd->client_inset.l, bd->client_inset.t,
-					 bd->w - (bd->client_inset.l + bd->client_inset.r),
-					 bd->h - (bd->client_inset.t + bd->client_inset.b));
-	     ecore_x_window_move_resize(bd->event_win, 0, 0, bd->w, bd->h);
-	     if (1)
-	       {
-		  if (bd->post_job) ecore_idle_enterer_del(bd->post_job);
-		  bd->post_job = ecore_idle_enterer_add(_e_border_post_move_resize_job,
-							bd);
-		  bd->post_resize = 1;
-	       }
-	     else
-	       {
-		  ecore_x_window_resize(bd->win, bd->w, bd->h);
-	       }
-	     ecore_x_window_move_resize(bd->client.shell_win,
-					bd->client_inset.l, bd->client_inset.t,
-					bd->w - (bd->client_inset.l + bd->client_inset.r),
-					bd->h - (bd->client_inset.t + bd->client_inset.b));
-	     if (bd->shading)
-	       {
-		  if (bd->shade.dir == E_DIRECTION_UP)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0,
-						bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						bd->client.h,
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0,
-						    bd->h - (bd->client_inset.t + bd->client_inset.b) -
-						    bd->client.h,
-						    bd->client.w, bd->client.h);
-		    }
-		  else if (bd->shade.dir == E_DIRECTION_LEFT)
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas,
-						bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						bd->client.h,
-						0, bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win,
-						    bd->w - (bd->client_inset.l + bd->client_inset.r) -
-						    bd->client.h,
-						    0, bd->client.w, bd->client.h);
-		    }
-		  else
-		    {
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-						bd->client.w, bd->client.h);
-		       else
-			 ecore_x_window_move_resize(bd->client.win, 0, 0,
-						    bd->client.w, bd->client.h);
-		    }
-	       }
-	     else
-	       {
-		  if (bd->internal_ecore_evas)
-		    ecore_evas_move_resize(bd->internal_ecore_evas, 0, 0, 
-					   bd->client.w, bd->client.h);
-		  else
-		    ecore_x_window_move_resize(bd->client.win, 0, 0,
-					       bd->client.w, bd->client.h);
-	       }
-	     ecore_evas_move_resize(bd->bg_ecore_evas, 0, 0, bd->w, bd->h);
-	     evas_object_resize(bd->bg_object, bd->w, bd->h);
-	     e_container_shape_resize(bd->shape, bd->w, bd->h);
-	  }
-	if (bd->internal_ecore_evas)
-	  ecore_evas_managed_move(bd->internal_ecore_evas,
-				  bd->x + bd->fx.x + bd->client_inset.l,
-				  bd->y + bd->fx.y + bd->client_inset.t);
-	ecore_x_icccm_move_resize_send(bd->client.win,
-				       bd->x + bd->fx.x + bd->client_inset.l,
-				       bd->y + bd->fx.y + bd->client_inset.t,
-				       bd->client.w,
-				       bd->client.h);
-	bd->changes.size = 0;
-	rem_change = 1;
-     }
 
    if (bd->changes.reset_gravity)
      {
@@ -7343,14 +6810,8 @@ _e_border_eval(E_Border *bd)
 		       bd->y = y - (bd->client_inset.t >> 1);
 		       bd->changed = 1;
 		       bd->changes.pos = 1;
-		       if (bd->internal_ecore_evas)
-			 ecore_evas_managed_move(bd->internal_ecore_evas,
-						 bd->x + bd->fx.x + bd->client_inset.l,
-						 bd->y + bd->fx.y + bd->client_inset.t);
-		       ecore_x_icccm_move_resize_send(bd->client.win,
-						      bd->x + bd->fx.x + bd->client_inset.l,
-						      bd->y + bd->fx.y + bd->client_inset.t,
-						      bd->client.w, bd->client.h);
+
+		       _e_border_client_move_resize_send(bd);
 		    }
 	       }
 	  }
@@ -7393,12 +6854,19 @@ _e_border_eval(E_Border *bd)
 	     evas_object_del(bd->icon_object);
 	     bd->icon_object = NULL;
 	  }
+	if (bd->remember && bd->remember->prop.desktop_file)
+	  {
+	     const char *desktop = bd->remember->prop.desktop_file;
+
+	     bd->desktop = efreet_desktop_new(desktop); 
+	     if (!bd->desktop)
+	       bd->desktop = efreet_util_desktop_name_find(desktop);
+	  }
 	if (!bd->desktop)
 	  {
 	     if ((bd->client.icccm.name) && (bd->client.icccm.class))
 	       bd->desktop = efreet_util_desktop_wm_class_find(bd->client.icccm.name,
 							       bd->client.icccm.class);
-	     if (bd->desktop) efreet_desktop_ref(bd->desktop);
 	  }
 	if (!bd->desktop)
 	  {
@@ -7406,6 +6874,27 @@ _e_border_eval(E_Border *bd)
 						      bd->client.netwm.pid);
 	     if (bd->desktop) efreet_desktop_ref(bd->desktop);
 	  }
+	if (!bd->desktop && bd->client.icccm.name)
+	  {
+	     /* this works for most cases as fallback. useful when app is
+		run from a shell  */
+	     bd->desktop = efreet_util_desktop_exec_find(bd->client.icccm.name);
+	  }
+	if (!bd->desktop && bd->client.icccm.transient_for)
+	  {
+	     E_Border *bd2 = e_border_find_by_client_window(bd->client.icccm.transient_for); 
+	     if (bd2 && bd2->desktop)
+	       {
+		  efreet_desktop_ref(bd2->desktop);
+		  bd->desktop = bd2->desktop;
+	       }
+	  }
+	if (bd->desktop)
+	  {
+	     ecore_x_window_prop_string_set(bd->client.win, E_ATOM_DESKTOP_FILE,
+					    bd->desktop->orig_path);
+	  }
+
 	bd->icon_object = e_border_icon_add(bd, bd->bg_evas);
 	if ((bd->focused) && (bd->icon_object))
 	  edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
@@ -7420,7 +6909,7 @@ _e_border_eval(E_Border *bd)
 	  {
 	     E_Event_Border_Icon_Change *ev;
 
-	     ev = calloc(1, sizeof(E_Event_Border_Icon_Change));
+	     ev = E_NEW(E_Event_Border_Icon_Change, 1);
 	     ev->border = bd;
 	     e_object_ref(E_OBJECT(bd));
 //	     e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
@@ -7430,21 +6919,6 @@ _e_border_eval(E_Border *bd)
 	bd->changes.icon = 0;
      }
 
-   if (change_urgent)
-     {
-	if (bd->client.icccm.urgent)
-	  edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
-	else
-	  edje_object_signal_emit(bd->bg_object, "e,state,not_urgent", "e");
-	E_Event_Border_Urgent_Change *ev;
-
-	ev = calloc(1, sizeof(E_Event_Border_Urgent_Change));
-	ev->border = bd;
-	e_object_ref(E_OBJECT(bd));
-	ecore_event_add(E_EVENT_BORDER_URGENT_CHANGE, ev,
-	      _e_border_event_border_urgent_change_free, NULL);
-     }
-   
    bd->new_client = 0;
    bd->changed = 0;
    bd->changes.stack = 0;
@@ -7463,19 +6937,31 @@ _e_border_eval(E_Border *bd)
 		  e_border_focus_set_with_pointer(bd);
 	       }
 	  }
+	else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+	  {
+	     if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
+		 ((e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED) &&
+		  (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
+		   e_border_focused_get())))
+	       {
+		  if (!bd->lock_focus_out)
+		    e_border_focus_set_with_pointer(bd);
+	       }
+	  }
 	else
 	  {
-	     if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+	     /* focus window by default when it is the only one on desk */
+	     E_Border *bd2 = NULL;
+	     Eina_List *l;
+	     EINA_LIST_FOREACH(focus_stack, l, bd2)
 	       {
-		  if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
-		      ((e_config->focus_setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED) &&
-		       (e_border_find_by_client_window(bd->client.icccm.transient_for) ==
-			e_border_focused_get())))
-		    {
-		       if (!bd->lock_focus_out)
-			 e_border_focus_set_with_pointer(bd);
-		    }
+		  if (bd == bd2) continue;
+		  if ((!bd2->iconic) && (bd2->visible) &&  (bd->desk == bd2->desk))
+		    break;
 	       }
+
+	     if (!bd2)
+	       e_border_focus_set_with_pointer(bd);
 	  }
      }
 
@@ -7494,13 +6980,13 @@ _e_border_eval(E_Border *bd)
 	bd->need_fullscreen = 0;
      }
  
-   if ((bd->remember) && (rem_change))
-     e_remember_update(bd->remember, bd);
+   if (rem_change)
+     e_remember_update(bd);
 
    if (send_event) // FIXME: send only if a property changed - above need to
      // check on that. for now - always send.
      {
-	event = calloc(1, sizeof(E_Event_Border_Property));
+	event = E_NEW(E_Event_Border_Property, 1);
 	event->border = bd;
 	e_object_ref(E_OBJECT(bd));
 	ecore_event_add(E_EVENT_BORDER_PROPERTY, event, _e_border_event_border_property_free, NULL);
@@ -7713,7 +7199,7 @@ _e_border_shade_animator(void *data)
 	e_border_frame_recalc(bd);
 
 	ecore_x_window_gravity_set(bd->client.win, ECORE_X_GRAVITY_NW);
-	ev = calloc(1, sizeof(E_Event_Border_Resize));
+	ev = E_NEW(E_Event_Border_Resize, 1);
 	ev->border = bd;
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
@@ -7731,7 +7217,7 @@ _e_border_event_border_resize_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_resize_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7742,7 +7228,7 @@ _e_border_event_border_move_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_move_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7753,7 +7239,7 @@ _e_border_event_border_add_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_add_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7764,7 +7250,7 @@ _e_border_event_border_remove_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_remove_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7775,7 +7261,7 @@ _e_border_event_border_show_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_show_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7786,7 +7272,7 @@ _e_border_event_border_hide_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_hide_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7797,7 +7283,7 @@ _e_border_event_border_iconify_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_iconify_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7808,7 +7294,7 @@ _e_border_event_border_uniconify_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_uniconify_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7819,7 +7305,7 @@ _e_border_event_border_stick_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_stick_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7830,7 +7316,7 @@ _e_border_event_border_unstick_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_unstick_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7842,7 +7328,7 @@ _e_border_event_border_zone_set_free(void *data, void *ev)
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_zone_set_event");
    e_object_unref(E_OBJECT(e->border));
    e_object_unref(E_OBJECT(e->zone));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7854,7 +7340,7 @@ _e_border_event_border_desk_set_free(void *data, void *ev)
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_desk_set_event");
    e_object_unref(E_OBJECT(e->border));
    e_object_unref(E_OBJECT(e->desk));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7870,7 +7356,7 @@ _e_border_event_border_stack_free(void *data, void *ev)
 //	e_object_breadcrumb_del(E_OBJECT(e->above), "border_raise_event.above");
 	e_object_unref(E_OBJECT(e->stack));
      }
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7881,7 +7367,7 @@ _e_border_event_border_icon_change_free(void *data, void *ev)
    e = ev;
 //   e_object_breadcrumb_del(E_OBJECT(e->border), "border_icon_change_event");
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7891,7 +7377,7 @@ _e_border_event_border_urgent_change_free(void *data, void *ev)
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7901,7 +7387,7 @@ _e_border_event_border_focus_in_free(void *data, void *ev)
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7911,7 +7397,7 @@ _e_border_event_border_focus_out_free(void *data, void *ev)
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7921,7 +7407,7 @@ _e_border_event_border_property_free(void *data, void *ev)
 
    e = ev;
    e_object_unref(E_OBJECT(e->border));
-   free(e);
+   E_FREE(e);
 }
 
 static void
@@ -7929,6 +7415,7 @@ _e_border_zone_update(E_Border *bd)
 {
    E_Container *con;
    Eina_List *l;
+   E_Zone *zone;
 
    /* still within old zone - leave it there */
    if (E_INTERSECTS(bd->x, bd->y, bd->w, bd->h,
@@ -7936,11 +7423,8 @@ _e_border_zone_update(E_Border *bd)
      return;
    /* find a new zone */
    con = bd->zone->container;
-   for (l = con->zones; l; l = l->next)
+   EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	E_Zone *zone;
-
-	zone = l->data;
 	if (E_INTERSECTS(bd->x, bd->y, bd->w, bd->h,
 			 zone->x, zone->y, zone->w, zone->h))
 	  {
@@ -7953,55 +7437,34 @@ _e_border_zone_update(E_Border *bd)
 static int
 _e_border_resize_begin(E_Border *bd)
 {
-   int w, h;
-
    if (!bd->lock_user_stacking)
      {
 	if (e_config->border_raise_on_mouse_action)
 	  e_border_raise(bd);
      }
    if ((bd->shaded) || (bd->shading) ||
-       (((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)) ||
        (bd->fullscreen) || (bd->lock_user_size))
      return 0;
 
-   if ((bd->client.icccm.base_w >= 0) &&
-       (bd->client.icccm.base_h >= 0))
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   else
+   if ((bd->maximized) && (!e_config->allow_manip))
+     return 0;
+
+   if (grabbed && !e_grabinput_get(bd->win, 0, bd->win))
      {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
+	grabbed = 0;
+	return 0;
      }
-   if (grabbed)
-     e_grabinput_get(bd->win, 0, bd->win);
+   
    if (bd->client.netwm.sync.request)
      {
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
-	bd->client.netwm.sync.serial = 0;
+	bd->client.netwm.sync.serial = 1;
 	bd->client.netwm.sync.wait = 0;
 	bd->client.netwm.sync.send_time = ecore_loop_time_get();
      }
-   if (e_config->resize_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_resize_begin(bd->zone, w, h);
+
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_BEGIN, bd); 
+   
    resize = bd;
    return 1;
 }
@@ -8010,14 +7473,31 @@ static int
 _e_border_resize_end(E_Border *bd)
 {
    if (grabbed)
-     e_grabinput_release(bd->win, bd->win);
-   grabbed = 0;
+     {
+	e_grabinput_release(bd->win, bd->win);
+	grabbed = 0;
+     }
    if (bd->client.netwm.sync.alarm)
      {
+	E_Border_Pending_Move_Resize  *pnd;
+	
 	ecore_x_sync_alarm_free(bd->client.netwm.sync.alarm);
 	bd->client.netwm.sync.alarm = 0;
+	/* resize to last geometry if sync alarm for it was not yet handled */
+	if (bd->pending_move_resize)
+	  {
+	     bd->changed = 1;
+	     bd->changes.pos = 1;
+	     bd->changes.size = 1;
+	     _e_border_client_move_resize_send(bd);
+	  }
+	
+	EINA_LIST_FREE(bd->pending_move_resize, pnd)
+	  E_FREE(pnd);
      }
-   e_resize_end();
+
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_END, bd); 
+   
    resize = NULL;
    
    /* If this border was maximized, we need to unset Maximized state or
@@ -8031,36 +7511,7 @@ _e_border_resize_end(E_Border *bd)
 static void
 _e_border_resize_update(E_Border *bd)
 {
-   int w, h;
-
-   if ((bd->client.icccm.base_w >= 0) &&
-       (bd->client.icccm.base_h >= 0))
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   else
-     {
-	if (bd->client.icccm.step_w > 0)
-	  w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
-	else
-	  w = bd->client.w;
-	if (bd->client.icccm.step_h > 0)
-	  h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
-	else
-	  h = bd->client.h;
-     }
-   if (e_config->resize_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_resize_update(w, h);
+   _e_border_hook_call(E_BORDER_HOOK_RESIZE_UPDATE, bd);
 }
 
 static int
@@ -8071,12 +7522,17 @@ _e_border_move_begin(E_Border *bd)
 	if (e_config->border_raise_on_mouse_action)
 	  e_border_raise(bd);
      }
-   if ((((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)) ||
-       (bd->fullscreen) || (bd->lock_user_location))
+   if ((bd->fullscreen) || (bd->lock_user_location))
      return 0;
 
-   if (grabbed)
-     e_grabinput_get(bd->win, 0, bd->win);
+   if ((bd->maximized) && (!e_config->allow_manip))
+     return 0;
+
+   if (grabbed && !e_grabinput_get(bd->win, 0, bd->win))
+     {
+	grabbed = 0;
+	return 0;
+     }
 #if 0
    if (bd->client.netwm.sync.request)
      {
@@ -8086,11 +7542,8 @@ _e_border_move_begin(E_Border *bd)
 	bd->client.netwm.sync.time = ecore_loop_time_get();
      }
 #endif
-   if (e_config->move_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_move_begin(bd->zone, bd->x, bd->y);
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_BEGIN, bd);
+   
    move = bd;
    return 1;
 }
@@ -8099,8 +7552,10 @@ static int
 _e_border_move_end(E_Border *bd)
 {
    if (grabbed)
-     e_grabinput_release(bd->win, bd->win);
-   grabbed = 0;
+     {
+	e_grabinput_release(bd->win, bd->win);
+	grabbed = 0;
+     }
 #if 0
    if (bd->client.netwm.sync.alarm)
      {
@@ -8108,7 +7563,8 @@ _e_border_move_end(E_Border *bd)
 	bd->client.netwm.sync.alarm = 0;
      }
 #endif
-   e_move_end();
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_END, bd);
+   
    move = NULL;
    return 1;
 }
@@ -8116,11 +7572,7 @@ _e_border_move_end(E_Border *bd)
 static void
 _e_border_move_update(E_Border *bd)
 {
-   if (e_config->move_info_follows)
-     e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
-   else
-     e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
-   e_move_update(bd->x, bd->y);
+   _e_border_hook_call(E_BORDER_HOOK_MOVE_UPDATE, bd);
 }
 
 static int
@@ -8259,34 +7711,28 @@ static int _e_border_hooks_walking = 0;
 static void
 _e_border_hooks_clean(void)
 {
-   Eina_List *l, *pl;
+   Eina_List *l, *ln;
+   E_Border_Hook *bh;
    
-   for (l = _e_border_hooks; l;)
+   EINA_LIST_FOREACH_SAFE(_e_border_hooks, l, ln, bh)
      {
-	E_Border_Hook *bh;
-	
-	bh = l->data;
-	pl = l;
-	l = l->next;
 	if (bh->delete_me)
 	  {
-	     _e_border_hooks = eina_list_remove_list(_e_border_hooks, pl);
+	     _e_border_hooks = eina_list_remove_list(_e_border_hooks, l);
 	     free(bh);
 	  }
      }
 }
 
 static void
-_e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd)
+_e_border_hook_call(E_Border_Hook_Point hookpoint, void *bd)
 {
    Eina_List *l;
+   E_Border_Hook *bh;
 
    _e_border_hooks_walking++;
-   for (l = _e_border_hooks; l; l = l->next)
+   EINA_LIST_FOREACH(_e_border_hooks, l, bh)
      {
-	E_Border_Hook *bh;
-	
-	bh = l->data;
 	if (bh->delete_me) continue;
 	if (bh->hookpoint == hookpoint) bh->func(bh->data, bd);
      }
@@ -8296,7 +7742,7 @@ _e_border_hook_call(E_Border_Hook_Point hookpoint, E_Border *bd)
 }
 
 EAPI E_Border_Hook *
-e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Border *bd), void *data)
+e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, void *bd), void *data)
 {
    E_Border_Hook *bh;
    
@@ -8337,7 +7783,7 @@ e_border_focus_track_thaw(void)
 EAPI E_Border *
 e_border_under_pointer_get(E_Desk *desk, E_Border *exclude)
 {
-   E_Border *bd = NULL;
+   E_Border *bd = NULL, *cbd;
    Eina_List *l;
    int x, y;
 
@@ -8351,11 +7797,8 @@ e_border_under_pointer_get(E_Desk *desk, E_Border *exclude)
    else
      return NULL;
 
-   for (l = e_border_raise_stack_get(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_raise_stack_get(), l, cbd)
      {
-	E_Border *cbd;
-
-	cbd = l->data;
 	if (!cbd) continue;
 	/* If a border was specified which should be excluded from the list
 	 * (because it will be closed shortly for example), skip */
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 486aac4..32a4264 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -88,6 +88,15 @@ typedef enum _E_Border_Hook_Point
    E_BORDER_HOOK_EVAL_PRE_NEW_BORDER,
    E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
    E_BORDER_HOOK_EVAL_END,
+   E_BORDER_HOOK_CONTAINER_LAYOUT,
+   E_BORDER_HOOK_NEW_BORDER,
+   E_BORDER_HOOK_SET_DESK,
+   E_BORDER_HOOK_MOVE_BEGIN,
+   E_BORDER_HOOK_MOVE_UPDATE,
+   E_BORDER_HOOK_MOVE_END,
+   E_BORDER_HOOK_RESIZE_BEGIN,
+   E_BORDER_HOOK_RESIZE_UPDATE,
+   E_BORDER_HOOK_RESIZE_END
 } E_Border_Hook_Point;
 
 typedef struct _E_Border                     E_Border;
@@ -516,12 +525,13 @@ struct _E_Border_Pending_Move_Resize
    unsigned char move : 1;
    unsigned char resize : 1;
    unsigned char without_border : 1;
+   unsigned int  serial;
 };
 
 struct _E_Border_Hook
 {
    E_Border_Hook_Point   hookpoint;
-   void                (*func) (void *data, E_Border *bd);
+   void                (*func) (void *data, void *bd);
    void                 *data;
    unsigned char         delete_me : 1;
 };
@@ -638,7 +648,7 @@ EAPI void e_border_signal_resize_begin(E_Border *bd, const char *dir, const char
 EAPI void e_border_signal_resize_end(E_Border *bd, const char *dir, const char *sig, const char *src);
 EAPI void e_border_resize_limit(E_Border *bd, int *w, int *h);
 
-EAPI E_Border_Hook *e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, E_Border *bd), void *data);
+EAPI E_Border_Hook *e_border_hook_add(E_Border_Hook_Point hookpoint, void (*func) (void *data, void *bd), void *data);
 EAPI void e_border_hook_del(E_Border_Hook *bh);
 EAPI void e_border_focus_track_freeze(void);
 EAPI void e_border_focus_track_thaw(void);
diff --git a/src/bin/e_box.c b/src/bin/e_box.c
index 27134e6..cee34d7 100644
--- a/src/bin/e_box.c
+++ b/src/bin/e_box.c
@@ -164,15 +164,17 @@ e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
    E_Smart_Data *sd;
    int i = 0;
    Eina_List *l;
+   Evas_Object *item;
    
    if (!child) return 0;
    sd = evas_object_smart_data_get(obj);
    if (!sd) return 0;
    _e_box_smart_adopt(sd, child);
    sd->items = eina_list_prepend_relative(sd->items, child, before);
-   for (i = 0, l = sd->items; l; l = l->next, i++)
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	if (l->data == child) break;
+	if (item == child) break;
+	i++;
      }
    sd->changed = 1;
    if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
@@ -185,15 +187,17 @@ e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
    E_Smart_Data *sd;
    int i = 0;
    Eina_List *l;
+   Evas_Object *item;
    
    if (!child) return 0;
    sd = evas_object_smart_data_get(obj);
    if (!sd) return 0;
    _e_box_smart_adopt(sd, child);
    sd->items = eina_list_append_relative(sd->items, child, after);
-   for (i = 0, l = sd->items; l; l = l->next, i++)
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	if (l->data == child) break;
+	if (item == child) break;
+	i++;
      }
    sd->changed = 1;
    if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
@@ -279,7 +283,7 @@ e_box_unpack(Evas_Object *obj)
 }
 
 EAPI void
-e_box_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    E_Smart_Data *sd;
    
@@ -291,7 +295,7 @@ e_box_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 }
 
 EAPI void
-e_box_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
+e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
 {
    E_Smart_Data *sd;
    
@@ -405,6 +409,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
 {
    Evas_Coord x, y, w, h, xx, yy;
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh, wdif, hdif;
    int count, expand;
 
@@ -430,12 +435,9 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
 	y = y + ((h - minh) * (1.0 - sd->align.y));
 	h = minh;
      }
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Box_Item *bi;
-	Evas_Object *obj;
-	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_box_data");
 	if (bi)
 	  {
@@ -466,12 +468,10 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
    hdif = h - minh;
    xx = x;
    yy = y;
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Box_Item *bi;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_box_data");
 	if (bi)
 	  {
@@ -578,6 +578,7 @@ static void
 _e_box_smart_extents_calculate(E_Smart_Data *sd)
 {
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh;
 
    /* FIXME: need to calc max */
@@ -588,12 +589,10 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
    minh = 0;
    if (sd->homogenous)
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Box_Item *bi;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     bi = evas_object_data_get(obj, "e_box_data");	
 	     if (bi)
 	       {
@@ -608,12 +607,10 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
      }
    else
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Box_Item *bi;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     bi = evas_object_data_get(obj, "e_box_data");
 	     if (bi)
 	       {
@@ -698,7 +695,7 @@ _e_box_smart_del(Evas_Object *obj)
      {
 	Evas_Object *child;
 	
-	child = sd->items->data;
+	child = eina_list_data_get(sd->items);
 	e_box_unpack(child);
      }
    e_box_thaw(obj);
@@ -718,16 +715,17 @@ _e_box_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((x == sd->x) && (y == sd->y)) return;
      {
 	Eina_List *l;
+	Evas_Object *item;
 	Evas_Coord dx, dy;
 	
 	dx = x - sd->x;
 	dy = y - sd->y;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
 	     
-	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-	     evas_object_move(l->data, ox + dx, oy + dy);
+	     evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
+	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
    sd->x = x;
diff --git a/src/bin/e_box.h b/src/bin/e_box.h
index 03e6c95..e846cb2 100644
--- a/src/bin/e_box.h
+++ b/src/bin/e_box.h
@@ -22,8 +22,8 @@ EAPI Evas_Object *e_box_pack_object_first (Evas_Object *obj);
 EAPI Evas_Object *e_box_pack_object_last  (Evas_Object *obj);
 EAPI void         e_box_pack_options_set  (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
 EAPI void         e_box_unpack            (Evas_Object *obj);
-EAPI void         e_box_min_size_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-EAPI void         e_box_max_size_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+EAPI void         e_box_size_min_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void         e_box_size_max_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
 EAPI void         e_box_align_get         (Evas_Object *obj, double *ax, double *ay);
 EAPI void         e_box_align_set         (Evas_Object *obj, double ax, double ay);
 EAPI void	  e_box_align_pixel_offset_get (Evas_Object *obj, int *x, int *y);
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index 7aade59..ec74718 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -80,13 +80,12 @@ EAPI void
 e_canvas_recache(void)
 {
    Eina_List *l;
-   
-   for (l = _e_canvases; l; l = l->next)
+   Ecore_Evas *ee;
+
+   EINA_LIST_FOREACH(_e_canvases, l, ee)   
      {
-	Ecore_Evas *ee;
 	Evas *e;
 	
-	ee = l->data;
 	e = ecore_evas_get(ee);
 	evas_image_cache_set(e, e_config->image_cache * 1024);
 	evas_font_cache_set(e, e_config->font_cache * 1024);
@@ -111,13 +110,12 @@ EAPI void
 e_canvas_cache_flush(void)
 {
    Eina_List *l;
-   
-   for (l = _e_canvases; l; l = l->next)
+   Ecore_Evas *ee;
+
+   EINA_LIST_FOREACH(_e_canvases, l, ee)   
      {
-	Ecore_Evas *ee;
 	Evas *e;
 	
-	ee = l->data;
 	e = ecore_evas_get(ee);
 	evas_image_cache_flush(e);
 	evas_font_cache_flush(e);
@@ -130,13 +128,12 @@ EAPI void
 e_canvas_cache_reload(void)
 {
    Eina_List *l;
-   
-   for (l = _e_canvases; l; l = l->next)
+   Ecore_Evas *ee;
+
+   EINA_LIST_FOREACH(_e_canvases, l, ee)   
      {
-	Ecore_Evas *ee;
 	Evas *e;
 	
-	ee = l->data;
 	e = ecore_evas_get(ee);
 	evas_image_cache_reload(e);
      }
@@ -146,13 +143,12 @@ EAPI void
 e_canvas_idle_flush(void)
 {
    Eina_List *l;
-   
-   for (l = _e_canvases; l; l = l->next)
+   Ecore_Evas *ee;
+
+   EINA_LIST_FOREACH(_e_canvases, l, ee)   
      {
-	Ecore_Evas *ee;
 	Evas *e;
 	
-	ee = l->data;
 	e = ecore_evas_get(ee);
 	evas_render_idle_flush(e);
      }
@@ -162,13 +158,12 @@ EAPI void
 e_canvas_rehint(void)
 {
    Eina_List *l;
-   
-   for (l = _e_canvases; l; l = l->next)
+   Ecore_Evas *ee;
+
+   EINA_LIST_FOREACH(_e_canvases, l, ee)   
      {
-	Ecore_Evas *ee;
 	Evas *e;
 	
-	ee = l->data;
 	e = ecore_evas_get(ee);
 	if (e_config->font_hinting == 0)
 	  evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE);
diff --git a/src/bin/e_color_class.c b/src/bin/e_color_class.c
index 63cc9d0..98bfd76 100644
--- a/src/bin/e_color_class.c
+++ b/src/bin/e_color_class.c
@@ -7,12 +7,10 @@ EAPI int
 e_color_class_init(void)
 {
   Eina_List *l;
+  E_Color_Class *cc;
 
-  for (l = e_config->color_classes; l; l = l->next)
+  EINA_LIST_FOREACH(e_config->color_classes, l, cc)
     {
-       E_Color_Class *cc;
-
-       cc = l->data;
        if (!cc) continue;
 
        printf("INIT CC: %s, %d %d %d %d\n", cc->name, cc->r, cc->g, cc->b, cc->a);
@@ -90,9 +88,8 @@ e_color_class_find(const char *name)
   Eina_List *l;
   E_Color_Class *cc = NULL;
 
-  for (l = e_config->color_classes; l; l = l->next)
+  EINA_LIST_FOREACH(e_config->color_classes, l, cc)
     {
-       cc = l->data;
        if (!cc) continue;
 
        if (!strcmp(cc->name, name))
diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c
index 29705b6..2a3673e 100644
--- a/src/bin/e_color_dialog.c
+++ b/src/bin/e_color_dialog.c
@@ -40,7 +40,7 @@ e_color_dialog_new(E_Container *con, const E_Color *color)
 
    o = e_widget_csel_add(dia->dia->win->evas, dia->color);
    evas_object_show(o);
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia->dia, o, 460, 260);
    e_widget_on_change_hook_set(o, _e_color_dialog_cb_csel_change, dia);
 
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index c0ee7ce..3335feb 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -11,7 +11,7 @@
 
 EAPI E_Config *e_config = NULL;
 
-static int _e_config_revisions = 9;
+static int _e_config_revisions = 0;
 
 /* local subsystem functions */
 static void _e_config_save_cb(void *data);
@@ -328,6 +328,7 @@ e_config_init(void)
 #define D _e_config_remember_edd
    E_CONFIG_VAL(D, T, match, INT);
    E_CONFIG_VAL(D, T, apply_first_only, UCHAR);
+   E_CONFIG_VAL(D, T, keep_settings, UCHAR);
    E_CONFIG_VAL(D, T, name, STR);
    E_CONFIG_VAL(D, T, class, STR);
    E_CONFIG_VAL(D, T, title, STR);
@@ -381,7 +382,8 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, prop.head, INT);
    E_CONFIG_VAL(D, T, prop.command, STR);
    E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
-   
+   E_CONFIG_VAL(D, T, prop.desktop_file, STR);
+
    _e_config_color_class_edd = E_CONFIG_DD_NEW("E_Color_Class", E_Color_Class);
 #undef T
 #undef D
@@ -1044,7 +1046,7 @@ e_config_load(void)
    E_CONFIG_LIMIT(e_config->desk_flip_pan_bg, 0, 1);
    E_CONFIG_LIMIT(e_config->desk_flip_pan_x_axis_factor, 0.0, 1.0);
    E_CONFIG_LIMIT(e_config->desk_flip_pan_y_axis_factor, 0.0, 1.0);
-   E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 1);
+   E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3);
    E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
 
    E_CONFIG_LIMIT(e_config->dpms_enable, 0, 1);
@@ -1303,8 +1305,6 @@ e_config_domain_load(const char *domain, E_Config_DD *edd)
    
    for (i =1; i <= _e_config_revisions; i++)
      {
-        char buf2[4096];
-        
         e_user_dir_snprintf(buf, sizeof(buf), "config/%s/%s.%i.cfg",
                             _e_config_profile, domain, i);
         ef = eet_open(buf, EET_FILE_MODE_READ);
@@ -1450,12 +1450,10 @@ EAPI E_Config_Binding_Mouse *
 e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
 {
    Eina_List *l;
-   
-   for (l = e_config->mouse_bindings; l; l = l->next)
+   E_Config_Binding_Mouse *eb;
+
+   EINA_LIST_FOREACH(e_config->mouse_bindings, l, eb)   
      {
-	E_Config_Binding_Mouse *eb;
-	
-	eb = l->data;
 	if ((eb->context == eb_in->context) &&
 	    (eb->button == eb_in->button) &&
 	    (eb->modifiers == eb_in->modifiers) &&
@@ -1473,12 +1471,10 @@ EAPI E_Config_Binding_Key *
 e_config_binding_key_match(E_Config_Binding_Key *eb_in)
 {
    Eina_List *l;
+   E_Config_Binding_Key *eb;
    
-   for (l = e_config->key_bindings; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->mouse_bindings, l, eb)   
      {
-	E_Config_Binding_Key *eb;
-	
-	eb = l->data;
 	if ((eb->context == eb_in->context) &&
 	    (eb->modifiers == eb_in->modifiers) &&
 	    (eb->any_mod == eb_in->any_mod) &&
@@ -1497,12 +1493,10 @@ EAPI E_Config_Binding_Edge *
 e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
 {
    Eina_List *l;
+   E_Config_Binding_Edge *eb;
    
-   for (l = e_config->edge_bindings; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->edge_bindings, l, eb)
      {
-	E_Config_Binding_Edge *eb;
-	
-	eb = l->data;
 	if ((eb->context == eb_in->context) &&
 	    (eb->modifiers == eb_in->modifiers) &&
 	    (eb->any_mod == eb_in->any_mod) &&
@@ -1521,12 +1515,10 @@ EAPI E_Config_Binding_Signal *
 e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
 {
    Eina_List *l;
+   E_Config_Binding_Signal *eb;
    
-   for (l = e_config->signal_bindings; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->signal_bindings, l, eb)
      {
-	E_Config_Binding_Signal *eb;
-	
-	eb = l->data;
 	if ((eb->context == eb_in->context) &&
 	    (eb->modifiers == eb_in->modifiers) &&
 	    (eb->any_mod == eb_in->any_mod) &&
@@ -1547,12 +1539,10 @@ EAPI E_Config_Binding_Wheel *
 e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
 {
    Eina_List *l;
-   
-   for (l = e_config->wheel_bindings; l; l = l->next)
+   E_Config_Binding_Wheel *eb;
+  
+   EINA_LIST_FOREACH(e_config->wheel_bindings, l, eb)
      {
-	E_Config_Binding_Wheel *eb;
-	
-	eb = l->data;
 	if ((eb->context == eb_in->context) &&
 	    (eb->direction == eb_in->direction) &&
 	    (eb->z == eb_in->z) &&
diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c
index d15699b..2e60103 100644
--- a/src/bin/e_config_data.c
+++ b/src/bin/e_config_data.c
@@ -7,23 +7,15 @@ EAPI E_Config_DD *
 e_config_descriptor_new(const char *name, int size)
 {
    Eet_Data_Descriptor_Class eddc;
-   
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.mem_alloc = NULL;
-   eddc.func.mem_free = NULL;
-   eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
-   eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
-   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
-   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
-   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
-   eddc.func.list_free = (void *(*)(void *)) eina_list_free;
-   eddc.func.hash_foreach =
-      (void  (*) (const Eina_Hash *, Eina_Bool (*) (const Eina_Hash *, const void *, void *, void *), const void *))
-      eina_hash_foreach;
-   eddc.func.hash_add = (Eina_Hash* (*) (Eina_Hash *, const void *, void *)) eet_eina_hash_add_alloc;
-   eddc.func.hash_free = (void  (*) (Eina_Hash *)) eina_hash_free;
-   eddc.name = name;
-   eddc.size = size;
-   return (E_Config_DD *)eet_data_descriptor2_new(&eddc);
+
+   if (!eet_eina_file_data_descriptor_class_set(&eddc, name, size))
+     return NULL;
+
+   /* FIXME: We can directly map string inside an Eet_File as we
+      need to change every config destructor in E for that. */
+   eddc.func.str_direct_alloc = NULL;
+   eddc.func.str_direct_free = NULL;
+
+   return (E_Config_DD *) eet_data_descriptor_file_new(&eddc);
 }
 
diff --git a/src/bin/e_config_data.h b/src/bin/e_config_data.h
index 0a38dea..d27e4f8 100644
--- a/src/bin/e_config_data.h
+++ b/src/bin/e_config_data.h
@@ -29,15 +29,6 @@ typedef Eet_Data_Descriptor                 E_Config_DD;
 #ifndef E_CONFIG_DATA_H
 #define E_CONFIG_DATA_H
 
-static inline Eina_Hash *
-eet_eina_hash_add_alloc(Eina_Hash *hash, const void *key, void *data)
-{
-   if (!hash) hash = eina_hash_string_superfast_new(NULL);
-   if (!hash) return NULL;
-   eina_hash_add(hash, key, data);
-   return hash;
-}
-
 EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
 
 #endif
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index cf02f84..374bb5b 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -24,8 +24,9 @@ EAPI E_Config_Dialog *
 e_config_dialog_new(E_Container *con, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data)
 {
    E_Config_Dialog *cfd;
-   
-   cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free);
+
+   cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, 
+                        _e_config_dialog_free);
    cfd->view = view;
    cfd->con = con;
    cfd->title = eina_stringshare_add(title);
@@ -44,7 +45,8 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
    if (cfd->view->override_auto_apply)
      {
 	/* Dialog Requested To Not Auto-Apply */
-	if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata))
+	if ((cfd->view->basic.apply_cfdata) || 
+            (cfd->view->advanced.apply_cfdata))
 	  cfd->hide_buttons = 0;
      }
    else
@@ -54,7 +56,8 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
 	  cfd->hide_buttons = 1;
 	else
 	  {
-	     if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata))
+	     if ((cfd->view->basic.apply_cfdata) || 
+                 (cfd->view->advanced.apply_cfdata))
 	       cfd->hide_buttons = 0;
 	  }
      }
@@ -73,7 +76,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
 	break;
      }
    _e_config_dialog_list = eina_list_append(_e_config_dialog_list, cfd);
-   
+
    return cfd;
 }
 
@@ -82,11 +85,9 @@ e_config_dialog_find(const char *name, const char *class)
 {
    Eina_List *l;
    E_Config_Dialog *cfd;
-   
-   for (l = _e_config_dialog_list; l; l = l->next)
-     {
-	cfd = l->data;
 
+   EINA_LIST_FOREACH(_e_config_dialog_list, l, cfd)
+     {
 	if ((!e_util_strcmp(name, cfd->name)) &&
 	    (!e_util_strcmp(class, cfd->class)))
 	  {
@@ -116,12 +117,11 @@ EAPI E_Config_Dialog *
 e_config_dialog_get(const char *name, const char *class) 
 {
    Eina_List *l;
+   E_Config_Dialog *cfd;
 
-   for (l = _e_config_dialog_list; l; l = l->next)
+   EINA_LIST_FOREACH(_e_config_dialog_list, l, cfd)
      {
-	E_Config_Dialog *cfd;
-
-	if (!(cfd = l->data)) continue;
+	if (!cfd) continue;
 	if ((!e_util_strcmp(name, cfd->name)) &&
 	    (!e_util_strcmp(class, cfd->class)))
 	  {
@@ -132,7 +132,6 @@ e_config_dialog_get(const char *name, const char *class)
 }
 
 /* local subsystem functions */
-
 static void
 _e_config_dialog_free(E_Config_Dialog *cfd)
 {
@@ -154,12 +153,13 @@ _e_config_dialog_free(E_Config_Dialog *cfd)
 	cfd->dia = NULL;
      }
    E_FREE(cfd->view);
-   free(cfd);
+   E_FREE(cfd);
 }
 
 static void
 _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 {
+   Evas *evas;
    E_Dialog *pdia;
    Evas_Object *o, *ob, *sf;
    Evas_Coord mw = 0, mh = 0;
@@ -167,18 +167,20 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 
    pdia = cfd->dia;
    /* FIXME: get name/class form new call and use here */
-   if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
-     snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "BASIC");
-   else
-     snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED");
-
+   /* if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
+    *   snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "BASIC");
+    * else
+    *   snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED"); */
+   snprintf(buf, sizeof(buf), "_config::%s", cfd->class);
+   
    if (!pdia)  /* creating window for the first time */
      {
        if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
          cfd->dia = e_dialog_normal_win_new(cfd->con, cfd->name, buf);
        else
          cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
-       e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del);
+       e_object_del_attach_func_set(E_OBJECT(cfd->dia), 
+                                    _e_config_dialog_cb_dialog_del);
      }         /* window was created before - deleting content only */
    else if (cfd->dia->content_object)
      evas_object_del(cfd->dia->content_object);
@@ -187,32 +189,33 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
    e_dialog_title_set(cfd->dia, cfd->title);
    if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd);
 
+   evas = e_win_evas_get(cfd->dia->win);
    if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
      {
 	if (cfd->view->advanced.create_widgets)
 	  {
 	     o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
-	     ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(ob);
-		  sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob);
+		  e_widget_size_min_resize(ob);
+		  sf = e_widget_scrollframe_simple_add(evas, ob);
 		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
 	       }
 	     else
 	       e_widget_list_object_append(o, ob, 1, 1, 0.0);
-	     ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
+	     ob = e_widget_button_add(evas,
 				      _("Advanced"), "go-next",
 				      _e_config_dialog_cb_advanced, cfd, NULL);
 	     e_widget_list_object_append(o, ob, 0, 0, 1.0);
 	  }
 	else
 	  {
-	     o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(o);
-		  o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o);
+		  e_widget_size_min_resize(o);
+		  o = e_widget_scrollframe_simple_add(evas, o);
 	       }
 	  }
      }
@@ -220,33 +223,33 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
      {
 	if (cfd->view->basic.create_widgets)
 	  {
-	     o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
-	     ob = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     o = e_widget_list_add(evas, 0, 0);
+	     ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(ob);
-		  sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob);
+		  e_widget_size_min_resize(ob);
+		  sf = e_widget_scrollframe_simple_add(evas, ob);
 		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
 	       }
 	     else
 	       e_widget_list_object_append(o, ob, 1, 1, 0.0);
-	     ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), 
+	     ob = e_widget_button_add(evas, 
 				      _("Basic"), "go-next",
 				      _e_config_dialog_cb_basic, cfd, NULL);
 	     e_widget_list_object_append(o, ob, 0, 0, 1.0);
 	  }
 	else
 	  {
-	     o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata);
+	     o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(o);
-		  o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o);
+		  e_widget_size_min_resize(o);
+		  o = e_widget_scrollframe_simple_add(evas, o);
 	       }
 	  }
      }
-   
-   e_widget_min_size_get(o, &mw, &mh);
+
+   e_widget_size_min_get(o, &mw, &mh);
    e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd);
    e_dialog_content_set(cfd->dia, o, mw, mh);
 
@@ -318,16 +321,16 @@ _e_config_dialog_cb_ok(void *data, E_Dialog *dia)
 
    cfd = dia->data;
    if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
-      {
-         if (cfd->view->basic.apply_cfdata)
-	   ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
-      }
+     {
+        if (cfd->view->basic.apply_cfdata)
+          ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
+     }
    else
-      {
-         if (cfd->view->advanced.apply_cfdata)
-	   ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
-      }
-   if (ok)
+     {
+        if (cfd->view->advanced.apply_cfdata)
+          ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
+     }
+   if (ok) 
      e_util_defer_object_del(E_OBJECT(cfd));
 }
 
@@ -339,15 +342,15 @@ _e_config_dialog_cb_apply(void *data, E_Dialog *dia)
 
    cfd = dia->data;
    if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
-      {
-         if (cfd->view->basic.apply_cfdata)
-	   ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
-      }
+     {
+        if (cfd->view->basic.apply_cfdata)
+          ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
+     }
    else
-      {
-         if (cfd->view->advanced.apply_cfdata)
-	   ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
-      }   
+     {
+        if (cfd->view->advanced.apply_cfdata)
+          ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
+     }
    if ((ok) && (!cfd->hide_buttons))
      {
 	cfd->cfg_changed = 0;
@@ -387,9 +390,10 @@ _e_config_dialog_changed(E_Config_Dialog *cfd)
      }
    else
      {
-	if (cfd->auto_apply_timer)
-	  ecore_timer_del(cfd->auto_apply_timer);
-	cfd->auto_apply_timer = ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
+	if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer);
+        cfd->auto_apply_timer = NULL;
+	cfd->auto_apply_timer = 
+          ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
      }
 }
 
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index b79b9dd..a5f6a56 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -51,11 +51,7 @@ e_container_init(void)
 EAPI int
 e_container_shutdown(void)
 {
-   while (handlers)
-     {
-	ecore_event_handler_del(handlers->data);
-	handlers = eina_list_remove_list(handlers, handlers);
-     }
+   E_FREE_LIST(handlers, ecore_event_handler_del);
    return 1;
 }
 
@@ -159,11 +155,9 @@ e_container_new(E_Manager *man)
    screens = (Eina_List *)e_xinerama_screens_get();
    if (screens)
      {
-	for (l = screens; l; l = l->next)
+	E_Screen *scr;
+	EINA_LIST_FOREACH(screens, l, scr)
 	  {
-	     E_Screen *scr;
-
-	     scr = l->data;
 	     zone = e_zone_new(con, scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
 	  }
      }
@@ -208,35 +202,32 @@ EAPI E_Container *
 e_container_current_get(E_Manager *man)
 {
    Eina_List *l;
+   E_Container *con;
    E_OBJECT_CHECK_RETURN(man, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
 
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-        
-        if (!(con = l->data)) continue;
+        if (!con) continue;
 	if (con->visible) return con;
      }
 
    /* If noone is available, return the first */
    if (!man->containers) return NULL;
    l = man->containers;
-   return (E_Container *)l->data;
+   return (E_Container *)eina_list_data_get(l);
 }
 
 EAPI E_Container *
 e_container_number_get(E_Manager *man, int num)
 {
    Eina_List *l;
+   E_Container *con;
 
    E_OBJECT_CHECK_RETURN(man, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-
-	con = l->data;
 	if (con->num == num) return con;
      }
    return NULL;
@@ -306,14 +297,12 @@ EAPI E_Zone *
 e_container_zone_at_point_get(E_Container *con, int x, int y)
 {
    Eina_List *l = NULL;
+   E_Zone *zone = 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)
+   EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	E_Zone *zone;
-
-	zone = l->data;
 	if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	  return zone;
      }
@@ -324,14 +313,12 @@ EAPI E_Zone *
 e_container_zone_number_get(E_Container *con, int num)
 {
    Eina_List *l = NULL;
+   E_Zone *zone = 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)
+   EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	E_Zone *zone;
-
-	zone = l->data;
 	if (zone->num == num) return zone;
      }
    return NULL;
@@ -341,14 +328,12 @@ EAPI E_Zone *
 e_container_zone_id_get(E_Container *con, int id)
 {
    Eina_List *l = NULL;
+   E_Zone *zone = 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)
+   EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	E_Zone *zone;
-
-	zone = l->data;
 	if (zone->id == id) return zone;
      }
    return NULL;
@@ -459,15 +444,13 @@ 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)
 {
    Eina_List *l = NULL;
+   E_Container_Shape_Callback *cb = NULL;
 
    /* FIXME: if we call this from within a callback we are in trouble */
    E_OBJECT_CHECK(con);
    E_OBJECT_TYPE_CHECK(con, E_CONTAINER_TYPE);
-   for (l = con->shape_change_cb; l; l = l->next)
+   EINA_LIST_FOREACH(con->shape_change_cb, l, cb)
      {
-	E_Container_Shape_Callback *cb;
-
-	cb = l->data;
 	if ((cb->func == func) && (cb->data == data))
 	  {
 	     con->shape_change_cb = eina_list_remove_list(con->shape_change_cb, l);
@@ -488,7 +471,6 @@ 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)
 {
-   Eina_List *l = NULL;
    int i;
    E_Rect *r;
 
@@ -496,9 +478,7 @@ e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int
    E_OBJECT_TYPE_CHECK(es, E_CONTAINER_SHAPE_TYPE);
    if (es->shape)
      {
-	for (l = es->shape; l; l = l->next)
-	  free(l->data);
-	eina_list_free(es->shape);
+	E_FREE_LIST(es->shape, free);
 	es->shape = NULL;
      }
    if ((rects) && (num == 1) &&
@@ -668,8 +648,8 @@ e_container_border_raise(E_Border *bd)
 
    /* Find the window below this one */
    l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
-   if (l->prev)
-     above = l->prev->data;
+   if (eina_list_prev(l))
+     above = eina_list_data_get(eina_list_prev(l));
    else
      {
 	/* Need to check the layers below */
@@ -678,7 +658,7 @@ e_container_border_raise(E_Border *bd)
 	     if ((bd->zone->container->layers[i].clients) &&
 		 (l = eina_list_last(bd->zone->container->layers[i].clients)))
 	       {
-		  above = l->data;
+		  above = eina_list_data_get(l);
 		  break;
 	       }
 	  }
@@ -722,8 +702,8 @@ e_container_border_lower(E_Border *bd)
 
    /* Find the window above this one */
    l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
-   if (l->next)
-     below = l->next->data;
+   if (eina_list_next(l))
+     below = eina_list_data_get(eina_list_next(l));
    else
      {
 	/* Need to check the layers above */
@@ -731,7 +711,7 @@ e_container_border_lower(E_Border *bd)
 	  {
 	     if (bd->zone->container->layers[i].clients)
 	       {
-		  below = bd->zone->container->layers[i].clients->data;
+		  below = eina_list_data_get(bd->zone->container->layers[i].clients);
 		  break;
 	       }
 	  }
@@ -849,9 +829,9 @@ e_container_border_list_next(E_Border_List *list)
 
    if (!list->clients) return NULL;
 
-   bd = list->clients->data;
+   bd = eina_list_data_get(list->clients);
 
-   list->clients = list->clients->next;
+   list->clients = eina_list_next(list->clients);
    while ((list->layer < 6) && (!list->clients))
      list->clients = list->container->layers[++list->layer].clients;
    return bd;
@@ -864,9 +844,9 @@ e_container_border_list_prev(E_Border_List *list)
 
    if (!list->clients) return NULL;
 
-   bd = list->clients->data;
+   bd = eina_list_data_get(list->clients);
 
-   list->clients = list->clients->prev;
+   list->clients = eina_list_prev(list->clients);
    while ((list->layer > 0) && (!list->clients))
      {
 	list->layer--;
@@ -886,20 +866,14 @@ e_container_border_list_free(E_Border_List *list)
 EAPI void
 e_container_all_freeze(void)
 {
-   Eina_List *managers, *l;
+   Eina_List *l, *ll;
+   E_Manager *man;
+   E_Container *con;
 
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	Eina_List *ll;
-	E_Manager *man;
-
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     E_Container *con;
-
-	     con = ll->data;
 	     evas_event_freeze(con->bg_evas);
 	  }
      }
@@ -908,20 +882,14 @@ e_container_all_freeze(void)
 EAPI void
 e_container_all_thaw(void)
 {
-   Eina_List *managers, *l;
+   Eina_List *l, *ll;
+   E_Manager *man;
+   E_Container *con;
 
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	Eina_List *ll;
-	E_Manager *man;
-
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     E_Container *con;
-
-	     con = ll->data;
 	     evas_event_thaw(con->bg_evas);
 	  }
      }
@@ -944,21 +912,15 @@ _e_container_free(E_Container *con)
 
    for (i = 0; i < 7; i++)
      {
-	for (l = con->layers[i].clients; l;)
+	EINA_LiST_FOREACH(con->layers[i].clients, l, tmp)
 	  {
-	     tmp = l;
-	     l = l->next;
-	     e_object_free(E_OBJECT(tmp->data));
+	     e_object_free(E_OBJECT(tmp));
 	  }
      }
  */   
    l = con->zones;
    con->zones = NULL;
-   while (l)
-     {
-	e_object_del(E_OBJECT(l->data));
-	l = eina_list_remove_list(l, l);
-     }
+   E_FREE_LIST(l, e_object_del);
    con->manager->containers = eina_list_remove(con->manager->containers, con);
    e_canvas_del(con->bg_ecore_evas);
    ecore_evas_free(con->bg_ecore_evas);
@@ -973,20 +935,14 @@ _e_container_free(E_Container *con)
 static E_Container *
 _e_container_find_by_event_window(Ecore_X_Window win)
 {
-   Eina_List *managers, *l;
+   Eina_List *l, *ll;
+   E_Manager *man;
+   E_Container *con;
 
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	Eina_List *ll;
-	E_Manager *man;
-
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     E_Container *con;
-
-	     con = ll->data;
 	     if (con->event_win == win) return con;
 	  }
      }
@@ -1115,12 +1071,8 @@ _e_container_shape_del(E_Container_Shape *es)
 static void
 _e_container_shape_free(E_Container_Shape *es)
 {
-   Eina_List *l = NULL;
-
    es->con->shapes = eina_list_remove(es->con->shapes, es);
-   for (l = es->shape; l; l = l->next)
-     free(l->data);
-   eina_list_free(es->shape);
+   E_FREE_LIST(es->shape, free);
    free(es);
 }
 
@@ -1128,13 +1080,12 @@ static void
 _e_container_shape_change_call(E_Container_Shape *es, E_Container_Shape_Change ch)
 {
    Eina_List *l = NULL;
+   E_Container_Shape_Callback *cb = NULL;
 
    if ((!es) || (!es->con) || (!es->con->shape_change_cb)) return;
-   for (l = es->con->shape_change_cb; l; l = l->next)
+   EINA_LIST_FOREACH(es->con->shape_change_cb, l, cb)
      {
-	E_Container_Shape_Callback *cb;
-
-	if (!(cb = l->data)) continue;
+	if (!cb) continue;
 	cb->func(cb->data, es, ch);
      }
 }
@@ -1144,6 +1095,8 @@ _e_container_resize_handle(E_Container *con)
 {
    E_Event_Container_Resize *ev;
    Eina_List *l, *screens, *zones = NULL;
+   E_Zone *zone;
+   E_Screen *scr;
    int i;
 
    ev = calloc(1, sizeof(E_Event_Container_Resize));
@@ -1155,14 +1108,10 @@ _e_container_resize_handle(E_Container *con)
 
    if (screens)
      {
-	for (l = con->zones; l; l = l->next)
-	  zones = eina_list_append(zones, l->data);
-	for (l = screens; l; l = l->next)
+	EINA_LIST_FOREACH(con->zones, l, zone)
+	  zones = eina_list_append(zones, zone);
+	EINA_LIST_FOREACH(screens, l, scr)
 	  {
-	     E_Screen *scr;
-	     E_Zone *zone;
-
-	     scr = l->data;
 	     zone = e_container_zone_id_get(con, scr->escreen);
 	     if (zone)
 	       {
@@ -1173,14 +1122,12 @@ _e_container_resize_handle(E_Container *con)
 	     else
 	       {
 		  Eina_List *ll;
+  		  E_Config_Shelf *cf_es;
 
 		  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)
+		  EINA_LIST_FOREACH(e_config->shelves, ll, cf_es)
 		    {
-		       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);
 		    }
@@ -1191,37 +1138,28 @@ _e_container_resize_handle(E_Container *con)
 	     E_Zone *spare_zone = NULL;
 	     Eina_List *ll;
 
-	     for (ll = con->zones; ll; ll = ll->next)
+	     EINA_LIST_FOREACH(con->zones, ll, spare_zone)
 	       {
-		  spare_zone = ll->data;
 		  if (eina_list_data_find(zones, spare_zone))
 		    spare_zone = NULL;
 		  else break;
 	       }
-	     while (zones)
+	     EINA_LIST_FREE(zones, zone)
 	       {
-		  E_Zone *zone;
 		  Eina_List *shelves, *ll, *del_shelves;
+		  E_Shelf *es;
 		  E_Border_List *bl;
 		  E_Border *bd;
 
-		  zone = zones->data;
 		  /* delete any shelves on this zone */
 		  shelves = e_shelf_list();
 		  del_shelves = NULL;
-		  for (ll = shelves; ll; ll = ll->next)
+		  EINA_LIST_FOREACH(shelves, ll, es)
 		    {
-		       E_Shelf *es;
-
-		       es = ll->data;
 		       if (es->zone == zone)
 			 del_shelves = eina_list_append(del_shelves, es);
 		    }
-		  while (del_shelves)
-		    {
-		       e_object_del(E_OBJECT(del_shelves->data));
-		       del_shelves = eina_list_remove_list(del_shelves, del_shelves);
-		    }
+		  E_FREE_LIST(del_shelves, e_object_del);
 		  bl = e_container_border_list_first(zone->container);
 		  while ((bd = e_container_border_list_next(bl)))
 		    {
@@ -1236,7 +1174,6 @@ _e_container_resize_handle(E_Container *con)
 		    }
 		  e_container_border_list_free(bl);
 		  e_object_del(E_OBJECT(zone));
-		  zones = eina_list_remove_list(zones, zones);
 	       }
 	  }
      }
@@ -1254,17 +1191,15 @@ _e_container_resize_handle(E_Container *con)
    for (i = 0; i < 7; i++)
      {
 	Eina_List *tmp = NULL;
+	E_Border *bd;
 
 	/* Make temporary list as e_border_res_change_geometry_restore
 	 * rearranges the order. */
-	for (l = con->layers[i].clients; l; l = l->next)
-	     tmp = eina_list_append(tmp, l->data);
+	EINA_LIST_FOREACH(con->layers[i].clients, l, bd)
+	     tmp = eina_list_append(tmp, bd);
 
-	for (l = tmp; l; l = l->next)
+	EINA_LIST_FOREACH(tmp, l, bd)
 	  {
-	     E_Border *bd;
-
-	     bd = l->data;
 	     e_border_res_change_geometry_save(bd);
 	     e_border_res_change_geometry_restore(bd);
 	  }
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 286a5b1..7334d4d 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -9,11 +9,11 @@
  */
 
 static void _e_desk_free(E_Desk *desk);
-static void _e_border_event_desk_show_free(void *data, void *ev);
-static void _e_border_event_desk_before_show_free(void *data, void *ev);
-static void _e_border_event_desk_after_show_free(void *data, void *ev);
-static void _e_border_event_desk_deskshow_free(void *data, void *ev);
-static void _e_border_event_desk_name_change_free(void *data, void *ev);
+static void _e_desk_event_desk_show_free(void *data, void *ev);
+static void _e_desk_event_desk_before_show_free(void *data, void *ev);
+static void _e_desk_event_desk_after_show_free(void *data, void *ev);
+static void _e_desk_event_desk_deskshow_free(void *data, void *ev);
+static void _e_desk_event_desk_name_change_free(void *data, void *ev);
 static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
 static void _e_desk_show_end(E_Desk *desk);
 static int _e_desk_show_animator(void *data);
@@ -49,6 +49,7 @@ e_desk_new(E_Zone *zone, int x, int y)
 {
    E_Desk *desk;
    Eina_List *l;
+   E_Config_Desktop_Name *cfname;
    char name[40];
    int ok;
 
@@ -64,11 +65,8 @@ e_desk_new(E_Zone *zone, int x, int y)
 
    /* Get current desktop's name */
    ok = 0;
-   for (l = e_config->desktop_names; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
      {
-	E_Config_Desktop_Name *cfname;
-
-	cfname = l->data;
 	if ((cfname->container >= 0) &&
 	    (zone->container->num != cfname->container)) continue;
 	if ((cfname->zone >= 0) &&
@@ -103,7 +101,7 @@ e_desk_name_set(E_Desk *desk, const char *name)
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_DESK_NAME_CHANGE, ev, 
-		   _e_border_event_desk_name_change_free, NULL);
+		   _e_desk_event_desk_name_change_free, NULL);
 }
 
 EAPI void
@@ -125,12 +123,10 @@ EAPI void
 e_desk_name_del(int container, int zone, int desk_x, int desk_y)
 {
    Eina_List *l = NULL;
+   E_Config_Desktop_Name *cfname = NULL;
 
-   for (l = e_config->desktop_names; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
      {
-	E_Config_Desktop_Name *cfname;
-
-	cfname = l->data;
 	if ((cfname->container == container) && (cfname->zone == zone) &&
 	    (cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
 	  {
@@ -151,18 +147,16 @@ e_desk_name_update(void)
    E_Container *con;
    E_Zone *zone;
    E_Desk *desk;
+   E_Config_Desktop_Name *cfname;
    int d_x, d_y, ok;
    char	name[40];
 
-   for (m = e_manager_list(); m; m = m->next)
+   EINA_LIST_FOREACH(e_manager_list(), m, man)
      {
-	man = m->data;
-	for (c = man->containers; c; c = c->next)
+	EINA_LIST_FOREACH(man->containers, c, con)
 	  {
-	     con = c->data;
-	     for (z = con->zones; z; z = z->next)
+	     EINA_LIST_FOREACH(con->zones, z, zone)
 	       {
-		  zone = z->data;
 		  for (d_x = 0; d_x < zone->desk_x_count; d_x++)
 		    {
 		       for (d_y = 0; d_y < zone->desk_y_count; d_y++)
@@ -170,11 +164,8 @@ e_desk_name_update(void)
 			    desk = zone->desks[d_x + zone->desk_x_count * d_y];
 			    ok = 0;
 
-			    for (l = e_config->desktop_names; l; l = l->next)
+			    EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
 			      {
-				 E_Config_Desktop_Name *cfname;
-
-				 cfname = l->data;
 				 if ((cfname->container >= 0) &&
 				     (con->num != cfname->container)) continue;
 				 if ((cfname->zone >= 0) &&
@@ -209,6 +200,7 @@ e_desk_show(E_Desk *desk)
    E_Event_Desk_Before_Show *eev;
    E_Event_Desk_After_Show *eeev;
    Eina_List *l;
+   E_Shelf *es;
    int was_zone = 0, x, y, dx = 0, dy = 0, prev_x = 0, prev_y = 0;
 
    E_OBJECT_CHECK(desk);
@@ -219,7 +211,7 @@ e_desk_show(E_Desk *desk)
    eev->desk = e_desk_current_get(desk->zone);
    e_object_ref(E_OBJECT(eev->desk));
    ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev, 
-                   _e_border_event_desk_before_show_free, NULL);
+                   _e_desk_event_desk_before_show_free, NULL);
 
    ecore_x_window_shadow_tree_flush();
    for (x = 0; x < desk->zone->desk_x_count; x++)
@@ -286,17 +278,16 @@ e_desk_show(E_Desk *desk)
    ev = E_NEW(E_Event_Desk_Show, 1);
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
-   ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_border_event_desk_show_free, NULL);
+   ecore_event_add(E_EVENT_DESK_SHOW, ev, _e_desk_event_desk_show_free, NULL);
 
-   for (l = e_shelf_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
 	Eina_List *ll;
-	E_Shelf *es;
 	E_Config_Shelf *cf_es;
 	E_Zone *zone;
+	E_Config_Shelf_Desk *sd;
 	int show_shelf=0;
 
-	es = l->data;
 	if (!es) continue;
 	if (!es->cfg->desk_show_mode) continue;
 	cf_es = es->cfg;
@@ -305,11 +296,8 @@ e_desk_show(E_Desk *desk)
 	zone = e_util_zone_current_get(e_manager_current_get());
 	if (cf_es->zone != zone->num) continue;
 
-	for (ll = es->cfg->desk_list; ll; ll = ll->next)
+	EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
 	  {
-	     E_Config_Shelf_Desk *sd;
-
-	     sd = ll->data;
 	     if (!sd) continue;
 	     if ((desk->x == sd->x) && (desk->y == sd->y))
 	       {
@@ -329,7 +317,7 @@ e_desk_show(E_Desk *desk)
 	eeev->desk = e_desk_current_get(desk->zone);
 	e_object_ref(E_OBJECT(eeev->desk));
 	ecore_event_add(E_EVENT_DESK_AFTER_SHOW, eeev, 
-			_e_border_event_desk_after_show_free, NULL);
+			_e_desk_event_desk_after_show_free, NULL);
      }
 
 }
@@ -373,7 +361,7 @@ e_desk_deskshow(E_Zone *zone)
    ev->desk = desk;
    e_object_ref(E_OBJECT(desk));
    ecore_event_add(E_EVENT_DESK_DESKSHOW, ev, 
-		   _e_border_event_desk_deskshow_free, NULL);
+		   _e_desk_event_desk_deskshow_free, NULL);
 }
 
 EAPI void
@@ -382,9 +370,8 @@ e_desk_last_focused_focus(E_Desk *desk)
    Eina_List *l = NULL;
    E_Border *bd;
    
-   for (l = e_border_focus_stack_get(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
      {
-	bd = l->data;
 	if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) &&
 	    (bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
 	    (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK) &&
@@ -534,7 +521,7 @@ _e_desk_free(E_Desk *desk)
 }
 
 static void
-_e_border_event_desk_show_free(void *data, void *event)
+_e_desk_event_desk_show_free(void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -544,7 +531,7 @@ _e_border_event_desk_show_free(void *data, void *event)
 }
 
 static void
-_e_border_event_desk_before_show_free(void *data, void *event)
+_e_desk_event_desk_before_show_free(void *data, void *event)
 {
    E_Event_Desk_Before_Show *ev;
 
@@ -554,7 +541,7 @@ _e_border_event_desk_before_show_free(void *data, void *event)
 }
 
 static void
-_e_border_event_desk_after_show_free(void *data, void *event)
+_e_desk_event_desk_after_show_free(void *data, void *event)
 {
    E_Event_Desk_After_Show *ev;
 
@@ -564,7 +551,7 @@ _e_border_event_desk_after_show_free(void *data, void *event)
 }
 
 static void
-_e_border_event_desk_deskshow_free(void *data, void *event)
+_e_desk_event_desk_deskshow_free(void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -574,7 +561,7 @@ _e_border_event_desk_deskshow_free(void *data, void *event)
 }
 
 static void
-_e_border_event_desk_name_change_free(void *data, void *event)
+_e_desk_event_desk_name_change_free(void *data, void *event)
 {
    E_Event_Desk_Name_Change *ev;
 
@@ -680,7 +667,7 @@ _e_desk_show_end(E_Desk *desk)
    ev->desk = e_desk_current_get(desk->zone);
    e_object_ref(E_OBJECT(ev->desk));
    ecore_event_add(E_EVENT_DESK_AFTER_SHOW, ev, 
-		   _e_border_event_desk_after_show_free, NULL);
+		   _e_desk_event_desk_after_show_free, NULL);
 }
 
 static int
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index a3fcc85..8550bc6 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -150,6 +150,7 @@ EAPI int
 e_desklock_show(void)
 {
    Eina_List		  *managers, *l, *l2, *l3;
+   E_Manager		  *man;
    E_Desklock_Popup_Data  *edp;
    Evas_Coord		  mw, mh;
    E_Zone		  *current_zone;
@@ -204,13 +205,11 @@ e_desklock_show(void)
    managers = e_manager_list();
    if (!e_grabinput_get(edd->elock_wnd, 0, edd->elock_wnd))
      {
-	for (l = managers; l; l = l->next)
+	EINA_LIST_FOREACH(managers, l, man)
 	  {
-	     E_Manager *man;
 	     Ecore_X_Window *windows;
 	     int wnum;
 	     
-	     man = l->data;
 	     windows = ecore_x_window_children_get(man->root, &wnum);
 	     if (windows)
 	       {
@@ -254,21 +253,14 @@ e_desklock_show(void)
    
    zone_counter = 0;
    total_zone_num = _e_desklock_zone_num_get();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
-	for (l2 = man->containers; l2; l2 = l2->next)
+	E_Container *con;
+	EINA_LIST_FOREACH(man->containers, l2, con)
 	  {
-	     E_Container *con;
-	     
-	     con = l2->data;
-	     for (l3 = con->zones; l3; l3 = l3->next)
+	     E_Zone *zone;
+	     EINA_LIST_FOREACH(con->zones, l3, zone)
 	       {
-		  E_Zone *zone;
-		  
-		  zone = l3->data;
 		  edp = E_NEW(E_Desklock_Popup_Data, 1);
 		  if (edp)
 		    {
@@ -413,10 +405,9 @@ e_desklock_hide(void)
    
    if (edd->elock_grab_break_wnd)
      ecore_x_window_show(edd->elock_grab_break_wnd);
-   
-   while (edd->elock_wnd_list)
+  
+   EINA_LIST_FREE(edd->elock_wnd_list, edp) 
      {
-	edp = edd->elock_wnd_list->data;
 	if (edp)
 	  {
 	     e_popup_hide(edp->popup_wnd);
@@ -429,14 +420,9 @@ e_desklock_hide(void)
 	     e_util_defer_object_del(E_OBJECT(edp->popup_wnd));
 	     E_FREE(edp);
 	  }
-	edd->elock_wnd_list = eina_list_remove_list(edd->elock_wnd_list, edd->elock_wnd_list);
      }
    
-   while (edd->handlers)
-     {
-	ecore_event_handler_del(edd->handlers->data);
-	edd->handlers = eina_list_remove_list(edd->handlers, edd->handlers);
-     }
+   E_FREE_LIST(edd->handlers, ecore_event_handler_del);
    
    e_grabinput_release(edd->elock_wnd, edd->elock_wnd);
    ecore_x_window_free(edd->elock_wnd);
@@ -533,10 +519,8 @@ _e_desklock_cb_mouse_move(void *data, int type, void *event)
    if (current_zone == last_active_zone)
      return 1;
    
-   for (l = edd->elock_wnd_list; l; l = l->next)
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
      {
-	edp = l->data;
-	
 	if (!edp) continue;
 	
 	if (edp->popup_wnd->zone == last_active_zone)
@@ -561,9 +545,8 @@ _e_desklock_passwd_update(void)
      *pp = '*';
    *pp = 0;
    
-   for (l = edd->elock_wnd_list; l; l = l->next)
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
      {
-	edp = l->data;
 	edje_object_part_text_set(edp->login_box, "e.text.password", 
 				  passwd_hidden);
      }
@@ -606,16 +589,14 @@ _e_desklock_zone_num_get(void)
 {
    int num;
    Eina_List *l, *l2;
+   E_Manager *man;
    
    num = 0;
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	E_Manager *man = l->data;
-	
-	for (l2 = man->containers; l2; l2 = l2->next)
+	E_Container *con;
+	EINA_LIST_FOREACH(man->containers, l2, con)
 	  {
-	     E_Container *con = l2->data;
-	     
 	     num += eina_list_count(con->zones);
 	  }
      }
@@ -657,6 +638,7 @@ static void
 _e_desklock_state_set(int state)
 {
    Eina_List *l;
+   E_Desklock_Popup_Data *edp;
    const char *signal, *text;
    if (!edd) return;
 
@@ -672,10 +654,8 @@ _e_desklock_state_set(int state)
 	text = "The password you entered is invalid. Try again.";
      }
 
-   for (l = edd->elock_wnd_list; l; l = l->next)
+   EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
      {
-	E_Desklock_Popup_Data *edp;
-	edp = l->data;
 	edje_object_signal_emit(edp->login_box, signal, "e.desklock");
 	edje_object_signal_emit(edp->bg_object, signal, "e.desklock");
 	edje_object_part_text_set(edp->login_box, "e.text.title", text);
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index 191890d..761849e 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -234,7 +234,7 @@ e_dialog_show(E_Dialog *dia)
      }
 
    o = dia->box_object;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    edje_extern_object_min_size_set(o, mw, mh);
    edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
    
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 520f979..6e49629 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -129,22 +129,11 @@ e_dnd_init(void)
 EAPI int
 e_dnd_shutdown(void)
 {
-   Ecore_Event_Handler *h;
+   E_FREE_LIST(_drag_list, e_object_del);
 
-   while (_drag_list)
-     {
-	E_Drag *drag = _drag_list->data;
-	e_object_del(E_OBJECT(drag));
-     }
-
-   while (_drop_handlers)
-     {
-	E_Drop_Handler *h = _drop_handlers->data;
-	e_drop_handler_del(h);
-     }
+   E_FREE_LIST(_drop_handlers, e_drop_handler_del);
 
-   EINA_LIST_FREE(_event_handlers, h)
-     ecore_event_handler_del(h);
+   E_FREE_LIST(_event_handlers, ecore_event_handler_del);
 
    eina_hash_free(_drop_win_hash);
 
diff --git a/src/bin/e_eap_editor.c b/src/bin/e_eap_editor.c
index f5de983..a928eae 100644
--- a/src/bin/e_eap_editor.c
+++ b/src/bin/e_eap_editor.c
@@ -213,7 +213,7 @@ _e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Container *con)
 
    editor->cfd = 
      e_config_dialog_new(con, _("Desktop Entry Editor"), "E", 
-			 "_desktop_editor_dialog",
+			 "applications/new_application",
 			 "preferences-applications", 0, v, editor);
    
    if (!editor->cfd)
@@ -463,7 +463,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
      e_widget_button_add(evas, "", NULL, _e_desktop_editor_cb_icon_select, 
 			 cfdata, editor);
    _e_desktop_editor_icon_update(cfdata);
-   e_widget_min_size_set(editor->img_widget, 48, 48);
+   e_widget_size_min_set(editor->img_widget, 48, 48);
    e_widget_frametable_object_append(o, editor->img_widget, 
 				     0, 0, 1, 1, 0, 0, 1, 1);
 
@@ -474,7 +474,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
 				     0, 0, 1, 1, 1, 1, 1, 1);
 
    entry = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
-   e_widget_min_size_set(entry, 100, 1);
+   e_widget_size_min_set(entry, 100, 1);
    e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, 1, 1, 1, 1);
    e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")),
 				     0, 1, 1, 1, 1, 1, 1, 1);
@@ -606,7 +606,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
    
    evas_object_show(o);
    editor->icon_fsel = o;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
 
    /* buttons at the bottom */
@@ -670,7 +670,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
    
    evas_object_show(o);
    editor->exec_fsel = o;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
 
    /* buttons at the bottom */
diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c
index 870e659..1355101 100644
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@@ -206,7 +206,7 @@ e_entry_password_set(Evas_Object *entry, int password_mode)
  * @param minh the location where to store the minimun height of the entry
  */
 EAPI void
-e_entry_min_size_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
+e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
 {
    E_Entry_Smart_Data *sd;
    
@@ -1061,7 +1061,7 @@ _e_entry_smart_add(Evas_Object *object)
    if (sd->imf_context)
      {
         ecore_imf_context_client_window_set(sd->imf_context,
-					    ecore_evas_window_get(ecore_evas_ecore_evas_get(evas)));
+					    (long *)ecore_evas_window_get(ecore_evas_ecore_evas_get(evas)));
         ecore_imf_context_client_canvas_set(sd->imf_context, evas);
         ecore_imf_context_retrieve_surrounding_callback_set(sd->imf_context,
                                                             _e_entry_cb_imf_retrieve_surrounding,
diff --git a/src/bin/e_entry.h b/src/bin/e_entry.h
index c31d83f..e20a49c 100644
--- a/src/bin/e_entry.h
+++ b/src/bin/e_entry.h
@@ -13,7 +13,7 @@ EAPI void         e_entry_clear               (Evas_Object *entry);
 EAPI Evas_Object *e_entry_editable_object_get (Evas_Object *entry);
 
 EAPI void         e_entry_password_set        (Evas_Object *entry, int password_mode);
-EAPI void         e_entry_min_size_get        (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void         e_entry_size_min_get        (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
 EAPI void         e_entry_focus               (Evas_Object *entry);
 EAPI void         e_entry_unfocus             (Evas_Object *entry);
 EAPI void         e_entry_enable              (Evas_Object *entry);
diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c
index d285c89..58f1296 100644
--- a/src/bin/e_entry_dialog.c
+++ b/src/bin/e_entry_dialog.c
@@ -56,7 +56,7 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text,
    ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL, NULL);
    evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down, ed);
    e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    
    e_dialog_button_add(dia, !button_text ? _("OK") : button_text, NULL, _e_entry_dialog_ok, ed);
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index d1b33c3..44bc60a 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -55,6 +55,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *lines);
 static void _dialog_save_cb(void *data, void *data2);
+static void _e_exec_instance_free(E_Exec_Instance *inst);
 
 /* local subsystem globals */
 static Eina_List *e_exec_start_pending = NULL;
@@ -117,9 +118,12 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
      {
 	if (exec)
 	  inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
-	else
-	  inst = 
-          efreet_desktop_command_get(desktop, files, _e_exec_cb_exec, launch);
+	else 
+          {
+             inst = 
+               efreet_desktop_command_get(desktop, files, 
+                                          _e_exec_cb_exec, launch);
+          }
      }
    else
      inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
@@ -226,7 +230,8 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 	return NULL;
      }
    /* reset env vars */
-   if (launch->launch_method && !desktop) e_exehist_add(launch->launch_method, exec);
+   if (launch->launch_method && !desktop) 
+     e_exehist_add(launch->launch_method, exec);
    free(exec);
    /* 20 lines at start and end, 20x100 limit on bytes at each end. */
 //// FIXME: seem to be some issues with the pipe and filling up ram - need to
@@ -288,10 +293,43 @@ _e_exec_cb_expire_timer(void *data)
    return 0;
 }
 
+static void
+_e_exec_instance_free(E_Exec_Instance *inst)
+{
+   Eina_List *instances;
+   
+   if (inst->desktop)
+     {
+	instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
+	if (instances)
+	  {
+	     instances = eina_list_remove(instances, inst);
+	     if (instances)
+	       eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
+	     else
+	       eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
+	  }
+     }
+   e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
+   if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
+   if (inst->desktop) efreet_desktop_free(inst->desktop);
+   free(inst); 
+}
+
+
+
+static int
+_e_exec_cb_instance_finish(void *data)
+{
+   _e_exec_instance_free(data);
+   
+   return 0;
+}
+
+
 static int
 _e_exec_cb_exit(void *data, int type, void *event)
 {
-   Eina_List *instances;
    Ecore_Exe_Event_Del *ev;
    E_Exec_Instance *inst;
 
@@ -347,22 +385,17 @@ _e_exec_cb_exit(void *data, int type, void *event)
 				  ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
 	  }
      }
-   if (inst->desktop)
+
+   /* maybe better 1 minute? it might be openoffice */
+   if (ecore_time_get() - inst->launch_time < 5.0)
      {
-	instances = eina_hash_find(e_exec_instances, inst->desktop->orig_path);
-	if (instances)
-	  {
-	     instances = eina_list_remove(instances, inst);
-	     if (instances)
-	       eina_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
-	     else
-	       eina_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
-	  }
+	if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
+	inst->expire_timer = ecore_timer_add(30.0, _e_exec_cb_instance_finish, inst); 
+        inst->exe = NULL;
      }
-   e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
-   if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
-   if (inst->desktop) efreet_desktop_free(inst->desktop);
-   free(inst);
+   else
+     _e_exec_instance_free(inst);
+
    return 1;
 }
 
@@ -570,7 +603,7 @@ _dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *li
 
 	e_widget_textblock_plain_set(obj, text);
      }
-   e_widget_min_size_set(obj, 240, 120);
+   e_widget_size_min_set(obj, 240, 120);
 
    e_widget_framelist_object_append(os, obj);
 
diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c
index de2d17e..4e4b761 100644
--- a/src/bin/e_exehist.c
+++ b/src/bin/e_exehist.c
@@ -116,9 +116,8 @@ e_exehist_del(const char *exe)
 
    _e_exehist_load();
    if (!_e_exehist) return;
-   for (l = _e_exehist->history; l; l = l->next)
+   EINA_LIST_FOREACH(_e_exehist->history, l, ei)
      {
-	ei = l->data;
 	if ((ei->exe) && (!strcmp(exe, ei->exe)))
 	  {
 	     eina_stringshare_del(ei->exe);
@@ -151,6 +150,7 @@ EAPI int
 e_exehist_popularity_get(const char *exe)
 {
    Eina_List *l;
+   E_Exehist_Item *ei;
    const char *normal;
    int count = 0;
    
@@ -158,11 +158,8 @@ e_exehist_popularity_get(const char *exe)
    if (!_e_exehist) return 0;
    normal = _e_exehist_normalize_exe(exe);
    if (!normal) return 0;
-   for (l = _e_exehist->history; l; l = l->next)
+   EINA_LIST_FOREACH(_e_exehist->history, l, ei)
      {
-	E_Exehist_Item *ei;
-	
-	ei = l->data;
 	if ((ei->normalized_exe) && (!strcmp(normal, ei->normalized_exe)))
 	  count++;
      }
@@ -175,17 +172,15 @@ EAPI double
 e_exehist_newest_run_get(const char *exe)
 {
    Eina_List *l;
+   E_Exehist_Item *ei;
    const char *normal;
    
    _e_exehist_load();
    if (!_e_exehist) return 0.0;
    normal = _e_exehist_normalize_exe(exe);
    if (!normal) return 0.0;
-   for (l = eina_list_last(_e_exehist->history); l; l = l->prev)
+   EINA_LIST_REVERSE_FOREACH(_e_exehist->history, l, ei)
      {
-	E_Exehist_Item *ei;
-	
-	ei = l->data;
 	if ((ei->normalized_exe) && (!strcmp(normal, ei->normalized_exe)))
 	  {
 	     eina_stringshare_del(normal);
@@ -244,11 +239,11 @@ e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max)
 	  }
 	else
 	  {
-	     for (m = list; m; m = m->next) 
-	       {
-		  const char *exe;
+	     const char *exe;
 
-		  if (!(exe = m->data)) continue;
+	     EINA_LIST_FOREACH(list, m, exe)
+	       {
+		  if (!exe) continue;
 		  if (!strcmp(exe, ei->exe))
 		    {
 		       bad = 1;
@@ -295,9 +290,8 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
    
    f = efreet_util_path_to_file_id(desktop->orig_path);
    if (!f) return;
-   for (l = _e_exehist->mimes; l; l = l->next)
+   EINA_LIST_FOREACH(_e_exehist->mimes, l, ei)
      {
-	ei = l->data;
 	if ((ei->launch_method) && (!strcmp(mime, ei->launch_method)))
 	  {
 	     if ((ei->exe) && (!strcmp(f, ei->exe)))
@@ -338,9 +332,8 @@ e_exehist_mime_desktop_get(const char *mime)
    if (!mime) return NULL;
    _e_exehist_load();
    if (!_e_exehist) return NULL;
-   for (l = _e_exehist->mimes; l; l = l->next)
+   EINA_LIST_FOREACH(_e_exehist->mimes, l, ei)
      {
-	ei = l->data;
 	if ((ei->launch_method) && (!strcmp(mime, ei->launch_method)))
 	  {
 	     desktop = NULL;
@@ -380,26 +373,19 @@ _e_exehist_clear(void)
 {
    if (_e_exehist)
      {
-	while (_e_exehist->history)
+	E_Exehist_Item *ei;
+	EINA_LIST_FREE(_e_exehist->history, ei)
 	  {
-	     E_Exehist_Item *ei;
-	     
-	     ei = _e_exehist->history->data;
 	     eina_stringshare_del(ei->exe);
 	     eina_stringshare_del(ei->normalized_exe);
 	     eina_stringshare_del(ei->launch_method);
 	     free(ei);
-	     _e_exehist->history = eina_list_remove_list(_e_exehist->history, _e_exehist->history);
 	  }
-	while (_e_exehist->mimes)
+	EINA_LIST_FREE(_e_exehist->mimes, ei)
 	  {
-	     E_Exehist_Item *ei;
-	     
-	     ei = _e_exehist->mimes->data;
 	     eina_stringshare_del(ei->exe);
 	     eina_stringshare_del(ei->launch_method);
 	     free(ei);
-	     _e_exehist->mimes = eina_list_remove_list(_e_exehist->mimes, _e_exehist->mimes);
 	  }
      }
 }
@@ -425,7 +411,7 @@ _e_exehist_limit(void)
 	  {
 	     E_Exehist_Item *ei;
 	     
-	     ei = _e_exehist->history->data;
+	     ei = eina_list_data_get(_e_exehist->history);
 	     eina_stringshare_del(ei->exe);
 	     eina_stringshare_del(ei->normalized_exe);
 	     eina_stringshare_del(ei->launch_method);
@@ -436,7 +422,7 @@ _e_exehist_limit(void)
 	  {
 	     E_Exehist_Item *ei;
 	     
-	     ei = _e_exehist->mimes->data;
+	     ei = eina_list_data_get(_e_exehist->mimes);
 	     eina_stringshare_del(ei->exe);
 	     eina_stringshare_del(ei->launch_method);
 	     free(ei);
@@ -452,9 +438,8 @@ _e_exehist_normalize_exe(const char *exe)
    const char *ret;
    Eina_Bool flag = EINA_FALSE;
 
-   base = basename(exe);
-   if (base[0] == '.' && base[1] == '\0')
-     return NULL;
+   base = basename((char *)exe);
+   if ((base[0] == '.') && (base[1] == '\0')) return NULL;
 
    base = strdup(base);
    cp = base;
@@ -462,31 +447,26 @@ _e_exehist_normalize_exe(const char *exe)
      {
 	if (isspace(*cp))
 	  {
-	     if (!space)
-	       space = cp;
-	     if (flag)
-	       flag = EINA_FALSE;
+	     if (!space) space = cp;
+	     if (flag) flag = EINA_FALSE;
 	  }
 	else if (!flag)
 	  {
-	    
 	     /* usually a variable in the desktop exe field */
 	     if (space && *cp == '%')
 	       flag = EINA_TRUE;
 	     else
 	       {
 		  char lower = tolower(*cp);
-		  space = NULL;
 
-		  if (lower != *cp)
-		    *cp = lower;
+		  space = NULL;
+		  if (lower != *cp) *cp = lower;
 	       }
 	  }
 	cp++;
      }
 
-   if (space)
-     *space = '\0';
+   if (space) *space = '\0';
 
    ret = eina_stringshare_add(base);
    free(base);
@@ -514,8 +494,8 @@ _e_exehist_sort_exe_cb(const void *d1, const void *d2)
    ei1 = d1;
    ei2 = d2;
 
-   if (!ei1 || !ei1->normalized_exe) return 1;
-   if (!ei2 || !ei2->normalized_exe) return -1;
+   if ((!ei1) || (!ei1->normalized_exe)) return 1;
+   if ((!ei2) || (!ei2->normalized_exe)) return -1;
 
    return strcmp(ei1->normalized_exe, ei2->normalized_exe);
 }
@@ -525,11 +505,8 @@ _e_exehist_sort_pop_cb(const void *d1, const void *d2)
 {
    const E_Exehist_Item *ei1, *ei2;
 
-   ei1 = d1;
-   ei2 = d2;
-
-   if (!ei1) return 1;
-   if (!ei2) return -1;
+   if (!(ei1 = d1)) return 1;
+   if (!(ei2 = d2)) return -1;
 
    return ei2->count - ei1->count;
 }
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index 929f9a8..8903fc1 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -230,14 +230,16 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo
    E_Smart_Data *sd;
    int i = 0;
    Eina_List *l;
+   Evas_Object *item;
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return 0;
    _e_flowlayout_smart_adopt(sd, child);
    sd->items = eina_list_prepend_relative(sd->items, child, before);
-   for (i = 0, l = sd->items; l; l = l->next, i++)
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	if (l->data == child) break;
+	if (item == child) break;
+	i++;
      }
    sd->changed = 1;
    if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
@@ -250,14 +252,16 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after
    E_Smart_Data *sd;
    int i = 0;
    Eina_List *l;
+   Evas_Object *item;
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return 0;
    _e_flowlayout_smart_adopt(sd, child);
    sd->items = eina_list_append_relative(sd->items, child, after);
-   for (i = 0, l = sd->items; l; l = l->next, i++)
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	if (l->data == child) break;
+	if (item == child) break;
+	i++;
      }
    sd->changed = 1;
    if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
@@ -342,7 +346,7 @@ e_flowlayout_unpack(Evas_Object *obj)
 }
 
 EAPI void
-e_flowlayout_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    E_Smart_Data *sd;
    
@@ -354,7 +358,7 @@ e_flowlayout_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 }
 
 EAPI void
-e_flowlayout_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
+e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
 {
    E_Smart_Data *sd;
    
@@ -464,6 +468,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
 {
    Evas_Coord x, y, w, h, xx, yy, cr, cc;
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh, wdif, hdif;
    int count, expand;
 
@@ -496,12 +501,10 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
      }
 
    /* Some odd expanding counter */
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Flowlayout_Item *bi;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_flowlayout_data");
 	if (bi)
 	  {
@@ -546,12 +549,10 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
    cc = 0;
 
    /* Now for the real deal */
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Flowlayout_Item *bi;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_flowlayout_data");
 	if (bi)
 	  {
@@ -720,6 +721,7 @@ static void
 _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
 {
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh, count;
 
    /* FIXME: need to calc max */
@@ -730,12 +732,10 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
    minh = 1;
    if (sd->homogenous)
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Flowlayout_Item *bi;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     bi = evas_object_data_get(obj, "e_flowlayout_data");	
 	     if (bi)
 	       {
@@ -794,12 +794,10 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
    /* TODO nonhomogenous */
    else
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Flowlayout_Item *bi;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     bi = evas_object_data_get(obj, "e_flowlayout_data");
 	     if (bi)
 	       {
@@ -901,7 +899,7 @@ _e_flowlayout_smart_del(Evas_Object *obj)
      {
 	Evas_Object *child;
 	
-	child = sd->items->data;
+	child = eina_list_data_get(sd->items);
 	e_flowlayout_unpack(child);
      }
    evas_object_del(sd->clip);
@@ -918,16 +916,17 @@ _e_flowlayout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((x == sd->x) && (y == sd->y)) return;
      {
 	Eina_List *l;
+	Evas_Object *item;
 	Evas_Coord dx, dy;
 	
 	dx = x - sd->x;
 	dy = y - sd->y;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
 	     
-	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-	     evas_object_move(l->data, ox + dx, oy + dy);
+	     evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
+	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
    sd->x = x;
diff --git a/src/bin/e_flowlayout.h b/src/bin/e_flowlayout.h
index 03a77c1..70727bb 100644
--- a/src/bin/e_flowlayout.h
+++ b/src/bin/e_flowlayout.h
@@ -26,8 +26,8 @@ EAPI Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj);
 EAPI Evas_Object *e_flowlayout_pack_object_last  (Evas_Object *obj);
 EAPI void         e_flowlayout_pack_options_set  (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
 EAPI void         e_flowlayout_unpack            (Evas_Object *obj);
-EAPI void         e_flowlayout_min_size_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-EAPI void         e_flowlayout_max_size_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+EAPI void         e_flowlayout_size_min_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void         e_flowlayout_size_max_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
 EAPI void         e_flowlayout_align_get         (Evas_Object *obj, double *ax, double *ay);
 EAPI void         e_flowlayout_align_set         (Evas_Object *obj, double ax, double ay);
 /* This function only works if homogenous is set */
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 438dce9..9e7e35d 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -264,8 +264,8 @@ static void _e_fm2_icon_sel_up(Evas_Object *obj);
 
 static void _e_fm2_typebuf_show(Evas_Object *obj);
 static void _e_fm2_typebuf_hide(Evas_Object *obj);
-static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
-static void _e_fm2_typebuf_history_next(Evas_Object *obj);
+//static void _e_fm2_typebuf_history_prev(Evas_Object *obj);
+//static void _e_fm2_typebuf_history_next(Evas_Object *obj);
 static void _e_fm2_typebuf_run(Evas_Object *obj);
 static void _e_fm2_typebuf_match(Evas_Object *obj, int next);
 static void _e_fm2_typebuf_complete(Evas_Object *obj);
@@ -396,7 +396,7 @@ static E_Fm2_Client *_e_fm2_client_get(void);
 static int _e_fm2_client_monitor_add(const char *path);
 static void _e_fm2_client_monitor_del(int id, const char *path);
 static int _e_fm_client_file_del(const char *args, Evas_Object *e_fm);
-static int _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm);
+//static int _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm);
 static int _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm);
 static int _e_fm_client_file_move(const char *args, Evas_Object *e_fm);
 static int _e_fm2_client_file_symlink(const char *path, const char *dest, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm);
@@ -550,7 +550,9 @@ _e_fm2_icon_w_get(const E_Fm2_Smart_Data *sd)
 {
    if (sd->icon_size > -1)
      return sd->icon_size * e_scale;
-   return sd->config->icon.icon.w;
+   if (sd->config->icon.icon.w)
+     return sd->config->icon.icon.w;
+   return sd->config->icon.list.w;
 }
 
 static inline Evas_Coord
@@ -558,7 +560,9 @@ _e_fm2_icon_h_get(const E_Fm2_Smart_Data *sd)
 {
    if (sd->icon_size > -1)
      return sd->icon_size * e_scale;
-   return sd->config->icon.icon.h;
+   if (sd->config->icon.icon.h)
+     return sd->config->icon.icon.h;
+   return sd->config->icon.list.h;
 }
 
 static int
@@ -685,7 +689,7 @@ e_fm2_init(void)
 {
    char  path[PATH_MAX];
 
-   eina_stringshare_init();
+   eina_init();
    ecore_job_init();
    _e_storage_volume_edd_init();
    e_user_dir_concat_static(path, "fileman/metadata");
@@ -726,7 +730,7 @@ e_fm2_init(void)
    _e_fm2_icon_thumb_str = eina_stringshare_add("THUMB");
    _e_fm2_mime_inode_directory = eina_stringshare_add("inode/directory");
    _e_fm2_mime_app_desktop = eina_stringshare_add("application/x-desktop");
-   _e_fm2_mime_app_edje = eina_stringshare_add("application/x-edje");
+   _e_fm2_mime_app_edje = eina_stringshare_add("application/x-extension-edj");
    _e_fm2_mime_text_uri_list = eina_stringshare_add("text/uri-list");
 
    /// DBG
@@ -788,7 +792,7 @@ e_fm2_shutdown(void)
    e_fm2_op_registry_shutdown();
    efreet_mime_shutdown();
    ecore_job_shutdown();
-   eina_stringshare_shutdown();
+   eina_shutdown();
    return 1;
 }
 
@@ -1857,43 +1861,6 @@ _e_fm2_icon_explicit_get(Evas *evas, const E_Fm2_Icon *ic, const char *icon, con
 }
 
 /**
- * Find out a good fallback to use for given file.
- *
- * It will find out if it is a folder, file or like and set it accordingly.
- */
-static Evas_Object *
-_e_fm2_icon_fallback_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret)
-{
-   const char *name;
-
-   if (S_ISDIR(ic->info.statinfo.st_mode))
-     name = "folder";
-   else if (S_ISCHR(ic->info.statinfo.st_mode))
-     name = "chrdev";
-   else if (S_ISBLK(ic->info.statinfo.st_mode))
-     name = "blkdev";
-   else if (S_ISFIFO(ic->info.statinfo.st_mode))
-     name = "fifo";
-   else if (S_ISSOCK(ic->info.statinfo.st_mode))
-     name = "socket";
-   else
-     {
-	char buf[PATH_MAX];
-	if (!_e_fm2_icon_realpath(ic, buf, sizeof(buf)))
-	  name = "file";
-	else
-	  {
-	     if (ecore_file_can_exec(buf))
-	       name = "executable";
-	     else
-	       name = "file";
-	  }
-     }
-
-   return _e_fm2_icon_explicit_theme_get(evas, ic, name, type_ret);
-}
-
-/**
  * Creates an icon that generates a thumbnail if required.
  *
  * @param group if given, will be used in e_thumb_icon_file_set()
@@ -1964,7 +1931,7 @@ _e_fm2_icon_thumb_edje_get(Evas *evas, const E_Fm2_Icon *ic, void (*cb) (void *d
 	Eina_List *l = edje_file_collection_list(buf);
 	if (!l)
 	  return NULL;
-	group = l->data;
+	group = eina_list_data_get(l);
 	edje_file_collection_list_free(l);
      }
 
@@ -2063,7 +2030,7 @@ _e_fm2_icon_mime_theme_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_r
    char buf[1024];
    const char *file;
 
-   if (snprintf(buf, sizeof(buf), "e/icons/mimetypes/%s", ic->info.mime) >= sizeof(buf))
+   if (snprintf(buf, sizeof(buf), "e/icons/fileman/mime/%s", ic->info.mime) >= sizeof(buf))
      return NULL;
 
    file = e_theme_edje_file_get("base/theme/icons", buf);
@@ -2091,6 +2058,21 @@ _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, void (*gen_func) (void *d
    Evas_Object *o;
    const char *icon;
 
+   /* create thumbnails for edje files */
+   if (_e_fm2_file_is_edje(ic->info.file))
+     {
+	o = _e_fm2_icon_thumb_edje_get
+	  (evas, ic, gen_func, data, force_gen, type_ret);
+	if (o) return o;
+     }
+
+   /* disabled until everyone has edje in mime.types:
+    *  use mimetype to identify edje.
+    * if (ic->info.mime == _e_fm2_mime_app_edje)
+    *   return _e_fm2_icon_thumb_edje_get
+    *     (evas, ic, gen_func, data, force_gen, type_ret); */
+
+   /* check user preferences */
    icon = _e_fm2_icon_mime_type_special_match(ic);
    if (icon)
      {
@@ -2098,15 +2080,11 @@ _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, void (*gen_func) (void *d
 	  return _e_fm2_icon_desktop_get(evas, ic, type_ret);
 	else if (icon == _e_fm2_icon_thumb_str)
 	  {
-	     if (ic->info.mime == _e_fm2_mime_app_edje)
-	       return _e_fm2_icon_thumb_edje_get
-		 (evas, ic, gen_func, data, force_gen, type_ret);
-	     else
-	       return _e_fm2_icon_thumb_get
-		 (evas, ic, NULL, gen_func, data, force_gen, type_ret);
+	     return _e_fm2_icon_thumb_get
+	       (evas, ic, NULL, gen_func, data, force_gen, type_ret);
 	  }
-	else if (strncmp(icon, "e/icons/fileman/mime/", 21) == 0)
-	  return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 21 - 5, type_ret);
+	else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
+	  return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
 	else
 	  return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
      }
@@ -2125,19 +2103,21 @@ _e_fm2_icon_mime_get(Evas *evas, const E_Fm2_Icon *ic, void (*gen_func) (void *d
 
    if (o) return o;
 
+   return NULL;
+   
    /* XXX REMOVE/DEPRECATED below here */
-   icon = e_fm_mime_icon_get(ic->info.mime);
-   if (!icon) return NULL;
-
-   if (icon == _e_fm2_icon_desktop_str)
-     return _e_fm2_icon_desktop_get(evas, ic, type_ret);
-   else if (icon == _e_fm2_icon_thumb_str)
-     return _e_fm2_icon_thumb_get(evas, ic, NULL,
-				  gen_func, data, force_gen, type_ret);
-   else if (strncmp(icon, "e/icons/fileman/mime/", 21) == 0)
-     return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 21 - 5, type_ret);
-   else
-     return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret);
+   /* icon = e_fm_mime_icon_get(ic->info.mime);
+    * if (!icon) return NULL;
+    * 
+    * if (icon == _e_fm2_icon_desktop_str)
+    *   return _e_fm2_icon_desktop_get(evas, ic, type_ret);
+    * else if (icon == _e_fm2_icon_thumb_str)
+    *   return _e_fm2_icon_thumb_get(evas, ic, NULL,
+    * 				  gen_func, data, force_gen, type_ret);
+    * else if (strncmp(icon, "e/icons/fileman/", 16) == 0)
+    *   return _e_fm2_icon_explicit_theme_get(evas, ic, icon + 16, type_ret);
+    * else
+    * return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret); */
 }
 
 /**
@@ -2278,7 +2258,7 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
      }
 
  fallback:
-   return _e_fm2_icon_fallback_get(evas, ic, type_ret);
+   return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret);
 }
 
 EAPI E_Fm2_Icon_Info *
@@ -2402,7 +2382,7 @@ _e_fm2_client_messages_flush(void)
 
 	cl = _e_fm2_client_get();
 	if (!cl) break;
-	_e_fm2_client_message_flush(cl, _e_fm2_messages->data);
+	_e_fm2_client_message_flush(cl, eina_list_data_get(_e_fm2_messages));
      }
 }
 
@@ -2474,6 +2454,7 @@ _e_fm_client_file_del(const char *files, Evas_Object *e_fm)
    return id;
 }
 
+#if 0
 static int
 _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm)
 {
@@ -2481,6 +2462,7 @@ _e_fm2_client_file_trash(const char *path, Evas_Object *e_fm)
    e_fm2_op_registry_entry_add(id, e_fm, E_FM_OP_TRASH, _e_fm2_operation_abort_internal);
    return id;
 }
+#endif
 
 static int
 _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, int y, int res_w, int res_h, Evas_Object *e_fm)
@@ -2684,7 +2666,7 @@ _e_fm2_file_force_update(const char *path)
 	  {
 	     E_Fm2_Icon *ic;
 
-	     ic = _e_fm2_icon_find(l->data, ecore_file_file_get(path));
+	     ic = _e_fm2_icon_find(o, ecore_file_file_get(path));
 	     if (ic)
 	       {
 		  E_Fm2_Finfo finf;
@@ -2696,7 +2678,7 @@ _e_fm2_file_force_update(const char *path)
 		  finf.lnk = ic->info.link;
 		  finf.rlnk = ic->info.real_link;
 		  ic->removable_state_change = 1;
-		  _e_fm2_live_file_changed(l->data, ecore_file_file_get(path),
+		  _e_fm2_live_file_changed(o, ecore_file_file_get(path),
 					   &finf);
 	       }
 	  }
@@ -2898,14 +2880,11 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 	     break;
 	  }
      }
-   while (dels)
+   EINA_LIST_FREE(dels, obj)
      {
-	Evas_Object *obj;
 	E_Fm2_Smart_Data *sd;
 
-	obj = dels->data;
         sd = evas_object_smart_data_get(obj);
-	dels = eina_list_remove_list(dels, dels);
 	if ((_e_fm2_list_walking > 0) &&
 	    (eina_list_data_find(_e_fm2_list_remove, obj))) continue;
 	if (sd->config->view.open_dirs_in_place)
@@ -2916,10 +2895,9 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
    _e_fm2_list_walking--;
    if (_e_fm2_list_walking == 0)
      {
-	while (_e_fm2_list_remove)
+	EINA_LIST_FREE(_e_fm2_list_remove, obj)
 	  {
-	     _e_fm2_list = eina_list_remove(_e_fm2_list, _e_fm2_list_remove->data);
-	     _e_fm2_list_remove = eina_list_remove_list(_e_fm2_list_remove, _e_fm2_list_remove);
+	     _e_fm2_list = eina_list_remove(_e_fm2_list, obj);
 	  }
      }
    switch (e->minor)
@@ -3000,8 +2978,8 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
 
 	                a = e_action_find("fileman");
 	                m = e_manager_list();
-	                if (a && a->func.go && m && m->data)
-	                   a->func.go(E_OBJECT(m->data), mountpoint);
+	                if (a && a->func.go && m && eina_list_data_get(m))
+	                   a->func.go(E_OBJECT(eina_list_data_get(m)), mountpoint);
 	             }
 	        }
 	  }
@@ -3633,19 +3611,19 @@ _e_fm2_queue_process(Evas_Object *obj)
 	if (sd->tmp.list_index)
 	  {
 	     ll = sd->tmp.list_index;
-	     for (l = sd->icons; l; l = l->next)
+	     for (l = sd->icons; l; l = eina_list_next(l))
 	       {
 		  *ll = l;
 		  ll++;
 	       }
 	     /* binary search first queue */
-	     ic = sd->queue->data;
+	     ic = eina_list_data_get(sd->queue);
 	     p0 = 0; p1 = n;
 	     i = (p0 + p1) / 2;
 	     ll = sd->tmp.list_index;
 	     do
 	       {
-		  ic2 = ll[i]->data;
+		  ic2 = eina_list_data_get(ll[i]);
 		  v = _e_fm2_cb_icon_sort(ic, ic2);
 		  if (v < 0) /* ic should go before ic2 */
 		    p1 = i;
@@ -3676,9 +3654,8 @@ _e_fm2_queue_process(Evas_Object *obj)
 	  }
 	else
 	  {
-	     for (; l; l = l->next)
+	     EINA_LIST_FOREACH(l, l, ic2)
 	       {
-		  ic2 = l->data;
 		  if (_e_fm2_cb_icon_sort(ic, ic2) < 0)
 		    {
 		       if (l == sd->icons)
@@ -3936,7 +3913,6 @@ _e_fm2_icons_place_icon(E_Fm2_Icon *ic)
  _e_fm2_icon_place_relative(ic, ic2, 0, 1, 1, 0);
  if (_e_fm2_icons_icon_row_ok(ic) && !_e_fm2_icons_icon_overlaps(ic)) return;
  */
-//   for (l = ic->sd->icons_place; l; l = l->next)
    EINA_LIST_FOREACH(ic->sd->icons, l, ic2)
      {
 	if ((ic2 != ic) && (ic2->saved_pos))
@@ -4111,11 +4087,7 @@ _e_fm2_icons_free(Evas_Object *obj)
    if (!sd) return;
    _e_fm2_queue_free(obj);
    /* free all icons */
-   while (sd->icons)
-     {
-	_e_fm2_icon_free(sd->icons->data);
-        sd->icons = eina_list_remove_list(sd->icons, sd->icons);
-     }
+   E_FREE_LIST(sd->icons, _e_fm2_icon_free);
    eina_list_free(sd->icons_place);
    sd->icons_place = NULL;
    sd->tmp.last_insert = NULL;
@@ -4849,8 +4821,8 @@ _e_fm2_icon_select(E_Fm2_Icon *ic)
      {
 	const char *selectraise;
 
-        if(ic->sd->iop_icon)
-           _e_fm2_icon_entry_widget_accept(ic->sd->iop_icon);
+        if (ic->sd->iop_icon)
+          _e_fm2_icon_entry_widget_accept(ic->sd->iop_icon);
 
 	edje_object_signal_emit(ic->obj, "e,state,selected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e");
@@ -4871,8 +4843,8 @@ _e_fm2_icon_deselect(E_Fm2_Icon *ic)
      {
 	const char *stacking, *selectraise;
 
-	if(ic->entry_widget)
-	   _e_fm2_icon_entry_widget_accept(ic);
+	if (ic->entry_widget)
+          _e_fm2_icon_entry_widget_accept(ic);
 
 	edje_object_signal_emit(ic->obj, "e,state,unselected", "e");
 	edje_object_signal_emit(ic->obj_icon, "e,state,unselected", "e");
@@ -5127,7 +5099,7 @@ _e_fm2_icon_sel_first(Evas_Object *obj)
    if (!sd) return;
    if (!sd->icons) return;
    _e_fm2_icon_desel_any(obj);
-   ic = sd->icons->data;
+   ic = eina_list_data_get(sd->icons);
    _e_fm2_icon_select(ic);
    evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
    _e_fm2_icon_make_visible(ic);
@@ -5143,7 +5115,7 @@ _e_fm2_icon_sel_last(Evas_Object *obj)
    if (!sd) return;
    if (!sd->icons) return;
    _e_fm2_icon_desel_any(obj);
-   ic = eina_list_last(sd->icons)->data;
+   ic = eina_list_data_get(eina_list_last(sd->icons));
    _e_fm2_icon_select(ic);
    evas_object_smart_callback_call(sd->obj, "selection_change", NULL);
    _e_fm2_icon_make_visible(ic);
@@ -5278,13 +5250,13 @@ _e_fm2_icon_next_find(Evas_Object *obj, int next, int match_func(E_Fm2_Icon *ic,
      {
 	if (next == 1)
 	  {
-	     if (!l->next) return NULL;
-	     ic_next = l->next->data;
+	     if (!eina_list_next(l)) return NULL;
+	     ic_next = eina_list_data_get(eina_list_next(l));
 	  }
 	if (next == -1)
 	  {
-	     if (!l->prev) return NULL;
-	     ic_next = l->prev->data;
+	     if (!eina_list_prev(l)) return NULL;
+	     ic_next = eina_list_data_get(eina_list_prev(l));
 	  }
      }
 
@@ -5507,6 +5479,7 @@ _e_fm2_typebuf_hide(Evas_Object *obj)
    sd->typebuf_visible = 0;
 }
 
+#if 0
 static void
 _e_fm2_typebuf_history_prev(Evas_Object *obj)
 {
@@ -5526,6 +5499,7 @@ _e_fm2_typebuf_history_next(Evas_Object *obj)
    if (!sd) return;
    /* FIXME: do */
 }
+#endif
 
 static int
 _e_fm2_inplace_open(const E_Fm2_Icon *ic)
@@ -6187,10 +6161,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
    if (sd->drop_all) /* drop arbitarily into the dir */
      {
 	/* move file into this fm dir */
-	for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next)
+	for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 	  {
-	     ic = il->data;
-	     fp = ll->data;
+	     ic = eina_list_data_get(il);
+	     fp = eina_list_data_get(ll);
 	     if (!fp) continue;
 
 	     if ((ic) && (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_CUSTOM_ICONS))
@@ -6232,9 +6206,8 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	  {
 	     sd->max.w = 0;
 	     sd->max.h = 0;
-	     for (l = sd->icons; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->icons, l, ic)
 	       {
-		  ic = l->data;
 		  if ((ic->x + ic->w) > sd->max.w) sd->max.w = ic->x + ic->w;
 		  if ((ic->y + ic->h) > sd->max.h) sd->max.h = ic->y + ic->h;
 	       }
@@ -6249,10 +6222,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	if (sd->drop_after == -1) /* put into subdir/file in icon */
 	  {
 	     /* move file into dir that this icon is for */
-	     for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next)
+	     for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 	       {
-		  ic = il->data;
-		  fp = ll->data;
+		  ic = eina_list_data_get(il);
+		  fp = eina_list_data_get(ll);
 		  if (!fp) continue;
 
 		  args = _e_fm_string_append_quoted(args, &size, &length, fp);
@@ -6272,10 +6245,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	  {
 	     if (_e_fm2_view_mode_get(sd) == E_FM2_VIEW_MODE_LIST && sd->order_file) /* list */
 	       {
-		  for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next)
+		  for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 		    {
-		       ic = il->data;
-		       fp = ll->data;
+		       ic = eina_list_data_get(il);
+		       fp = eina_list_data_get(ll);
 		       if (!fp) continue;
 		       snprintf(buf, sizeof(buf), "%s/%s",
 			     sd->realpath, ecore_file_file_get(fp));
@@ -6298,10 +6271,10 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
 	       }
 	     else
 	       {
-		  for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next)
+		  for (ll = fsel, il = isel; ll && il; ll = eina_list_next(ll), il = eina_list_next(il))
 		    {
-		       ic = il->data;
-		       fp = ll->data;
+		       ic = eina_list_data_get(il);
+		       fp = eina_list_data_get(ll);
 		       if (!fp) continue;
 
 		       args = _e_fm_string_append_quoted(args, &size, &length, fp);
@@ -6347,7 +6320,7 @@ _e_fm2_cb_dnd_drop(void *data, const char *type, void *event)
      {
 	EINA_LIST_FREE(_e_fm2_list_remove, obj)
 	  {
-	     _e_fm2_list = eina_list_remove(_e_fm2_list, _e_fm2_list_remove->data);
+	     _e_fm2_list = eina_list_remove(_e_fm2_list, obj);
 	  }
      }
    eina_list_free(fsel);
@@ -6365,14 +6338,17 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
    static unsigned int down_timestamp = 0;
 
    if (!evas_event) return;
-   
-   if (!up) {
-     ed = evas_event;
-   	modifiers = ed->modifiers;
-   } else {
-   	eu = evas_event;
-   	modifiers = eu->modifiers;
-   }
+
+   if (!up) 
+     {
+        ed = evas_event;
+        modifiers = ed->modifiers;
+     } 
+   else 
+     {
+        eu = evas_event;
+        modifiers = eu->modifiers;
+     }
 
    if (ic->sd->config->selection.windows_modifiers)
      {
@@ -6407,9 +6383,9 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
 		  ic2->last_selected = 0;
 		  if (seen)
 		    {
-		       for (; (l) && (l->data != ic); l = l->prev)
+		       EINA_LIST_REVERSE_FOREACH(l, l, ic2)
 			 {
-			    ic2 = l->data;
+			    if (ic == ic2) break;
 			    if (!ic2->selected) sel_change = 1;
 			    _e_fm2_icon_select(ic2);
 			    ic2->last_selected = 0;
@@ -6417,9 +6393,9 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
 		    }
 		  else
 		    {
-		       for (; (l) && (l->data != ic); l = l->next)
+		       EINA_LIST_FOREACH(l, l, ic2)
 			 {
-			    ic2 = l->data;
+			    if (ic == ic2) break;
 			    if (!ic2->selected) sel_change = 1;
 			    _e_fm2_icon_select(ic2);
 			    ic2->last_selected = 0;
@@ -6453,9 +6429,7 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
 	     const Eina_List *l;
 	     E_Fm2_Icon *ic2;
 	     EINA_LIST_FOREACH(ic->sd->icons, l, ic2)
-	       {
-		  ic2->last_selected = 0;
-	       }
+               ic2->last_selected = 0;
 	  }
      }
    if ((multi_sel) && (ic->selected))
@@ -6481,20 +6455,20 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
      evas_object_smart_callback_call(ic->sd->obj, "selection_change", NULL);
    if ((!(S_ISDIR(ic->info.statinfo.st_mode)) ||
 	(ic->sd->config->view.no_subdir_jump)) &&
-       (ic->sd->config->view.single_click)
-       )
+       (ic->sd->config->view.single_click))
      {
 	if (ed && ic->sd->config->view.single_click_delay)
-	    down_timestamp = ed->timestamp;
+          down_timestamp = ed->timestamp;
 
-     if (eu && (eu->timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) {
-	    int icon_pos_x = ic->x + ic->sd->x - ic->sd->pos.x;
-	    int icon_pos_y = ic->y + ic->sd->y - ic->sd->pos.y;
+        if (eu && (eu->timestamp - down_timestamp) > ic->sd->config->view.single_click_delay) 
+          {
+             int icon_pos_x = ic->x + ic->sd->x - ic->sd->pos.x;
+             int icon_pos_y = ic->y + ic->sd->y - ic->sd->pos.y;
 
-	    if (eu->output.x >= icon_pos_x && eu->output.x <= (icon_pos_x + ic->w) &&
-	        eu->output.y >= icon_pos_y && eu->output.y <= (icon_pos_y + ic->h))
-	       evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
-	  }
+             if (eu->output.x >= icon_pos_x && eu->output.x <= (icon_pos_x + ic->w) &&
+                 eu->output.y >= icon_pos_y && eu->output.y <= (icon_pos_y + ic->h))
+               evas_object_smart_callback_call(ic->sd->obj, "selected", NULL);
+          }
      }
 }
 
@@ -6553,8 +6527,7 @@ _e_fm2_cb_icon_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
    ic = data;
    ev = event_info;
 
-   if (ic->entry_widget)
-      return;
+   if (ic->entry_widget) return;
 
    if ((ev->button == 1) && (!ic->drag.dnd))
      {
@@ -6641,17 +6614,11 @@ _e_fm_drag_key_up_cb(E_Drag *drag, Ecore_Event_Key *e)
    /* Default action would be move. ;) */
 
    if (!strncmp(e->keyname, "Alt", 3))
-     {
-	ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
-     }
+     ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
    else if (!strncmp(e->keyname, "Shift", 5))
-     {
-	ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
-     }
+     ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
    else if (!strncmp(e->keyname, "Control", 7))
-     {
-	ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
-     }
+     ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
 
    edje_object_signal_emit(drag->object, "e,state,move", "e");
 }
@@ -6666,8 +6633,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
    ic = data;
    ev = event_info;
 
-   if (ic->entry_widget)
-      return;
+   if (ic->entry_widget) return;
 
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    if ((ic->drag.start) && (ic->sd->eobj))
@@ -6758,8 +6724,7 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	     if (!sel) return;
 	     sel[sel_length] = '\0';
 
-	     d = e_drag_new(con,
-			    x, y, drag_types, 1,
+	     d = e_drag_new(con, x, y, drag_types, 1,
 			    sel, sel_length, NULL, _e_fm2_cb_drag_finished);
 	     o = edje_object_add(e_drag_evas_get(d));
 	     if (_e_fm2_view_mode_get(ic->sd) == E_FM2_VIEW_MODE_LIST)
@@ -6830,8 +6795,7 @@ _e_fm2_cb_icon_thumb_dnd_gen(void *data, Evas_Object *obj, void *event_info)
    have_alpha = e_icon_alpha_get(obj);
 //   if (_e_fm2_view_mode_get(ic->sd) == E_FM2_VIEW_MODE_LIST)
      {
-	edje_extern_object_aspect_set(obj,
-				      EDJE_ASPECT_CONTROL_BOTH, w, h);
+	edje_extern_object_aspect_set(obj, EDJE_ASPECT_CONTROL_BOTH, w, h);
      }
    edje_object_part_swallow(o, "e.swallow.icon", obj);
    if (have_alpha)
@@ -6876,8 +6840,7 @@ _e_fm2_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
    sd = data;
    ev = event_info;
 
-   if(sd->iop_icon)
-      return;
+   if (sd->iop_icon) return;
 
    if (evas_key_modifier_is_set(ev->modifiers, "Control"))
      {
@@ -6906,7 +6869,7 @@ _e_fm2_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	 * typebuf mode: cursor left
 	 */
 	_e_fm2_icon_sel_prev(obj);
-    }
+     }
    else if (!strcmp(ev->key, "Right"))
      {
 	/* FIXME: icon mode, typebuf extras */
@@ -8571,7 +8534,7 @@ _e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title,
    
    o = e_widget_fsel_add(dia->win->evas, "/", sd->realpath, NULL, NULL, NULL, sd, NULL, sd, 1);
    evas_object_show(o);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    dia->data = o;
 
@@ -9394,7 +9357,8 @@ _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog)
 	     if (e_filereg_file_protected(buf)) continue;
 
 	     files = _e_fm_string_append_quoted(files, &size, &len, buf);
-	     if (l->next) files = _e_fm_string_append_char(files, &size, &len, ' ');
+	     if (eina_list_next(l))
+	       files = _e_fm_string_append_char(files, &size, &len, ' ');
 	  }
 
 	eina_list_free(sel);
@@ -9545,7 +9509,7 @@ _e_fm2_live_process(Evas_Object *obj)
 
    sd = evas_object_smart_data_get(obj);
    if (!sd->live.actions) return;
-   a = sd->live.actions->data;
+   a = eina_list_data_get(sd->live.actions);
    sd->live.actions = eina_list_remove_list(sd->live.actions, sd->live.actions);
    switch (a->type)
      {
@@ -9816,7 +9780,7 @@ _e_fm2_volume_icon_update(E_Volume *v)
         rp = e_fm2_real_path_get(o);
         if (strcmp(rp, fav) && strcmp(rp, desk)) continue;
         
-        ic = _e_fm2_icon_find(l->data, file);
+        ic = _e_fm2_icon_find(o, file);
         if (ic)
            _update_volume_icon(v, ic);
      }
diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c
index 508378e..4af6c35 100644
--- a/src/bin/e_fm_custom.c
+++ b/src/bin/e_fm_custom.c
@@ -37,26 +37,15 @@ e_fm2_custom_file_init(void)
    _e_fm2_custom_init++;
    if (_e_fm2_custom_init > 1) return _e_fm2_custom_init;
 
-   _e_fm2_custom_hash = eina_hash_string_superfast_new(NULL);
+   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_fm2_custom_dir", sizeof (E_Fm2_Custom_Dir)))
+     {
+	_e_fm2_custom_init--;
+	return 0;
+     }
 
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.mem_alloc = NULL;
-   eddc.func.mem_free = NULL;
-   eddc.func.str_alloc = (char *(*)(const char *)) eina_stringshare_add;
-   eddc.func.str_free = (void (*)(const char *)) eina_stringshare_del;
-   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
-   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
-   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
-   eddc.func.list_free = (void *(*)(void *)) eina_list_free;
-   eddc.func.hash_foreach =
-     (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))
-     eina_hash_foreach;
-   eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
-   eddc.func.hash_free = (void  (*) (void *)) eina_hash_free;
-   eddc.name = "e_fm_custom_file";
-   eddc.size = sizeof(E_Fm2_Custom_File);
+   _e_fm2_custom_hash = eina_hash_string_superfast_new(NULL);
 
-   _e_fm2_custom_dir_edd = eet_data_descriptor2_new(&eddc);
+   _e_fm2_custom_dir_edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm2_custom_dir_edd, E_Fm2_Custom_Dir, x, y, z)
    DAT("pos.x", pos.x, EET_T_DOUBLE);
    DAT("pos.y", pos.y, EET_T_DOUBLE);
@@ -67,7 +56,10 @@ e_fm2_custom_file_init(void)
    DAT("prop.in_use", prop.in_use, EET_T_UCHAR);
 #undef DAT
 
-   _e_fm2_custom_file_edd = eet_data_descriptor2_new(&eddc);
+   eddc.size = sizeof (E_Fm2_Custom_File);
+   eddc.name = "e_fm_custom_file";
+
+   _e_fm2_custom_file_edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm2_custom_file_edd, E_Fm2_Custom_File, x, y, z)
    DAT("g.x", geom.x, EET_T_INT);
    DAT("g.y", geom.y, EET_T_INT);
@@ -199,6 +191,7 @@ e_fm2_custom_file_del(const char *path)
 {
    Eina_List *list, *l;
    E_Fm2_Custom_File *cf2;
+   const void *key;
 
    _e_fm2_custom_file_info_load();
    if (!_e_fm2_custom_file) return;
@@ -207,12 +200,12 @@ e_fm2_custom_file_del(const char *path)
    list = _e_fm2_custom_hash_key_base_list(_e_fm2_custom_hash, path);
    if (list)
      {
-	for (l = list; l; l = l->next)
+	EINA_LIST_FOREACH(list, l, key)
 	  {
-	     cf2 = eina_hash_find(_e_fm2_custom_hash, l->data);
+	     cf2 = eina_hash_find(_e_fm2_custom_hash, key);
 	     if (cf2)
 	       {
-		  eina_hash_del(_e_fm2_custom_hash, l->data, cf2);
+		  eina_hash_del(_e_fm2_custom_hash, key, cf2);
 		  _e_fm2_custom_file_del(cf2);
 	       }
 	  }
@@ -226,6 +219,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
 {
    E_Fm2_Custom_File *cf, *cf2;
    Eina_List *list, *l;
+   const void *key;
 
    _e_fm2_custom_file_info_load();
    if (!_e_fm2_custom_file) return;
@@ -242,16 +236,16 @@ e_fm2_custom_file_rename(const char *path, const char *new_path)
    list = _e_fm2_custom_hash_key_base_list(_e_fm2_custom_hash, path);
    if (list)
      {
-	for (l = list; l; l = l->next)
+	EINA_LIST_FOREACH(list, l, key)
 	  {
-	     cf2 = eina_hash_find(_e_fm2_custom_hash, l->data);
+	     cf2 = eina_hash_find(_e_fm2_custom_hash, key);
 	     if (cf2)
 	       {
 		  char buf[PATH_MAX];
 
 		  strcpy(buf, new_path);
-		  strcat(buf, (char *)l->data + strlen(path));
-		  eina_hash_del(_e_fm2_custom_hash, l->data, cf2);
+		  strcat(buf, (char *)key + strlen(path));
+		  eina_hash_del(_e_fm2_custom_hash, key, cf2);
 		  cf = eina_hash_find(_e_fm2_custom_hash, buf);
 		  if (cf)
 		    _e_fm2_custom_file_del(cf);
diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c
index 9cfa396..f4038d7 100644
--- a/src/bin/e_fm_hal.c
+++ b/src/bin/e_fm_hal.c
@@ -84,14 +84,12 @@ EAPI E_Storage *
 e_fm2_hal_storage_find(const char *udi)
 {
    Eina_List *l;
+   E_Storage  *s;
 
    if (!udi) return NULL;
-   
-   for (l = _e_stores; l; l = l->next)
+
+   EINA_LIST_FOREACH(_e_stores, l, s)   
      {
-	E_Storage  *s;
-	
-	s = l->data;
 	if (!strcmp(udi, s->udi)) return s;
      }
    return NULL;
@@ -171,11 +169,7 @@ e_fm2_hal_volume_add(E_Volume *v)
 	s->volumes = eina_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)
      {
 	char label[1024] = {0};
 	char size[256] = {0};
@@ -227,7 +221,7 @@ e_fm2_hal_volume_add(E_Volume *v)
 	else
 	  snprintf(label, sizeof(label), _("Unknown Volume"));
 
-	if ((label) && (label[0]))
+	if (label[0])
 	  {
 	     if (v->label) free(v->label);
 	     v->label = strdup(label);
@@ -264,7 +258,11 @@ e_fm2_hal_volume_add(E_Volume *v)
 	     v->icon = strdup(icon);
 	  }
 
-	_e_fm2_volume_write(v);
+	if ((!v->mount_point) ||
+	    (strcmp(v->mount_point, "/") &&
+	     strcmp(v->mount_point, "/home") &&
+	     strcmp(v->mount_point, "/tmp")))
+	   _e_fm2_volume_write(v);
      }
 }
 
@@ -369,14 +367,12 @@ EAPI E_Volume *
 e_fm2_hal_volume_find(const char *udi)
 {
    Eina_List *l;
+   E_Volume *v;
    
    if (!udi) return NULL;
 
-   for (l = _e_vols; l; l = l->next)
+   EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	E_Volume *v;
-	
-	v = l->data;
 	if (!strcmp(udi, v->udi)) return v;
      }
    return NULL;
@@ -413,6 +409,7 @@ EAPI void
 e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
 {
    Eina_List *l;
+   E_Fm2_Mount *m;
 
    v->mounted = 1;
    if (mountpoint && (*mountpoint != 0))
@@ -422,8 +419,8 @@ e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint)
         v->mount_point = strdup(mountpoint);
      }
 
-   for (l = v->mounts; l; l = l->next)
-     _e_fm2_hal_mount_ok(l->data);
+   EINA_LIST_FOREACH(v->mounts, l, m)
+     _e_fm2_hal_mount_ok(m);
 
 //   printf("MOUNT %s %s\n", v->udi, v->mount_point);
 }
@@ -464,16 +461,14 @@ EAPI E_Fm2_Mount *
 e_fm2_hal_mount_find(const char *path)
 {
    Eina_List *l;
+   E_Volume *v;
 
-   for (l = _e_vols; l; l = l->next)
+   EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	E_Volume *v;
-	
-	v = l->data;
 	if (v->mounted
 	    && !strncmp(path, v->mount_point, strlen(v->mount_point))
 	    && v->mounts) 
-	  return v->mounts->data;
+	  return eina_list_data_get(v->mounts);
      }
    return NULL;
 }
@@ -555,11 +550,12 @@ EAPI void
 e_fm2_hal_unmount_fail(E_Volume *v)
 {
    Eina_List *l;
+   E_Fm2_Mount *m;
 
    v->mounted = 1;
 
-   for (l = v->mounts; l; l = l->next)
-     _e_fm2_hal_unmount_fail(l->data);
+   EINA_LIST_FOREACH(v->mounts, l, m)
+     _e_fm2_hal_unmount_fail(m);
 }
 
 static void
@@ -616,10 +612,8 @@ e_fm2_hal_show_desktop_icons(void)
    char buf2[PATH_MAX] = {0};
    const char *id;
 
-   for (l = _e_vols; l; l = eina_list_next(l))
+   EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	v = eina_list_data_get(l);
-
 	if (!v) continue;	
 	if (!v->storage) continue;
 
@@ -649,10 +643,8 @@ e_fm2_hal_hide_desktop_icons(void)
    char buf[PATH_MAX] = {0};
    const char *id;
 
-   for (l = _e_vols; l; l = eina_list_next(l))
+   EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	v = eina_list_data_get(l);
-
 	if (!v) continue;	
 	if (!v->storage) continue;
 
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index 845d734..6f4962b 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -260,7 +260,7 @@ main(int argc, char **argv)
      }
 
    ecore_init();
-   eina_stringshare_init();
+   eina_init();
    ecore_app_args_set(argc, (const char **)argv);
    ecore_file_init();
    ecore_ipc_init();
@@ -271,6 +271,7 @@ main(int argc, char **argv)
 
    _e_storage_volume_edd_init();
    e_dbus_init();
+   e_hal_init();
    _e_dbus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
    if (_e_dbus_conn)
      {
@@ -303,12 +304,13 @@ main(int argc, char **argv)
      }
 
    if (_e_dbus_conn) e_dbus_connection_close(_e_dbus_conn);
+   e_hal_shutdown();
    e_dbus_shutdown();
    _e_storage_volume_edd_shutdown();
    
    ecore_ipc_shutdown();
    ecore_file_shutdown();
-   eina_stringshare_shutdown();
+   eina_shutdown();
    ecore_shutdown();
    
    return 0;
@@ -432,13 +434,11 @@ _e_dbus_cb_dev_add(void *data, DBusMessage *msg)
 {
    DBusError err;
    char *udi = NULL;
-   int ret;
-   
+
    dbus_error_init(&err);
    dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
    if (!udi) return;
-//   printf("DB DEV+: %s\n", udi);
-   ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage", 
+   e_hal_device_query_capability(_e_dbus_conn, udi, "storage", 
 				       _e_dbus_cb_store_is, strdup(udi));
    e_hal_device_query_capability(_e_dbus_conn, udi, "volume",
 				 _e_dbus_cb_vol_is, strdup(udi));
@@ -633,12 +633,10 @@ E_Storage *
 e_storage_find(const char *udi)
 {
    Eina_List *l;
+   E_Storage  *s;
    
-   for (l = _e_stores; l; l = l->next)
+   EINA_LIST_FOREACH(_e_stores, l, s)
      {
-	E_Storage  *s;
-	
-	s = l->data;
 	if (!strcmp(udi, s->udi)) return s;
      }
    return NULL;
@@ -865,12 +863,10 @@ EAPI E_Volume *
 e_volume_find(const char *udi)
 {
    Eina_List *l;
+   E_Volume *v;
    
-   for (l = _e_vols; l; l = l->next)
+   EINA_LIST_FOREACH(_e_vols, l, v)
      {
-	E_Volume *v;
-	
-	v = l->data;
 	if (!strcmp(udi, v->udi)) return v;
      }
    return NULL;
@@ -919,7 +915,7 @@ _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error)
         return;
      }
 
-/*
+#if 0
    v->mounted = 1;
 //   printf("MOUNT: %s from %s\n", v->udi, v->mount_point);
    size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
@@ -927,10 +923,10 @@ _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error)
    strcpy(buf, v->udi);
    strcpy(buf + strlen(buf) + 1, v->mount_point);
    ecore_ipc_server_send(_e_ipc_server,
-			 6/*E_IPC_DOMAIN_FM*//*,
+			 6/*E_IPC_DOMAIN_FM*/,
 			 E_FM_OP_MOUNT_DONE,
 			 0, 0, 0, buf, size);
-*/
+#endif
 }
 
 EAPI void
@@ -1002,7 +998,7 @@ _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
         return;
      }
 
-/*
+#if 0
    v->mounted = 0;
 //   printf("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
    size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
@@ -1010,10 +1006,10 @@ _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error)
    strcpy(buf, v->udi);
    strcpy(buf + strlen(buf) + 1, v->mount_point);
    ecore_ipc_server_send(_e_ipc_server,
-			 6/*E_IPC_DOMAIN_FM*//*,
+			 6/*E_IPC_DOMAIN_FM*/,
 			 E_FM_OP_UNMOUNT_DONE,
 			 0, 0, 0, buf, size);
-*/
+#endif
 }
 
 EAPI void
@@ -1208,11 +1204,8 @@ _e_fm_monitor_start_try(E_Fm_Task *task)
    Eina_List *l;
    
    /* look for any previous dir entries monitoring this dir */
-   for (l = _e_dirs; l; l = l->next)
+   EINA_LIST_FOREACH(_e_dirs, l, ed)
      {
-	E_Dir *ed;
-	
-	ed = l->data;
 	if ((ed->mon) && (!strcmp(ed->dir, task->src)))
 	  {
 	     /* found a previous dir - save it in ped */
@@ -1611,13 +1604,11 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
       case E_FM_OP_MONITOR_SYNC: /* mon list sync */
 	  {
 	     Eina_List *l;
+	     E_Dir *ed;
 	     double stime;
 	     
-             for (l = _e_dirs; l; l = l->next)
+	     EINA_LIST_FOREACH(_e_dirs, l, ed)
 	       {
-		  E_Dir *ed;
-		  
-		  ed = l->data;
 		  if (ed->fq)
 		    {
 		       if (ed->sync == e->response)
@@ -1728,17 +1719,13 @@ static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id)
 
 static E_Fm_Slave *_e_fm_slave_get(int id)
 {
-   Eina_List *l = _e_fm_slaves;
+   Eina_List *l;
    E_Fm_Slave *slave;
 
-   while (l)
+   EINA_LIST_FOREACH(_e_fm_slaves, l, slave)
      {
-	slave = eina_list_data_get(l);
-
 	if (slave->id == id)
 	  return slave;
-
-	l = eina_list_next(l);
      }
 
    return NULL;
@@ -1867,9 +1854,8 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
        (event == ECORE_FILE_EVENT_CREATED_DIRECTORY))
      {
 	rp = ecore_file_realpath(dir);
-	for (l = _e_dirs; l; l = l->next)
+	EINA_LIST_FOREACH(_e_dirs, l, ed)
 	  {
-	     ed = l->data;
 	     drp = ecore_file_realpath(ed->dir);
 	     if (drp)
 	       {
@@ -1884,9 +1870,8 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
 	    (event == ECORE_FILE_EVENT_DELETED_DIRECTORY))
      {
 	rp = ecore_file_realpath(dir);
-	for (l = _e_dirs; l; l = l->next)
+	EINA_LIST_FOREACH(_e_dirs, l, ed)
 	  {
-	     ed = l->data;
 	     drp = ecore_file_realpath(ed->dir);
 	     if (drp)
 	       {
@@ -1900,9 +1885,8 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
    else if (event == ECORE_FILE_EVENT_MODIFIED)
      {
 	rp = ecore_file_realpath(dir);
-	for (l = _e_dirs; l; l = l->next)
+	EINA_LIST_FOREACH(_e_dirs, l, ed)
 	  {
-	     ed = l->data;
 	     drp = ecore_file_realpath(ed->dir);
 	     if (drp)
 	       {
@@ -1916,9 +1900,8 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
    else if (event == ECORE_FILE_EVENT_DELETED_SELF)
      {
 	rp = ecore_file_realpath(path);
-	for (l = _e_dirs; l; l = l->next)
+	EINA_LIST_FOREACH(_e_dirs, l, ed)
 	  {
-	     ed = l->data;
 	     drp = ecore_file_realpath(ed->dir);
 	     if (drp)
 	       {
@@ -1980,9 +1963,8 @@ _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing)
 	int skip = 0;
 	
 	t_now = ecore_time_get();
-	for (l = ed->recent_mods; l; l = l->next)
+	EINA_LIST_FOREACH(ed->recent_mods, l, m)
 	  {
-	     m = l->data;
 	     if ((m->mod) && (!strcmp(m->path, path)))
 	       {
 		  if ((t_now - m->timestamp) < DEF_MOD_BACKOFF)
@@ -2113,22 +2095,14 @@ _e_cb_file_mon_list_idler(void *data)
    /* FIXME: spool off files in idlers and handle sync req's */
    while (ed->fq)
      {
-	file = ed->fq->data;
+	file = eina_list_data_get(ed->fq);
 	if (!((ed->dot_order) && (!strcmp(file, ".order"))))
 	  {
 	     if (!strcmp(ed->dir, "/"))
 	       snprintf(buf, sizeof(buf), "/%s", file);
 	     else
 	       snprintf(buf, sizeof(buf), "%s/%s", ed->dir, file);
-/*	     
-	     if (//(!ed->fq->next) ||
-		 ((!strcmp(ed->fq->next->data, ".order"))
-		  //&& (!ed->fq->next->next)
-		  ))
-	       _e_file_add(ed, buf, 1);
-	     else
- */
-	       _e_file_add(ed, buf, 1);
+	     _e_file_add(ed, buf, 1);
 	  }
 	free(file);
 	ed->fq = eina_list_remove_list(ed->fq, ed->fq);
diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c
index 35a4c1e..b8cfba6 100644
--- a/src/bin/e_fm_mime.c
+++ b/src/bin/e_fm_mime.c
@@ -53,9 +53,8 @@ e_fm_mime_icon_get(const char *mime)
    if (val) *val = 0;
 
    /* 1. look up in mapping to file or thumb (thumb has flag)*/
-   for (l = e_config->mime_icons; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->mime_icons, l, mi)
      {
-	mi = l->data;
 	if (e_util_glob_match(mi->mime, mime))
 	  {
 	     ecore_strlcpy(buf, mi->icon, sizeof(buf));
@@ -135,11 +134,7 @@ e_fm_mime_icon_cache_flush(void)
    Eina_List *freelist = NULL;
 
    eina_hash_foreach(icon_map, _e_fm_mime_icon_foreach, &freelist);
-   while (freelist)
-     {
-	eina_stringshare_del(freelist->data);
-	freelist = eina_list_remove_list(freelist, freelist);
-     }
+   E_FREE_LIST(freelist, eina_stringshare_del);
    eina_hash_free(icon_map);
    icon_map = NULL;
 }
@@ -337,17 +332,15 @@ e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, co
 {
    Eina_List *handlers = NULL;
    Eina_List *l = NULL;
+   E_Fm2_Mime_Handler *handler = NULL;
 
    if ((!obj) || (!path) || (!mime)) return;
 
    handlers = e_fm2_mime_handler_mime_handlers_get(mime);
    if (!handlers) return;
 
-   for (l = handlers; l; l = l->next)
+   EINA_LIST_FOREACH(handlers, l, handler)
      {
-	E_Fm2_Mime_Handler *handler = NULL;
-
-	handler = l->data;
 	if (!handler) continue;
 	
 	e_fm2_mime_handler_call(handler, obj, path);
@@ -360,17 +353,15 @@ e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, co
 {
    Eina_List *handlers = NULL;
    Eina_List *l = NULL;
+   E_Fm2_Mime_Handler *handler = NULL;
 
    if ((!obj) || (!path) || (!glob)) return;
 
    handlers = e_fm2_mime_handler_glob_handlers_get(glob);
    if (!handlers) return;
 
-   for (l = handlers; l; l = l->next)
+   EINA_LIST_FOREACH(handlers, l, handler)
      {
-	E_Fm2_Mime_Handler *handler = NULL;
-
-	handler = l->data;
 	if (!handler) continue;
 	
 	e_fm2_mime_handler_call(handler, obj, path);
@@ -395,15 +386,16 @@ _e_fm2_mime_handler_glob_match_foreach(const Eina_Hash *hash __UNUSED__, const v
    E_Fm2_Mime_Handler_Tuple *tuple;
    Eina_List *handlers = NULL;
    Eina_List *l = NULL;
+   void *handler = NULL;
 
    tuple = fdata;
    if (e_util_glob_match(tuple->str, key))
      {
 	handlers = data;
-	for (l = handlers; l; l = l->next)
+	EINA_LIST_FOREACH(handlers, l, handler)
 	  {
-	     if (l->data)
-	       tuple->list = eina_list_append(tuple->list, l->data);
+	     if (handler)
+	       tuple->list = eina_list_append(tuple->list, handler);
 	  }
      }
 
diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index 1f3ddbe..1225437 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
    E_Fm_Op_Type type;
 
    ecore_init();
-   eina_stringshare_init();
+   eina_init();
 
    _e_fm_op_stdin_buffer = malloc(READBUFSIZE);
 
@@ -304,7 +304,7 @@ main(int argc, char **argv)
    ecore_main_loop_begin();
 
 quit:
-   eina_stringshare_shutdown();
+   eina_shutdown();
    ecore_shutdown();
 
    free(_e_fm_op_stdin_buffer);
@@ -1416,7 +1416,7 @@ _e_fm_op_scan_atom(E_Fm_Op_Task * task)
 
         _e_fm_op_work_queue = eina_list_append_relative_list(_e_fm_op_work_queue, rtask, _e_fm_op_separator);
 
-        ctask->link = _e_fm_op_separator->next;
+        ctask->link = eina_list_next(_e_fm_op_separator);
      }
    else if (task->type == E_FM_OP_SYMLINK)
      {
diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c
index 629ccc6..b785173 100644
--- a/src/bin/e_fm_op_registry.c
+++ b/src/bin/e_fm_op_registry.c
@@ -362,9 +362,7 @@ e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(
    err = eina_error_get();
    if (err)
      {
-	EINA_ERROR_PERR("could not add listener: %s\n",
-			eina_error_msg_get(err));
-
+        printf("could not add listener: %s\n", eina_error_msg_get(err));
 	if (free_data) free_data((void *)data);
 	free(listener);
 	return;
diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c
index a24bb04..66dee97 100644
--- a/src/bin/e_fm_prop.c
+++ b/src/bin/e_fm_prop.c
@@ -173,16 +173,16 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    snprintf(buf, sizeof(buf), "%s/%s", 
 	    e_fm2_real_path_get(cfdata->fi->fm), cfdata->fi->file);
    if (((cfdata->fi->statinfo.st_mode & S_IRUSR) && (cfdata->owner_read)) ||
-       ((!cfdata->fi->statinfo.st_mode & S_IRUSR) && (!cfdata->owner_read)))
+       ((!(cfdata->fi->statinfo.st_mode & S_IRUSR)) && (!cfdata->owner_read)))
      fperm = 1;
    if (((cfdata->fi->statinfo.st_mode & S_IWUSR) && (cfdata->owner_write)) ||
-       ((!cfdata->fi->statinfo.st_mode & S_IWUSR) && (!cfdata->owner_write)))
+       ((!(cfdata->fi->statinfo.st_mode & S_IWUSR)) && (!cfdata->owner_write)))
      fperm = 1;
    if (((cfdata->fi->statinfo.st_mode & S_IROTH) && (cfdata->others_read)) ||
-       ((!cfdata->fi->statinfo.st_mode & S_IROTH) && (!cfdata->others_read)))
+       ((!(cfdata->fi->statinfo.st_mode & S_IROTH)) && (!cfdata->others_read)))
      fperm = 1;
    if (((cfdata->fi->statinfo.st_mode & S_IWOTH) && (cfdata->others_write)) ||
-       ((!cfdata->fi->statinfo.st_mode & S_IWOTH) && (!cfdata->others_write)))
+       ((!(cfdata->fi->statinfo.st_mode & S_IWOTH)) && (!cfdata->others_write)))
      fperm = 1;
    if (fperm)
      {
@@ -226,9 +226,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	     
 	     if (!cfdata->picon_mime) /* remove previous custom icon info */
 	       e_fm2_custom_file_del(buf);
-	     for (l = e_config->mime_icons; l; l = l->next)
+	     EINA_LIST_FOREACH(e_config->mime_icons, l, mi)
 	       {
-		  mi = l->data;
 		  if (!mi) continue;
 		  if (strcmp(mi->mime, cfdata->mime)) continue;
 		  if (mi->icon)
@@ -338,28 +337,28 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_label_add(evas, _("File:"));
    e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
    
    ob = e_widget_label_add(evas, _("Size:"));
    e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
 
    ob = e_widget_label_add(evas, _("Last Modified:"));
    e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
 
    ob = e_widget_label_add(evas, _("File Type:"));
    e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0);
 
@@ -367,7 +366,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_label_add(evas, _("Owner:"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 60, -1);
+   e_widget_size_min_set(ob, 60, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Others can read"), &(cfdata->others_read));
@@ -507,7 +506,7 @@ _cb_icon_sel(void *data, void *data2)
    
    cfdata->gui.fsel_wid = o;
    evas_object_show(o);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    
    e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
diff --git a/src/bin/e_fm_shared.h b/src/bin/e_fm_shared.h
index 66bdeef..c320809 100644
--- a/src/bin/e_fm_shared.h
+++ b/src/bin/e_fm_shared.h
@@ -101,13 +101,10 @@ _e_volume_free(E_Volume *v)
 static void
 _e_storage_free(E_Storage *s)
 {
-   while (s->volumes)
+   E_Volume *v;
+   EINA_LIST_FREE(s->volumes, v)
      {
-	E_Volume *v;
-
-	v = s->volumes->data;
 	_e_volume_free(v);
-	s->volumes = eina_list_remove_list(s->volumes, s->volumes);
      }
    if (s->udi) free(s->udi);
    if (s->bus) free(s->bus);
@@ -126,23 +123,13 @@ _e_volume_edd_new(void)
    Eet_Data_Descriptor *edd;
    Eet_Data_Descriptor_Class eddc;
 
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.mem_alloc = NULL;
-   eddc.func.mem_free = NULL;
+   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_volume", sizeof (E_Volume)))
+     return NULL;
+
    eddc.func.str_alloc = (char *(*)(const char *)) strdup;
    eddc.func.str_free = (void (*)(const char *)) free;
-   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
-   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
-   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
-   eddc.func.hash_foreach =
-     (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))
-     eina_hash_foreach;
-   eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
-   eddc.func.hash_free = (void  (*) (void *)) eina_hash_free;
-   eddc.name = "e_volume";
-   eddc.size = sizeof(E_Volume);
-
-   edd = eet_data_descriptor2_new(&eddc);
+
+   edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Volume, x, y, z)
    DAT("type", type, EET_T_INT);
    DAT("udi", udi, EET_T_STRING);
@@ -167,23 +154,13 @@ _e_storage_edd_new(void)
    Eet_Data_Descriptor *edd;
    Eet_Data_Descriptor_Class eddc;
 
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.mem_alloc = NULL;
-   eddc.func.mem_free = NULL;
+   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "e_storage", sizeof (E_Storage)))
+     return NULL;
+
    eddc.func.str_alloc = (char *(*)(const char *)) strdup;
    eddc.func.str_free = (void (*)(const char *)) free;
-   eddc.func.list_next = (void *(*)(void *)) eina_list_next;
-   eddc.func.list_append = (void *(*)(void *l, void *d)) eina_list_append;
-   eddc.func.list_data = (void *(*)(void *)) eina_list_data_get;
-   eddc.func.hash_foreach =
-     (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))
-     eina_hash_foreach;
-   eddc.func.hash_add = (void* (*) (void *, const char *, void *)) eet_eina_hash_add_alloc;
-   eddc.func.hash_free = (void  (*) (Eina_Hash *)) eina_hash_free;
-   eddc.name = "e_storage";
-   eddc.size = sizeof(E_Storage);
-
-   edd = eet_data_descriptor2_new(&eddc);
+
+   edd = eet_data_descriptor_stream_new(&eddc);
 #define DAT(x, y, z) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, E_Storage, x, y, z)
    DAT("type", type, EET_T_INT);
    DAT("udi", udi, EET_T_STRING);
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index 68cc996..ef8e107 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -29,6 +29,8 @@ e_font_apply(void)
 {
    char buf[1024];
    Eina_List *l;
+   E_Border *bd;
+   E_Font_Default *efd;
    E_Font_Fallback *eff;
    int blen, len;
 
@@ -46,9 +48,8 @@ e_font_apply(void)
 	     strcpy(buf, eff->name);
 	     blen -= len;
 	  }
-	for (l = eina_list_next(l); l; l = l->next)
+	EINA_LIST_FOREACH(eina_list_next(l), l, eff)
 	  {
-	     eff = eina_list_data_get(l);
 	     len = 1;
 	     if (len < blen)
 	       {
@@ -68,20 +69,14 @@ e_font_apply(void)
      edje_fontset_append_set(NULL);
 
    /* setup edje text classes */
-   for (l = e_config->font_defaults; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->font_defaults, l, efd)
      {
-	E_Font_Default *efd;
-
-	efd = eina_list_data_get(l);
 	edje_text_class_set(efd->text_class, efd->font, efd->size);
      }
 
    /* Update borders */
-   for (l = e_border_client_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	e_border_frame_recalc(bd);
      }
 }
@@ -92,6 +87,7 @@ e_font_available_list(void)
    Eina_List *evas_fonts;
    Eina_List *e_fonts;
    Eina_List *l;
+   const char *evas_font;
    E_Manager *man;
    E_Container *con;
 
@@ -104,16 +100,14 @@ e_font_available_list(void)
    evas_fonts = evas_font_available_list(con->bg_evas);
 
    e_fonts = NULL;
-   for (l = evas_fonts; l; l = l->next)
+   EINA_LIST_FOREACH(evas_fonts, l, evas_font)
      {
 	E_Font_Available *efa;
-	const char *evas_font;
 	
 	efa = E_NEW(E_Font_Available, 1);
-	evas_font = l->data;
 	efa->name = eina_stringshare_add(evas_font);
 	e_fonts = eina_list_append(e_fonts, efa);
-     }	
+     }
 
    evas_font_available_list_free(con->bg_evas, evas_fonts);
 
@@ -125,10 +119,8 @@ e_font_available_list_free(Eina_List *available)
 {
    E_Font_Available *efa;
 
-   while (available)
+   EINA_LIST_FREE(available, efa)
      {	
-	efa = available->data;
-	available = eina_list_remove_list(available, available);
 	if (efa->name) eina_stringshare_del(efa->name);
 	E_FREE(efa);
     }
@@ -137,14 +129,11 @@ e_font_available_list_free(Eina_List *available)
 EAPI void
 e_font_properties_free(E_Font_Properties *efp)
 {
-   while (efp->styles)
-     {
-        const char *str;
+   const char *str;
 
-        str = efp->styles->data;
+   EINA_LIST_FREE(efp->styles, str)
+     {
         if (str) eina_stringshare_del(str);
-        efp->styles = eina_list_remove_list(efp->styles, efp->styles);
-
      }
    if (efp->name) eina_stringshare_del(efp->name);
    free(efp);
@@ -261,6 +250,7 @@ e_font_available_list_parse(Eina_List *list)
 {
    Eina_Hash *font_hash;
    Eina_List *next;
+   void *key;
 
    font_hash = NULL;
 
@@ -280,8 +270,8 @@ e_font_available_list_parse(Eina_List *list)
    font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Oblique");
    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);
+   EINA_LIST_FOREACH(list, next, key)
+     font_hash = _e_font_available_hash_add(font_hash, key);
 
    return font_hash;
 }
@@ -303,11 +293,8 @@ e_font_fallback_clear(void)
 {
    E_Font_Fallback *eff;
 
-   while (e_config->font_fallbacks)
+   EINA_LIST_FREE(e_config->font_fallbacks, eff)
      {	
-	eff = e_config->font_fallbacks->data;
-	e_config->font_fallbacks = 
-          eina_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
 	if (eff->name) eina_stringshare_del(eff->name);
 	E_FREE(eff);
     }
@@ -341,12 +328,10 @@ EAPI void
 e_font_fallback_remove(const char *font)
 {
    Eina_List *next;
+   E_Font_Fallback *eff;
 
-   for (next = e_config->font_fallbacks; next; next = next->next)
+   EINA_LIST_FOREACH(e_config->font_fallbacks, next, eff)
      {
-	E_Font_Fallback *eff;
-	
-	eff = eina_list_data_get(next);
 	if (!strcmp(eff->name, font))
 	  {
 	     e_config->font_fallbacks = 
@@ -371,9 +356,8 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
    Eina_List *next;
 
    /* search for the text class */
-   for (next = e_config->font_defaults; next; next = next->next)
+   EINA_LIST_FOREACH(e_config->font_defaults, next, efd)
      {
-	efd = eina_list_data_get(next);
 	if (!strcmp(efd->text_class, text_class))
 	  {
 	     if (efd->font) eina_stringshare_del(efd->font);
@@ -407,9 +391,8 @@ e_font_default_get(const char *text_class)
    Eina_List *next;
 
    /* search for the text class */
-   for (next = e_config->font_defaults; next; next = next->next)
+   EINA_LIST_FOREACH(e_config->font_defaults, next, efd)
      {
-	efd = eina_list_data_get(next);
 	if (!strcmp(efd->text_class, text_class))
 	  {
 	     /* move to the front of the list */
@@ -432,9 +415,8 @@ e_font_default_remove(const char *text_class)
    Eina_List *next;
 
    /* search for the text class */
-   for (next = e_config->font_defaults; next; next = next->next)
+   EINA_LIST_FOREACH(e_config->font_defaults, next, efd)
      {
-	efd = eina_list_data_get(next);
 	if (!strcmp(efd->text_class, text_class))
 	  {
 	     e_config->font_defaults = 
@@ -482,10 +464,8 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
 	blen -= len;
      }
 
-   next = e_config->font_fallbacks;
-   while (next)
+   EINA_LIST_FOREACH(e_config->font_fallbacks, next, eff)
      {
-	eff = eina_list_data_get(next);
 	len = 1;
 	if (len < blen)
 	  {
@@ -498,7 +478,6 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
 	     strcat(_fn_buf, eff->name);
 	     blen -= len;
 	  }
-	next = eina_list_next(next);
      }
 
    if (size_ret) *size_ret = efd->size;
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index 6b0e209..d349413 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -79,7 +79,10 @@ static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h);
 static void e_gadcon_layout_unpack(Evas_Object *obj);
 static void _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc);
 static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc);
+static int  _e_gadcon_provider_populate_idler(void *data);
+static int  _e_gadcon_custom_populate_idler(void *data);
 
+static int _e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
 /********************/
 #define E_LAYOUT_ITEM_DRAG_RESIST_LEVEL 10
 
@@ -169,20 +172,13 @@ struct _E_Layout_Item_Container
     (((__lc)->pos >= (__lc2)->pos) && ((__lc)->pos < ((__lc2)->pos + (__lc2)->size))))
 
 #define E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(__lc, __bi, __increase) \
-   if (__lc->sd->horizontal) \
      { \
 	if (__increase) \
 	  __lc->size += __bi->w; \
 	else \
 	  __lc->size -= __bi->w; \
-     } \
-   else \
-     { \
-	if (__increase) \
-	  __lc->size += __bi->h; \
-	else \
-	  __lc->size -= __bi->h; \
      }
+
 /********************/
 
 static Eina_Hash *providers = NULL;
@@ -190,6 +186,9 @@ static Eina_List *providers_list = NULL;
 static Eina_List *gadcons = NULL;
 static Eina_List *populate_requests = NULL;
 static Ecore_Idler *populate_idler = NULL;
+static Eina_List *custom_populate_requests = NULL;
+static Ecore_Idler *custom_populate_idler = NULL;
+static Eina_List *gadcon_locations = NULL;
 
 /* This is the gadcon client which is currently dragged */
 static E_Gadcon_Client *drag_gcc = NULL;
@@ -212,6 +211,12 @@ e_gadcon_shutdown(void)
 	ecore_idler_del(populate_idler);
 	populate_idler = NULL;
      }
+   eina_list_free(custom_populate_requests);
+   if (custom_populate_idler)
+     {
+	ecore_idler_del(custom_populate_idler);
+	custom_populate_idler = NULL;
+     }
 
    return 1;
 }
@@ -234,22 +239,17 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc)
 
    _e_gadcon_provider_populate_unrequest(cc);
 
-   for (l = gadcons; l; l = l->next)
+   EINA_LIST_FOREACH(gadcons, l, gc)
      {
-	gc = l->data;
-	for (ll = gc->clients; ll; ll = ll->next)
+	EINA_LIST_FOREACH(gc->clients, ll, gcc)
 	  {
-	     gcc = ll->data;
 	     if (gcc->client_class == cc)
 	       dlist = eina_list_append(dlist, gcc);
 	  }
      }
-   while (dlist)
-     {
-	gcc = dlist->data;
-	dlist = eina_list_remove_list(dlist, dlist);
-	e_object_del(E_OBJECT(gcc));
-     }
+   EINA_LIST_FREE(dlist, gcc)
+     e_object_del(E_OBJECT(gcc));
+
    eina_hash_del(providers, cc->name, cc);
    providers_list = eina_list_remove(providers_list, cc);
 }
@@ -265,6 +265,11 @@ e_gadcon_custom_new(E_Gadcon *gc)
 {
    if (!gc) return;
    gadcons = eina_list_append(gadcons, gc);
+
+   if (!custom_populate_idler)
+     custom_populate_idler = ecore_idler_add(_e_gadcon_custom_populate_idler, NULL);
+   if (!eina_list_data_find(custom_populate_requests, gc))
+     custom_populate_requests = eina_list_append(custom_populate_requests, gc);
 }
 
 EAPI void
@@ -278,6 +283,7 @@ EAPI E_Gadcon *
 e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow_name)
 {
    E_Gadcon *gc;
+   E_Config_Gadcon *cf_gc;
    Eina_List *l;
    Evas_Coord x, y, w, h;
    const char *drop_types[] = { "enlightenment/gadcon_client" };
@@ -288,6 +294,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
    gc->name = eina_stringshare_add(name);
    gc->id = id;
    gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL;
+   gc->location = NULL;
 
    gc->edje.o_parent = obj;
    gc->edje.swallow_name = eina_stringshare_add(swallow_name);
@@ -314,11 +321,8 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, char *swallow
 			    gc->o_container);
    gadcons = eina_list_append(gadcons, gc);
 
-   for (l = e_config->gadcons; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->gadcons, l, cf_gc)
      {
-	E_Config_Gadcon *cf_gc;
-
-	cf_gc = l->data;
 	if ((!strcmp(cf_gc->name, gc->name)) && (cf_gc->id == gc->id))
 	  {
 	     gc->cf = cf_gc;
@@ -397,16 +401,15 @@ EAPI void
 e_gadcon_populate(E_Gadcon *gc)
 {
    Eina_List *l;
+   E_Config_Gadcon_Client *cf_gcc;
 
    E_OBJECT_CHECK(gc);
    E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
    e_gadcon_layout_freeze(gc->o_container);
-   for (l = gc->cf->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
      {
-	E_Config_Gadcon_Client *cf_gcc;
 	E_Gadcon_Client_Class *cc;
 
-	cf_gcc = l->data;
 	if (!cf_gcc->name) continue;
 	cc = eina_hash_find(providers, cf_gcc->name);
 	if (cc)
@@ -421,13 +424,11 @@ e_gadcon_populate(E_Gadcon *gc)
 	       cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc));
 
 	     if (!cf_gcc->style)
-	       {
-		  gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
-			cc->default_style);
-	       }
+               gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
+                                   cc->default_style);
 	     else
 	       gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
-		     cf_gcc->style);
+                                   cf_gcc->style);
 
 	     if (gcc)
 	       {
@@ -465,16 +466,16 @@ e_gadcon_unpopulate(E_Gadcon *gc)
 
    E_OBJECT_CHECK(gc);
    E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
-   while (gc->clients) 
+   /* Be carefull, e_object_del does remove gcc from gc->clients */
+   while (gc->clients)
      {
-	gcc = gc->clients->data;
-	if (gcc->menu) 
+	gcc = eina_list_data_get(gc->clients);
+	if (gcc->menu)
 	  {
 	     e_menu_post_deactivate_callback_set(gcc->menu, NULL, NULL);
 	     e_object_del(E_OBJECT(gcc->menu));
 	     gcc->menu = NULL;
 	  }
-	gc->clients = eina_list_remove_list(gc->clients, gc->clients);
 	e_object_del(E_OBJECT(gcc));
      }
 }
@@ -483,15 +484,13 @@ EAPI void
 e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 {
    Eina_List *l;
+   E_Config_Gadcon_Client *cf_gcc;
 
    E_OBJECT_CHECK(gc);
    E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
    e_gadcon_layout_freeze(gc->o_container);
-   for (l = gc->cf->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
      {
-	E_Config_Gadcon_Client *cf_gcc;
-
-	cf_gcc = l->data;
 	if ((cf_gcc->name) && (cc->name) && 
 	    (!strcmp(cf_gcc->name, cc->name)) &&
 	    (cf_gcc->id) && (cf_gcc->style))
@@ -499,8 +498,8 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 	     E_Gadcon_Client *gcc;
 
 	     if ((!cf_gcc->id) &&
-		 (_e_gadcon_client_class_feature_check(cc, "id_new", cc->func.id_new)))
-	       cf_gcc->id = eina_stringshare_add(cc->func.id_new(cc));
+		 (_e_gadcon_client_class_feature_check((E_Gadcon_Client_Class *)cc, "id_new", cc->func.id_new)))
+	       cf_gcc->id = eina_stringshare_add(cc->func.id_new((E_Gadcon_Client_Class *)cc));
 
 	     gcc = cc->func.init(gc, cf_gcc->name, cf_gcc->id,
 				 cf_gcc->style);
@@ -537,6 +536,7 @@ EAPI void
 e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
 {
    Eina_List *l;
+   E_Gadcon_Client *gcc;
    int horiz = 0;
 
    E_OBJECT_CHECK(gc);
@@ -569,11 +569,8 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient)
 	break;
      }
    e_gadcon_layout_orientation_set(gc->o_container, horiz);
-   for (l = gc->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc;
-
-	gcc = l->data;
 	e_box_orientation_set(gcc->o_box, horiz);
 	if (gcc->client_class->func.orient)
 	  gcc->client_class->func.orient(gcc, gc->orient);
@@ -585,17 +582,15 @@ EAPI void
 e_gadcon_edit_begin(E_Gadcon *gc)
 {
    Eina_List *l;
+   E_Gadcon_Client *gcc;
 
    E_OBJECT_CHECK(gc);
    E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
    e_gadcon_layout_freeze(gc->o_container);
    e_gadcon_locked_set(gc, 1);
    gc->editing = 1;
-   for (l = gc->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc;
-
-	gcc = l->data;
 	e_gadcon_client_edit_begin(gcc);
      }
    e_gadcon_layout_thaw(gc->o_container);
@@ -605,16 +600,14 @@ EAPI void
 e_gadcon_edit_end(E_Gadcon *gc)
 {
    Eina_List *l;
+   E_Gadcon_Client *gcc;
 
    E_OBJECT_CHECK(gc);
    E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE);
    e_gadcon_layout_freeze(gc->o_container);
    gc->editing = 0;
-   for (l = gc->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc;
-
-	gcc = l->data;
 	e_gadcon_client_edit_end(gcc);
      }
    e_gadcon_layout_thaw(gc->o_container);
@@ -625,12 +618,10 @@ EAPI void
 e_gadcon_all_edit_begin(void)
 {
    Eina_List *l;
+   E_Gadcon *gc;
 
-   for (l = gadcons; l; l = l->next)
+   EINA_LIST_FOREACH(gadcons, l, gc)
      {
-	E_Gadcon *gc;
-
-	gc = l->data;
 	e_gadcon_edit_begin(gc);
      }
 }
@@ -639,12 +630,10 @@ EAPI void
 e_gadcon_all_edit_end(void)
 {
    Eina_List *l;
+   E_Gadcon *gc;
 
-   for (l = gadcons; l; l = l->next)
+   EINA_LIST_FOREACH(gadcons, l, gc)
      {
-	E_Gadcon *gc;
-
-	gc = l->data;
 	e_gadcon_edit_end(gc);
      }
 }
@@ -914,15 +903,18 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
    if (gcc->o_control) return;
-   e_gadcon_locked_set(gcc->gadcon, 1);
-   gcc->gadcon->editing = 1;
-   gcc->o_control = edje_object_add(gcc->gadcon->evas);
-   evas_object_layer_set(gcc->o_control, 100);
+
    if (gcc->o_frame)
      evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h);
    else if (gcc->o_base)
      evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h);
    else return; /* make clang happy */
+
+   gcc->o_control = edje_object_add(gcc->gadcon->evas);
+   evas_object_layer_set(gcc->o_control, 100);
+   e_gadcon_locked_set(gcc->gadcon, 1);
+   gcc->gadcon->editing = 1;
+
    evas_object_move(gcc->o_control, x, y);
    evas_object_resize(gcc->o_control, w, h);
    e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", 
@@ -1012,6 +1004,7 @@ EAPI void
 e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
 {
    Eina_List *l = NULL;
+   E_Gadcon_Client *client = NULL;
 
    E_OBJECT_CHECK(gcc);
    E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
@@ -1041,11 +1034,9 @@ e_gadcon_client_edit_end(E_Gadcon_Client *gcc)
    if (gcc->o_control) evas_object_del(gcc->o_control);
    gcc->o_control = NULL;
 
-   for (l = gcc->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(gcc->gadcon->clients, l, client)
      {
-	E_Gadcon_Client *client = NULL;
-
-	if (!(client = l->data)) continue;
+	if (!client) continue;
 	if (client->o_control) return;
      }
    gcc->gadcon->editing = 0;
@@ -1274,6 +1265,84 @@ e_gadcon_client_zone_get(E_Gadcon_Client *gcc)
    return e_gadcon_zone_get(gcc->gadcon);
 }
 
+static void
+_e_gadcon_client_change_gadcon(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+   E_Gadcon_Location *src, *dst;
+   E_Gadcon_Client * gcc;
+
+   gcc = data;
+   src = gcc->gadcon->location;
+   dst = e_object_data_get(E_OBJECT(mi));
+   _e_gadcon_location_change(gcc, src, dst);
+}
+
+static void
+_e_gadcon_add_locations_menu_for_site(E_Menu *m, E_Gadcon_Client *gcc, E_Gadcon_Site site, int * count)
+{
+   E_Menu_Item *mi;
+   const Eina_List *l;
+   E_Gadcon_Location * loc;
+   int k = *count;
+
+   EINA_LIST_FOREACH(gadcon_locations, l, loc)
+     {
+	if (loc->site == site)
+	  {
+		if (k)
+		  {
+			k = 0;
+			mi = e_menu_item_new(m);
+			e_menu_item_separator_set(mi, 1);
+   			(*count) = 0;
+		  }
+   		mi = e_menu_item_new(m);
+		e_menu_item_label_set(mi, loc->name);
+		e_object_data_set(E_OBJECT(mi), loc);
+		e_menu_item_callback_set(mi, _e_gadcon_client_change_gadcon, gcc);
+		if (loc == gcc->gadcon->location) e_menu_item_disabled_set(mi, 1);
+		if (loc->icon_name) e_util_menu_item_theme_icon_set(mi, loc->icon_name);
+		(*count)++;
+	  }
+     }
+}
+
+static void 
+_e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m) 
+{
+   E_Gadcon_Client *gcc;
+   int n = 0;
+
+   e_menu_pre_activate_callback_set(m, NULL, NULL);
+   gcc = data;
+
+   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_SHELF, &n);
+   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_DESKTOP, &n);
+   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_TOOLBAR, &n);
+   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_EFM_TOOLBAR, &n);
+   _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n);
+}
+
+EAPI void
+e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu)
+{
+   E_Menu *mn;
+   E_Menu_Item *mi;
+
+   E_OBJECT_CHECK(gcc);
+   E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
+
+   if (gcc->gadcon->location)
+     {
+	mn = e_menu_new();
+	mi = e_menu_item_new(menu);
+	e_menu_item_label_set(mi, _("Move this gadget to"));
+	e_util_menu_item_theme_icon_set(mi, "preferences-appearance");
+	e_menu_item_submenu_set(mi, mn);
+	e_menu_pre_activate_callback_set(mn, _e_gadcon_gadget_move_to_pre_cb, gcc);
+     }
+}
+
 EAPI void
 e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int flags)
 {
@@ -1337,6 +1406,8 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int f
 		e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
 	  }
 
+	e_gadcon_client_add_location_menu(gcc, menu);
+
 	mi = e_menu_item_new(menu);
 	e_menu_item_label_set(mi, _("Remove this gadget"));
 	e_util_menu_item_theme_icon_set(mi, "list-remove");
@@ -1457,6 +1528,8 @@ e_gadcon_site_is_any_toolbar(E_Gadcon_Site site)
       case E_GADCON_SITE_TOOLBAR:
       case E_GADCON_SITE_EFM_TOOLBAR:
         return EINA_TRUE;
+      default:
+	 return EINA_FALSE;
      }
    return EINA_FALSE;
 }
@@ -1470,6 +1543,8 @@ e_gadcon_site_is_not_toolbar(E_Gadcon_Site site)
       case E_GADCON_SITE_TOOLBAR:
       case E_GADCON_SITE_EFM_TOOLBAR:
         return EINA_FALSE;
+      default:
+	 return EINA_TRUE;
      }
    return EINA_TRUE;
 }
@@ -1509,7 +1584,7 @@ _e_gadcon_client_free(E_Gadcon_Client *gcc)
    e_gadcon_client_edit_end(gcc);
    gcc->client_class->func.shutdown(gcc);
    if (gcc->client_class->func.id_del)
-     gcc->client_class->func.id_del(gcc->client_class, gcc->cf->id);
+     gcc->client_class->func.id_del((E_Gadcon_Client_Class *)gcc->client_class, gcc->cf->id);
    gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
    if (gcc->o_box) evas_object_del(gcc->o_box);
    if (gcc->o_frame) evas_object_del(gcc->o_frame);
@@ -1640,8 +1715,11 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
 {
    E_Drag *drag;
    Evas_Object *o = NULL;
-   Evas_Coord w, h;
+   Evas_Coord w = 0, h = 0;
    const char *drag_types[] = { "enlightenment/gadcon_client" };
+   
+   if (drag_gcc || !gcc->gadcon->zone || !gcc->gadcon->zone->container)
+     return;
 
    drag_gcc = gcc;
 
@@ -1655,26 +1733,27 @@ _e_gadcon_client_drag_begin(E_Gadcon_Client *gcc, int x, int y)
    if (!e_drop_inside(gcc->gadcon->drop_handler, x, y))
      e_gadcon_client_hide(gcc);
 
-   if ((gcc->gadcon->zone) && (gcc->gadcon->zone->container))
+   ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &x, &y);
+   
+   drag = e_drag_new(gcc->gadcon->zone->container, x, y,
+		     drag_types, 1, gcc, -1, NULL, 
+		     _e_gadcon_cb_drag_finished);
+   if (drag) 
      {
-	drag = e_drag_new(gcc->gadcon->zone->container, gcc->drag.x, gcc->drag.y,
-			  drag_types, 1, gcc, -1, NULL, 
-			  _e_gadcon_cb_drag_finished);
-	if (drag) 
+	o = gcc->client_class->func.icon((E_Gadcon_Client_Class *)gcc->client_class, 
+                                         e_drag_evas_get(drag));
+	evas_object_geometry_get(o, NULL, NULL, &w, &h);
+	if (!o)
 	  {
-	     o = gcc->client_class->func.icon(gcc->client_class, drag->evas);
-	     evas_object_geometry_get(o, NULL, NULL, &w, &h);
-	     if (!o)
-	       {
-		  /* FIXME: fallback icon for drag */
-		  o = evas_object_rectangle_add(drag->evas);
-		  evas_object_color_set(o, 255, 255, 255, 255);
-	       }
-	     e_drag_object_set(drag, o);
-	     e_drag_move(drag, gcc->drag.x - w/2, gcc->drag.y - h/2);
-	     e_drag_resize(drag, w, h);
-	     e_drag_start(drag, gcc->drag.x, gcc->drag.y);
+	     /* FIXME: fallback icon for drag */
+	     o = evas_object_rectangle_add(e_drag_evas_get(drag));
+	     evas_object_color_set(o, 255, 255, 255, 100);
 	  }
+	if (w < 10)
+	  w = h = 50;
+	e_drag_object_set(drag, o);
+	e_drag_resize(drag, w, h);
+	e_drag_start(drag, x + w/2, y + h/2);
      }
 }
 
@@ -1682,6 +1761,7 @@ static void
 _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
 {
    Eina_List *l;
+   E_Gadcon_Client *gcc2;
    Evas_Coord cx, cy, cw, ch;
    int seq = 1;
 
@@ -1700,11 +1780,8 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
    /* If x, y is not inside any gadcon client, seq will be 0 and it's position
     * will later be used for placement. */
    gcc->state_info.seq = 0;
-   for (l = gc->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->clients, l, gcc2)
      {
-	E_Gadcon_Client *gcc2;
-
-	gcc2 = l->data;
 	if (gcc == gcc2) continue;
 	if (gcc2->hidden) continue;
 	if (gcc2->o_frame)
@@ -1833,7 +1910,7 @@ _e_gadcon_cb_client_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *e
 	     cy = cy + ev->output.y;
 	  }
 	e_menu_activate_mouse(mn, zone, cx, cy, 1, 1, 
-			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+			      E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
      }
 }
 
@@ -1887,12 +1964,31 @@ _e_gadcon_cb_client_resize(void *data, Evas *evas, Evas_Object *obj, void *event
 static void
 _e_gadcon_client_move_start(E_Gadcon_Client *gcc)
 {
+   int x, y, gcx, gcy, gy ,gx;
+   
    evas_object_raise(gcc->o_event);
    evas_object_stack_below(gcc->o_control, gcc->o_event);
    gcc->moving = 1;
-   evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
-   gcc->drag.x = gcc->dx;
-   gcc->drag.y = gcc->dy;
+   if (gcc->gadcon->toolbar)
+     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &gcc->dx, &gcc->dy);
+   else
+     {
+	ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &gcc->dx, &gcc->dy);
+	e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
+	evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, NULL, NULL);
+	gcc->dx -= (gcx + gx);
+	gcc->dy -= (gcy + gy);
+     }
+   
+   if (gcc->o_frame)
+     evas_object_geometry_get(gcc->o_frame, &x, &y, NULL, NULL);
+   else if (gcc->o_base)
+     evas_object_geometry_get(gcc->o_base, &x, &y, NULL, NULL);
+
+   /* using drag pos to calc offset between pointer and gcc pos */
+   gcc->drag.x = (x - gcc->dx);
+   gcc->drag.y = (y - gcc->dy);
+
    gcc->state_info.resist = 0;
 }
 
@@ -1910,83 +2006,112 @@ _e_gadcon_client_move_go(E_Gadcon_Client *gcc)
 {
    Evas_Coord x, y, w, h;
    int cx, cy;
-
+   int gx, gy, gw, gh;
+   int gcx = 0, gcy = 0;
+   int changes = 0;
+   
    if (!gcc->moving) return;
-   evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
+   /* we need to get output not canvas because things like systray
+      can reparent another window so we get no position here */
+   /* maybe we should better grab mouse while move resize is active...*/
+   //evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
+   if (gcc->gadcon->toolbar)
+     evas_pointer_canvas_xy_get(gcc->gadcon->evas, &cx, &cy);
+   else
+     {
+	ecore_x_pointer_xy_get(gcc->gadcon->zone->container->win, &cx, &cy);
+	e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &gcx, &gcy, NULL, NULL);
+     }
+   
+   evas_object_geometry_get(gcc->gadcon->o_container, &gx, &gy, &gw, &gh);
+
+   cx -= (gx + gcx);
+   cy -= (gy + gcy);
+   
    x = cx - gcc->dx;
    y = cy - gcc->dy; 
-
+   
    gcc->state_info.flags = E_GADCON_LAYOUT_ITEM_LOCK_POSITION | E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
    _e_gadcon_client_current_position_sync(gcc);
+
+   if (gcc->o_frame)
+     evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
+   else if (gcc->o_base)
+     evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
+   else return; /* make clang happy */
+
    if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container))
-     {
-/*	if (abs(cy - gcc->drag.y) > e_config->drag_resist)
+     { 
+	if (cy + e_config->drag_resist < 0 || cy - e_config->drag_resist > gh)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else*/ if (x > 0)
+
+	if (x > 0 && (cx + gcc->drag.x > gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
+	     changes = 1;
 	  }
-	else if (x < 0)
+	else if (x < 0 && (cx + gcc->drag.x < gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
 	       gcc->state_info.resist = 0; 
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
+	     changes = 1;
+	  }
+
+	if (changes)
+	  {
+	     if (gcc->o_frame)
+	       e_gadcon_layout_pack_request_set(gcc->o_frame, cx + gcc->drag.x, w);
+	     else if (gcc->o_base)
+	       e_gadcon_layout_pack_request_set(gcc->o_base, cx + gcc->drag.x, w);
+
+	     gcc->config.size = w;
+	     evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
+	     gcc->config.res = w;
 	  }
      }
    else
      {
-/*	if (abs(cx - gcc->drag.x) > e_config->drag_resist)
+	if (cx + e_config->drag_resist < 0 || cx - e_config->drag_resist > gw)
 	  {
 	     _e_gadcon_client_drag_begin(gcc, cx, cy);
 	     return;
 	  }
-	else*/ if (y > 0)
+
+	if (y > 0 && (cy + gcc->drag.y > gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
+	     changes = 1;
 	  }
-	else if (y < 0)
+	else if (y < 0 && (cy + gcc->drag.y < gcc->config.pos))
 	  {
 	     if (gcc->state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
 	       gcc->state_info.resist = 0;
 	     gcc->state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
+	     changes = 1;
 	  }
-     }
-
-   if (gcc->o_frame)
-     evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h);
-   else if (gcc->o_base)
-     evas_object_geometry_get(gcc->o_base, NULL, NULL, &w, &h);
-   else return; /* make clang happy */
 
-   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 if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + x, w);
-
-	gcc->config.size = w;
-	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
-	gcc->config.res = w;
-     }
-   else
-     {
-	if (gcc->o_frame)
-	  e_gadcon_layout_pack_request_set(gcc->o_frame, gcc->config.pos + y, h);
-	else if (gcc->o_base)
-	  e_gadcon_layout_pack_request_set(gcc->o_base, gcc->config.pos + y, h);
+	if (changes)
+	  {
+	     if (gcc->o_frame)
+	       e_gadcon_layout_pack_request_set(gcc->o_frame, cy + gcc->drag.y, h);
+	     else if (gcc->o_base)
+	       e_gadcon_layout_pack_request_set(gcc->o_base, cy + gcc->drag.y, h);
+
+	     gcc->config.size = h;
+	     evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
+	     gcc->config.res = h;
+	  }
 
-	gcc->config.size = h;
-	evas_object_geometry_get(gcc->gadcon->o_container, NULL, NULL, &w, &h);
-	gcc->config.res = h;
      }
+   
    gcc->dx += x;
    gcc->dy += y;
 }
@@ -2430,7 +2555,7 @@ _e_gadcon_client_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *even
 	e_menu_activate_mouse(mn, zone, 
 			      cx + ev->output.x, 
                               cy + ev->output.y, 1, 1,
-			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+			      E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
      }
    else if (ev->button == 1)
      {
@@ -2642,7 +2767,7 @@ static Evas_Smart *_e_smart = NULL;
 /* externally accessible functions */
 static Evas_Object *
 e_gadcon_layout_add(Evas *evas)
-{
+{   
    _e_gadcon_layout_smart_init();
    return evas_object_smart_add(evas, _e_smart);
 }
@@ -2701,21 +2826,28 @@ e_gadcon_layout_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
    E_Smart_Data *sd;
 /*   
    Eina_List *l;
+   Evas_Object *obj;
    Evas_Coord tw = 0, th = 0;
  */
    if (!obj) return;
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   if (w) *w = sd->minw;
-   if (h) *h = sd->minh;
-
+   if (sd->horizontal)
+     {
+	if (w) *w = sd->minw;
+	if (h) *h = sd->minh;
+     }
+   else
+     {
+	if (w) *w = sd->minh;
+	if (h) *h = sd->minw;
+     }
+   
 /*   
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Gadcon_Layout_Item *bi;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_gadcon_layout_data");
 	if (sd->horizontal)
 	  {
@@ -2747,12 +2879,11 @@ e_gadcon_layout_asked_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
    else
      th = sd->req;
 /*   
-   for (l = sd->items; l; l = l->next)
+   Evas_Object *obj;
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Gadcon_Layout_Item *bi;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_gadcon_layout_data");
 	if (sd->horizontal)
 	  {
@@ -2791,18 +2922,18 @@ e_gadcon_layout_pack_size_set(Evas_Object *obj, int size)
     * _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
     */
    E_Gadcon_Layout_Item *bi;
-   int xx;
+   int pos;
 
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   xx = bi->ask.pos + (bi->ask.size / 2);
-   if (xx < (bi->ask.res / 3))
+   pos = bi->ask.pos + (bi->ask.size / 2);
+   if (pos < (bi->ask.res / 3))
      { 
         /* hooked to start */
 	bi->ask.size = size;
      }
-   else if (xx > ((2 * bi->ask.res) / 3))
+   else if (pos > ((2 * bi->ask.res) / 3))
      { 
         /* hooked to end */
 	bi->ask.pos = (bi->ask.pos + bi->ask.size) - size;
@@ -2827,7 +2958,7 @@ e_gadcon_layout_pack_size_set(Evas_Object *obj, int size)
 	  }
 	else
 	  { 
-	     if (xx < (bi->ask.res / 2))
+	     if (pos < (bi->ask.res / 2))
 	       {
 		  bi->ask.pos = (bi->ask.pos + bi->ask.size) - size;
 		  bi->ask.size = size;
@@ -2849,10 +2980,8 @@ e_gadcon_layout_pack_request_set(Evas_Object *obj, int pos, int size)
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   if (bi->sd->horizontal)
-     bi->ask.res = bi->sd->w;
-   else
-     bi->ask.res = bi->sd->h;
+
+   bi->ask.res = bi->sd->w;
    if (pos < 0) pos = 0;
    if ((bi->ask.res - pos) < size) pos = bi->ask.res - size;
    bi->ask.size = size;
@@ -2866,6 +2995,7 @@ e_gadcon_layout_pack_options_set(Evas_Object *obj, E_Gadcon_Client *gcc)
 {
    int ok, seq;
    Eina_List *l;
+   Evas_Object *item;
    E_Gadcon_Layout_Item *bi, *bi2;
 
    if (!obj) return;
@@ -2880,9 +3010,9 @@ e_gadcon_layout_pack_options_set(Evas_Object *obj, E_Gadcon_Client *gcc)
    if (!gcc->state_info.seq) ok = 1;
 
    seq = 1;
-   for (l = bi->sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(bi->sd->items, l, item)
      {
-	bi2 = evas_object_data_get(l->data, "e_gadcon_layout_data");
+	bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
 	if (bi == bi2) continue;
 	if (bi->gcc->state_info.seq == bi2->gcc->state_info.seq)
 	  ok = 1;
@@ -2908,8 +3038,17 @@ e_gadcon_layout_pack_min_size_set(Evas_Object *obj, int w, int h)
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->min.w = w;
-   bi->min.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->min.w = w;
+	bi->min.h = h;
+     }
+   else
+     {
+	bi->min.w = h;
+	bi->min.h = w;
+     }
+   
    _e_gadcon_layout_smart_reconfigure(bi->sd);
 }
 
@@ -2921,8 +3060,17 @@ e_gadcon_layout_pack_aspect_set(Evas_Object *obj, int w, int h)
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->aspect.w = w;
-   bi->aspect.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->aspect.w = w;
+	bi->aspect.h = h;
+     }
+   else
+     {
+	bi->aspect.w = h;
+	bi->aspect.h = w;
+     }
+     
    _e_gadcon_layout_smart_reconfigure(bi->sd);
 }
 
@@ -2934,8 +3082,16 @@ e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h)
    if (!obj) return;
    bi = evas_object_data_get(obj, "e_gadcon_layout_data");
    if (!bi) return;
-   bi->aspect_pad.w = w;
-   bi->aspect_pad.h = h;
+   if (bi->sd->horizontal)
+     {
+	bi->aspect_pad.w = w;
+	bi->aspect_pad.h = h;
+     }
+   else
+     {
+	bi->aspect_pad.w = h;
+	bi->aspect_pad.h = w;
+     }   
 }
 
 static void
@@ -2961,7 +3117,7 @@ _e_gadcon_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
    E_Gadcon_Layout_Item *bi;
 
    if (!obj) return NULL;
-   bi = calloc(1, sizeof(E_Gadcon_Layout_Item));
+   bi = E_NEW(E_Gadcon_Layout_Item, 1);
    if (!bi) return NULL;
    bi->sd = sd;
    bi->obj = obj;
@@ -2995,7 +3151,7 @@ _e_gadcon_layout_smart_disown(Evas_Object *obj)
    evas_object_smart_member_del(obj);
    evas_object_clip_unset(obj);
    evas_object_data_del(obj, "e_gadcon_layout_data");
-   free(bi);
+   E_FREE(bi);
 }
 
 static void
@@ -3010,6 +3166,7 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
 {
    Evas_Coord xx, yy;
    Eina_List *l;
+   Evas_Object *obj;
    int min, mino, cur;
    Eina_List *list = NULL;
    E_Gadcon_Layout_Item *bi;
@@ -3027,45 +3184,28 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
 
    _e_gadcon_layout_smart_min_cur_size_calc(sd, &min, &mino, &cur); 
 
-   if (sd->horizontal)
-     {
-	if ((sd->minw != min) || (sd->minh != mino))
-	  {
-	     sd->minw = min;
-	     sd->minh = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
-     }
-   else
+   if ((sd->minw != min) || (sd->minh != mino))
      {
-	if ((sd->minh != min) || (sd->minw != mino))
-	  {
-	     sd->minh = min;
-	     sd->minw = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
+	sd->minw = min;
+	sd->minh = mino;
+	evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
      }
 
    if (sd->req != cur)
      {
-	if (((sd->horizontal) && (cur >= sd->minw)) ||
-	    ((!sd->horizontal) && (cur >= sd->minh)))
+	if (cur >= sd->minw)
 	  {
 	     sd->req = cur;
 	     evas_object_smart_callback_call(sd->obj, "size_request", NULL);
 	  }
 	else
 	  {
-	     if (sd->horizontal)
-	       sd->req = sd->minw;
-	     else
-	       sd->req = sd->minh;
+	     sd->req = sd->minw;     
 	  }
      }
    _e_gadcon_layout_smart_gadcons_width_adjust(sd, min, cur);
 
-   if (((sd->horizontal) && (sd->w <= sd->req)) || 
-       ((!sd->horizontal) && (sd->h <= sd->req)))
+   if (sd->w <= sd->req)
      { 
 	_e_gadcon_layout_smart_gadcon_position_shrinked_mode(sd);
 	set_prev_pos = 0;
@@ -3078,79 +3218,60 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
 
 	_e_gadcon_layout_smart_gadcons_position(sd, &list);
 
-	for (l = list; l; l = l->next)
-	  {
-	     lc = l->data;
-	     LC_FREE(lc);
-	  }
-	list = eina_list_free(list);
+	EINA_LIST_FREE(list, lc)
+	  LC_FREE(lc);
+
 	set_prev_pos = 1;
      }
 
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items),
 			      _e_gadcon_layout_smart_sort_by_position_cb);
-   for (l = sd->items, i = 1; l; l = l->next, i++)
+   i = 1;
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); 
+	bi = evas_object_data_get(obj, "e_gadcon_layout_data"); 
 	if (bi->gcc->gadcon->editing) bi->gcc->state_info.seq = i; 
 
 	if (set_prev_pos)
 	  {
-	     if (sd->horizontal)
-	       { 
-		  bi->ask.prev_pos = bi->x; 
-		  bi->ask.prev_size = bi->w;
-	       }
-	     else
-	       {
-		  bi->ask.prev_pos = bi->y;
-		  bi->ask.prev_size = bi->h;
-	       }
-	  }
-	if (sd->horizontal)
-	  {
-	     if ((bi->x == bi->ask.pos) &&
-		 (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
-	       bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
-	  }
-	else
-	  {
-	     if ((bi->y == bi->ask.pos) &&
-		 (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
-	       bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
+	    bi->ask.prev_pos = bi->x; 
+	    bi->ask.prev_size = bi->w;
 	  }
 
+	if ((bi->x == bi->ask.pos) &&
+	    (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION))
+	  bi->gcc->state_info.flags |= E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
+
 	if ((bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION) &&
 	    (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE))
 	  {
-	     if (((sd->horizontal) && (bi->x != bi->ask.pos)) ||
-	         ((!sd->horizontal) && (bi->y != bi->ask.pos)))
-	       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
+	    if (bi->x != bi->ask.pos)
+	      bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 	  }
+	i++;
      } 
 
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Gadcon_Layout_Item *bi;
-	Evas_Object *obj;
 
-	obj = l->data;
 	bi = evas_object_data_get(obj, "e_gadcon_layout_data");
 	if (!bi) continue;
+
+	bi->h = sd->h;
+	xx = sd->x + bi->x;
+	yy = sd->y; // + ((sd->h - bi->h) / 2);
+
 	if (sd->horizontal)
 	  {
-	     bi->h = sd->h;
-	     xx = sd->x + bi->x;
-	     yy = sd->y + ((sd->h - bi->h) / 2);
+	     evas_object_move(obj, xx, yy);
+	     evas_object_resize(obj, bi->w, bi->h);
 	  }
 	else
 	  {
-	     bi->w = sd->w;
-	     xx = sd->x + ((sd->w - bi->w) / 2);
-	     yy = sd->y + bi->y;
+	     evas_object_move(obj, yy, xx);
+	     evas_object_resize(obj, bi->h, bi->w);
 	  }
-	evas_object_move(obj, xx, yy);
-	evas_object_resize(obj, bi->w, bi->h);
      }
    sd->doing_config = 0;
    if (sd->redo_config)
@@ -3158,28 +3279,17 @@ _e_gadcon_layout_smart_reconfigure(E_Smart_Data *sd)
 	_e_gadcon_layout_smart_reconfigure(sd);
 	sd->redo_config = 0;
      }
-   if (sd->horizontal)
-     {
-	if ((sd->minw != min) || (sd->minh != mino))
-	  {
-	     sd->minw = min;
-	     sd->minh = mino;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
-     }
-   else
+
+   if ((sd->minw != min) || (sd->minh != mino))
      {
-	if ((sd->minh != min) || (sd->minw != mino))
-	  {
-	     sd->minw = mino;
-	     sd->minh = min;
-	     evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
-	  }
+	sd->minw = min;
+	sd->minh = mino;
+	evas_object_smart_callback_call(sd->obj, "min_size_request", NULL);
      }
+
    if (sd->req != cur)
      {
-	if (((sd->horizontal) && (cur >= sd->minw)) ||
-	    ((!sd->horizontal) && (cur >= sd->minh)))
+	  if (cur >= sd->minw)
 	  {
 	     sd->req = cur;
 	     evas_object_smart_callback_call(sd->obj, "size_request", NULL);
@@ -3245,7 +3355,7 @@ _e_gadcon_layout_smart_del(Evas_Object *obj)
      {
 	Evas_Object *child;
 
-	child = sd->items->data;
+	child = eina_list_data_get(sd->items);
 	e_gadcon_layout_unpack(child);
      }
    evas_object_del(sd->clip);
@@ -3263,20 +3373,39 @@ _e_gadcon_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((x == sd->x) && (y == sd->y)) return;
      {
 	Eina_List *l;
+	Evas_Object *item;
 	Evas_Coord dx, dy;
 
-	dx = x - sd->x;
-	dy = y - sd->y;
-	for (l = sd->items; l; l = l->next)
+	if (sd->horizontal)
+	  {
+	     dx = x - sd->x;
+	     dy = y - sd->y;
+	  }
+	else
+	  {
+	     dx = x - sd->y;
+	     dy = y - sd->x;
+	  }
+	
+	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
 
-	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-	     evas_object_move(l->data, ox + dx, oy + dy);
+	     evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
+	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
-   sd->x = x;
-   sd->y = y;
+
+     if (sd->horizontal)
+       {
+	  sd->x = x;
+	  sd->y = y;
+       }
+     else
+       {
+	  sd->x = y;
+	  sd->y = x;
+       }
 }
 
 static void
@@ -3288,8 +3417,18 @@ _e_gadcon_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
    if ((w == sd->w) && (h == sd->h)) return;
-   sd->w = w;
-   sd->h = h;
+   if (sd->horizontal)
+     {	
+	sd->w = w;
+	sd->h = h;
+     }
+   else
+     {
+	sd->w = h;
+	sd->h = w;
+
+     }
+   
    _e_gadcon_layout_smart_reconfigure(sd);
 }
 
@@ -3358,65 +3497,37 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
 {
    E_Gadcon_Layout_Item	*bi;
    Eina_List *l;
+   Evas_Object *item;
 
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
+	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	bi->ask.size2 = bi->ask.size;
 
 	if ((bi->aspect.w > 0) && (bi->aspect.h > 0))
 	  {
-	     if (sd->horizontal)
+	     bi->ask.size2 =
+	       (((sd->h - bi->aspect_pad.h) * bi->aspect.w) / bi->aspect.h) + bi->aspect_pad.w;
+	     
+	     if (bi->ask.size2 > bi->min.w)
 	       {
-		  bi->ask.size2 = (((sd->h - bi->aspect_pad.h) * bi->aspect.w) / bi->aspect.h)
-				   + bi->aspect_pad.w;
-		  if (bi->ask.size2 > bi->min.w)
-		    {
-		       *min += bi->ask.size2;
-		       *cur += bi->ask.size2;
-		    }
-		  else
-		    {
-		       *min += bi->min.w;
-		       *cur += bi->min.w;
-		    }
+		  *min += bi->ask.size2;
+		  *cur += bi->ask.size2;
 	       }
 	     else
 	       {
-		  bi->ask.size2 = (((sd->w - bi->aspect_pad.w) * bi->aspect.h) / bi->aspect.w)
-				   + bi->aspect_pad.h;
-		  if (bi->ask.size2 > bi->min.h)
-		    {
-		       *min += bi->ask.size2;
-		       *cur += bi->ask.size2;
-		    }
-		  else
-		    {
-		       *cur += bi->min.h;
-		       *min += bi->min.h;
-		    }
+		  *min += bi->min.w;
+		  *cur += bi->min.w;
 	       }
 	  }
 	else
 	  {
-	     if (sd->horizontal)
-	       {
-		  *min += bi->min.w;
-		  if (bi->min.h > *mino) *mino = bi->min.h;
-		  if (bi->ask.size < bi->min.w)
-		    *cur += bi->min.w;
-		  else
-		    *cur += bi->ask.size;
-	       }
+	     *min += bi->min.w;
+	     if (bi->min.h > *mino) *mino = bi->min.h;
+	     if (bi->ask.size < bi->min.w)
+	       *cur += bi->min.w;
 	     else
-	       {
-		  *min += bi->min.h;
-		  if (bi->min.w > *mino) *mino = bi->min.w;
-		  if (bi->ask.size < bi->min.h)
-		    *cur += bi->min.h;
-		  else
-		    *cur += bi->ask.size;
-	       }
+	       *cur += bi->ask.size;
 	  }
      }
 }
@@ -3428,100 +3539,52 @@ _e_gadcon_layout_smart_width_smart_sort_reverse_cb(const void *d1, const void *d
 
    bi = evas_object_data_get(d1, "e_gadcon_layout_data");
    bi2 = evas_object_data_get(d2, "e_gadcon_layout_data"); 
-   if (bi->sd->horizontal)
-     { 
-	if (bi->ask.size2 > bi->min.w)
-	  {
-	     if (bi2->ask.size2 > bi2->min.w) 
-	       { 
-		  if (bi->ask.size2 < bi2->ask.size2)
-		    return 1;
-		  else
-		    return -1;
-	       }
+
+   if (bi->ask.size2 > bi->min.w)
+     {
+	if (bi2->ask.size2 > bi2->min.w) 
+	  { 
+	     if (bi->ask.size2 < bi2->ask.size2)
+	       return 1;
 	     else
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return -1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
+	       return -1;
 	  }
 	else
 	  {
-	     if (bi2->ask.size2 > bi2->min.w)
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return 1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
+	     if (bi->ask.size2 == bi2->ask.size2)
+	       return -1;
 	     else
 	       { 
 		  if (bi->ask.size2 < bi2->ask.size2)
 		    return 1;
-		  else if (bi->ask.size2 > bi2->ask.size2)
+		  else
 		    return -1;
 	       }
 	  }
      }
    else
      {
-	if (bi->ask.size2 > bi->min.h)
+	if (bi2->ask.size2 > bi2->min.w)
 	  {
-	     if (bi2->ask.size2 > bi2->min.h) 
+	     if (bi->ask.size2 == bi2->ask.size2)
+	       return 1;
+	     else
 	       { 
 		  if (bi->ask.size2 < bi2->ask.size2)
 		    return 1;
 		  else
 		    return -1;
 	       }
-	     else
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return -1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
 	  }
 	else
-	  {
-	     if (bi2->ask.size2 > bi2->min.h)
-	       {
-		  if (bi->ask.size2 == bi2->ask.size2)
-		    return 1;
-		  else
-		    { 
-		       if (bi->ask.size2 < bi2->ask.size2)
-			 return 1;
-		       else
-			 return -1;
-		    }
-	       }
-	     else
-	       { 
-		  if (bi->ask.size2 < bi2->ask.size2)
-		    return 1;
-		  else if (bi->ask.size2 > bi2->ask.size2)
-		    return -1;
-	       }
+	  { 
+	     if (bi->ask.size2 < bi2->ask.size2)
+	       return 1;
+	     else if (bi->ask.size2 > bi2->ask.size2)
+	       return -1;
 	  }
      }
+
    return 0;
 }
 
@@ -3531,47 +3594,34 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
    E_Gadcon_Layout_Item *bi2 = NULL;
    E_Gadcon_Layout_Item *bi = NULL;
    Eina_List *l, *l2;
+   Evas_Object *item, *item2;
    int need, limit, reduce_total, reduce;
    int max_size, c;
 
-   if (sd->horizontal)
+   if (sd->w < cur)
      {
-	if (sd->w < cur)
-	  {
-	     if (sd->w < min)
-	       max_size = min;
-	     else
-	       max_size = cur;
-
-	     need = max_size - sd->w;
-	  }
+	if (sd->w < min)
+	  max_size = min;
 	else
-	  return;
+	  max_size = cur;
+
+	need = max_size - sd->w;
      }
    else
-     {
-	if (sd->h < cur)
-	  {
-	     if (sd->h < min)
-	       max_size = min;
-	     else
-	       max_size = cur; 
-	     need = max_size - sd->h;
-	  }
-	else
-	  return;
-     } 
+     return;
 
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), 
 			      _e_gadcon_layout_smart_width_smart_sort_reverse_cb);
 
-   __adjust_size_again: 
-   for (l = sd->items, c = 0; l; l = l->next) 
+   __adjust_size_again:
+   c = 0;
+   EINA_LIST_FOREACH(sd->items, l, item)
      { 
-	if (l->next) 
-	  { 
-	     bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
-	     bi2 = evas_object_data_get(l->next->data, "e_gadcon_layout_data"); 
+	if (eina_list_next(l)) 
+	  {
+	     item2 = eina_list_data_get(eina_list_next(l));
+	     bi = evas_object_data_get(item, "e_gadcon_layout_data");
+	     bi2 = evas_object_data_get(item2, "e_gadcon_layout_data"); 
 
 	     if (bi->ask.size2 > bi2->ask.size2)
 	       { 
@@ -3591,10 +3641,12 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 	reduce_total = reduce * c; 
 
 	if (reduce_total <= need) 
-	  { 
-	     for (l2 = l; l2; l2 = l2->prev) 
-	       { 
-		  bi2 = evas_object_data_get(l2->data, "e_gadcon_layout_data"); 
+	  {
+	     /* EINA_FUCK_REVERSE_FOREACH(l, l2, item) */
+	     for (l2 = l; l2;  l2 = l2->prev)
+	       {
+		  item = l2->data;
+		  bi2 = evas_object_data_get(item, "e_gadcon_layout_data"); 
 		  bi2->ask.size2 -= reduce; 
 	       } 
 	     need -= reduce * c;
@@ -3616,11 +3668,13 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 			 break; 
 		    } 
 		  c2 = c;
-		  for (l2 = sd->items; l2 && c2 && need; l2 = l2->next, c2--) 
+		  EINA_LIST_REVERSE_FOREACH(sd->items, l2, item)
 		    { 
-		       bi2 = evas_object_data_get(l2->data, "e_gadcon_layout_data");
+		       if(!c2 || !need) break;
+		       bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
 		       bi2->ask.size2 -= reduce_by; 
 		       need -= reduce_by; 
+		       c2--;
 		    } 
 	       }
 	  } 
@@ -3640,11 +3694,13 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
 		    break; 
 	       } 
 	     c2 = c;
-	     for (l2 = sd->items; l2 && c2 && need; l2 = l2->next, c2--) 
-	       { 
-		  bi2 = evas_object_data_get(l2->data, "e_gadcon_layout_data");
+	     EINA_LIST_FOREACH(sd->items, l2, item)
+	       {
+		  if(!c2 || !need) break;
+		  bi2 = evas_object_data_get(item, "e_gadcon_layout_data");
 		  bi2->ask.size2 -= reduce_by; 
-		  need -= reduce_by; 
+		  need -= reduce_by;
+		  c2--;
 	       } 
 	  }
      }
@@ -3671,8 +3727,8 @@ _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2)
 
    bi = evas_object_data_get(d1, "e_gadcon_layout_data");
    bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
-   if (bi->sd->horizontal) return (bi->x - bi2->x);
-   return (bi->y - bi2->y);
+
+   return (bi->x - bi2->x);
 }
 
 static int
@@ -3703,9 +3759,8 @@ _e_gadcon_layout_smart_sync_clients(E_Gadcon *gc)
    E_Gadcon_Client *gcc;
    Eina_List *l;
 
-   for (l = gc->clients; l; l = l->next)
+   EINA_LIST_FOREACH(gc->clients, l, gcc)
      {
-	gcc = l->data;
 	_e_gadcon_client_save(gcc);
      }
 }
@@ -3726,42 +3781,47 @@ _e_gadcon_client_current_position_sync(E_Gadcon_Client *gcc)
 
    gcc->state_info.prev_pos = gcc->config.pos;
    gcc->state_info.prev_size = gcc->config.size;
-   if (e_gadcon_layout_orientation_get(gcc->gadcon->o_container)) 
-     gcc->config.pos = bi->x;
-   else
-     gcc->config.pos = bi->y;
+   gcc->config.pos = bi->x;
 }
 
 static void
 _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
 { 
    Eina_List *l;
+   Evas_Object *item;
    E_Gadcon_Layout_Item *bi, *bi2; 
    void *tp; 
    int pos = 0; 
 
    sd->items = eina_list_sort(sd->items, eina_list_count(sd->items),
 			      _e_gadcon_layout_smart_sort_by_sequence_number_cb); 
-   for (l = sd->items; l; l = l->next) 
+   EINA_LIST_FOREACH(sd->items, l, item)
      { 
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data"); 
+	bi = evas_object_data_get(item, "e_gadcon_layout_data"); 
 	if (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) 
 	  { 
 	     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->state_info.resist++; 
+	     	  bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
 	       } 
-	     else 
+	     else
 	       { 
 		  bi->gcc->state_info.resist = 0; 
-		  if (l->next) 
+		  if (eina_list_next(l)) 
 		    { 
-		       tp = l->next->data; 
-		       l->next->data = l->data; 
+		       tp = eina_list_data_get(eina_list_next(l));
+		       l->next->data = eina_list_data_get(l); 
 		       l->data = tp; 
 
 		       bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
+		       
+		       if (bi2->x + bi2->w/2 > bi->ask.pos + bi->w)
+			 {
+			    bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
+			    return;
+			 }
+		       
 		       bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos;
 		       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 		       bi->gcc->state_info.want_save = 1;
@@ -3782,15 +3842,23 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
 	     else
 	       {
 		  bi->gcc->state_info.resist = 0; 
-		  if (l->prev)
+		  if (eina_list_prev(l))
 		    { 
 		       E_Gadcon_Layout_Item *bi2;
 		       void *tp;
 
-		       tp = l->prev->data;
-		       l->prev->data = l->data;
+		       tp = eina_list_data_get(eina_list_prev(l));
+		       l->prev->data = eina_list_data_get(l);
+
 		       l->data = tp; 
 		       bi2 = evas_object_data_get(tp, "e_gadcon_layout_data");
+
+		       if (bi->ask.pos > bi2->x + bi2->w/2)
+			 {
+			    bi->gcc->config.pos = bi->ask.pos = bi->gcc->state_info.prev_pos;
+			    return;
+			 }
+
 		       bi->gcc->config.pos = bi->ask.pos = bi2->ask.pos;
 		       bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 		       bi->gcc->state_info.want_save = 1;
@@ -3806,186 +3874,115 @@ _e_gadcon_layout_smart_gadcon_position_shrinked_mode(E_Smart_Data *sd)
 		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) ||
 	         (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC))
 	  { 
-	     if (sd->horizontal)
-	       { 
-		  if (bi->w < bi->min.w) 
-		    bi->gcc->config.size = bi->w = bi->min.w;
-		  else
-		    bi->gcc->config.size = bi->w;
-	       }
+	     if (bi->w < bi->min.w) 
+	       bi->gcc->config.size = bi->w = bi->min.w;
 	     else
-	       {
-		  if (bi->h < bi->min.h)
-		    bi->gcc->config.size = bi->h = bi->min.h;
-		  else
-		    bi->gcc->config.size = bi->h;
-	       }
+	       bi->gcc->config.size = bi->w;
+
 	     bi->gcc->config.pos = bi->gcc->state_info.prev_pos;
-	  } 
+	  }	
      } 
 
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, item)
      { 
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
-	if (sd->horizontal) 
-	  { 
-	     bi->x = pos; 
-	     bi->gcc->config.size = bi->w = bi->ask.size2; 
-	     pos = bi->x + bi->w;
-	  }
-	else
-	  {
-	     bi->y = pos; 
-	     bi->gcc->config.size = bi->h = bi->ask.size2; 
-	     pos = bi->y + bi->h;
-	  }
+	bi = evas_object_data_get(item, "e_gadcon_layout_data");
+
+	bi->x = pos;
+	bi->w = bi->ask.size2; 
+	bi->gcc->config.size = bi->w;
+	pos = bi->x + bi->w;
      }
 }
 
-/* 
- * The function returns a list of E_Gadcon_Layout_Item_Container
- */
 static void
 _e_gadcon_layout_smart_gadcons_asked_position_set(E_Smart_Data *sd)
 {
    E_Gadcon_Layout_Item *bi;
    Eina_List *l;
+   Evas_Object *item;
 
-   for (l = sd->items; l; l = l->next)
+#if 0
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
+	bi = evas_object_data_get(item, "e_gadcon_layout_data");
+	if (!bi) continue;
+	
+	bi->x = bi->ask.pos;
+	bi->w = bi->ask.size2;
+     }
+#else
+   int pos;
+   EINA_LIST_FOREACH(sd->items, l, item)
+     {
+	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	if (!bi) continue;
 
-	if (sd->horizontal)
-	  {
+	pos = bi->ask.pos + (bi->ask.size / 2);
+	if (pos < (bi->ask.res / 3))
+	  { 
+	     /* hooked to start */
 	     bi->x = bi->ask.pos;
 	     bi->w = bi->ask.size2;
+	     bi->hookp = 0;
 	  }
-	else
-	  {
-	     bi->y = bi->ask.pos;
-	     bi->h = bi->ask.size2;
-	  }
-     }
-
-#if 0
-   for (l = sd->items; l; l = l->next)
-     {
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
-	if (!bi) continue;
-	if (sd->horizontal)
-	  {
-	     xx = bi->ask.pos + (bi->ask.size / 2);
-	     if (xx < (bi->ask.res / 3))
-	       { 
-                  /* hooked to start */
-		  bi->x = bi->ask.pos;
-		  bi->w = bi->ask.size2;
-		  bi->hookp = 0;
-	       }
-	     else if (xx > ((2 * bi->ask.res) / 3))
-	       { 
-                  /* hooked to end */
-		  bi->x = (bi->ask.pos - bi->ask.res) + sd->w;
-		  bi->w = bi->ask.size2;
-		  bi->hookp = bi->ask.res;
-	       }
-	     else
-	       { 
-                  /* hooked to middle */
-		  if ((bi->ask.pos <= (bi->ask.res / 2)) &&
-		      ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
-		    { 
-                       /* straddles middle */
-		       if (bi->ask.res > 2)
-			 bi->x = (sd->w / 2) + 
-			 (((bi->ask.pos + (bi->ask.size2 / 2) - 
-			    (bi->ask.res / 2)) * 
-			   (bi->ask.res / 2)) /
-			  (bi->ask.res / 2)) - (bi->ask.size2 / 2);
-		       else
-			 bi->x = sd->w / 2;
-		       bi->w = bi->ask.size2;
-		    }
-		  else
-		    { 
-                       /* either side of middle */
-		       bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (sd->w / 2);
-		       bi->w = bi->ask.size2;
-		    }
-		  bi->hookp = bi->ask.res / 2;
-	       }
+	else if (pos > ((2 * bi->ask.res) / 3))
+	  { 
+	     /* hooked to end */
+	     bi->x = (bi->ask.pos - bi->ask.res) + sd->w;
+	     bi->w = bi->ask.size2;
+	     bi->hookp = bi->ask.res;
 	  }
 	else
-	  {
-	     yy = bi->ask.pos + (bi->ask.size2 / 2);
-	     if (yy < (bi->ask.res / 3))
-	       { 
-                  /* hooked to start */
-		  bi->y = bi->ask.pos;
-		  bi->h = bi->ask.size2;
-		  bi->hookp = 0;
-	       }
-	     else if (yy > ((2 * bi->ask.res) / 3))
+	  { 
+	     /* hooked to middle */
+	     if ((bi->ask.pos <= (bi->ask.res / 2)) &&
+		 ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
 	       { 
-                  /* hooked to end */
-		  bi->y = (bi->ask.pos - bi->ask.res) + sd->h;
-		  bi->h = bi->ask.size2;
-		  bi->hookp = bi->ask.res;
+		  /* straddles middle */
+		  if (bi->ask.res > 2)
+		    bi->x = (sd->w / 2) + 
+		      (((bi->ask.pos + (bi->ask.size2 / 2) - 
+			 (bi->ask.res / 2)) * 
+			(bi->ask.res / 2)) /
+		       (bi->ask.res / 2)) - (bi->ask.size2 / 2);
+		  else
+		    bi->x = sd->w / 2;
+		  bi->w = bi->ask.size2;
 	       }
 	     else
 	       { 
-                  /* hooked to middle */
-		  if ((bi->ask.pos <= (bi->ask.res / 2)) &&
-		      ((bi->ask.pos + bi->ask.size2) > (bi->ask.res / 2)))
-		    { 
-                       /* straddles middle */
-		       if (bi->ask.res > 2)
-			 bi->y = (sd->h / 2) + 
-			 (((bi->ask.pos + (bi->ask.size2 / 2) - 
-			    (bi->ask.res / 2)) * 
-			   (bi->ask.res / 2)) /
-			  (bi->ask.res / 2)) - (bi->ask.size2 / 2);
-		       else
-			 bi->y = sd->h / 2;
-		       bi->h = bi->ask.size2;
-		    }
-		  else
-		    { 
-                       /* either side of middle */
-		       bi->y = (bi->ask.pos - (bi->ask.res / 2)) + (sd->h / 2);
-		       bi->h = bi->ask.size2;
-		    }
-		  bi->hookp = bi->ask.res / 2;
+		  /* either side of middle */
+		  bi->x = (bi->ask.pos - (bi->ask.res / 2)) + (sd->w / 2);
+		  bi->w = bi->ask.size2;
 	       }
+	     bi->hookp = bi->ask.res / 2;
 	  }
      }
 #endif
 }
 
+/* 
+ * The function returns a list of E_Gadcon_Layout_Item_Container
+ */
 static Eina_List *
 _e_gadcon_layout_smart_gadcons_wrap(E_Smart_Data *sd)
 {
    Eina_List *l, *list = NULL;
+   Evas_Object *item;
    E_Layout_Item_Container *lc;
    E_Gadcon_Layout_Item *bi;
 
-   for (l = sd->items; l; l = l->next)
+   
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	bi = evas_object_data_get(l->data, "e_gadcon_layout_data");
+	bi = evas_object_data_get(item, "e_gadcon_layout_data");
 	lc = E_NEW(E_Layout_Item_Container, 1);
 	lc->state_info.min_seq = lc->state_info.max_seq = bi->gcc->state_info.seq;
 	lc->sd = sd;
-	if (sd->horizontal)
-	  {
-	     lc->pos = bi->x;
-	     lc->size = bi->w;
-	  }
-	else
-	  {
-	     lc->pos = bi->y;
-	     lc->size = bi->h;
-	  }
+
+	lc->pos = bi->x;
+	lc->size = bi->w;
+
 	lc->prev_pos = bi->ask.prev_pos;
 	lc->prev_size = bi->ask.prev_size;
 
@@ -4011,16 +4008,10 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 
    if ((!list) || (!*list)) return;
 
-   for (l = *list; l; l = l->next)
+   EINA_LIST_FOREACH(*list, l, lc_moving)
      {
-	lc_moving = l->data;
-
-	if ((lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_DEC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_INC) ||
-	    (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_DEC))
+	if ((lc_moving->state != E_LAYOUT_ITEM_CONTAINER_STATE_NONE) &&
+	    (lc_moving->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED))
 	  {
 	     lc_back = E_NEW(E_Layout_Item_Container, 1);
 	     lc_back->pos = lc_moving->pos;
@@ -4030,10 +4021,11 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	     lc_back->state_info.min_seq = lc_moving->state_info.min_seq;
 	     lc_back->state_info.max_seq = lc_moving->state_info.max_seq;
 	     lc_back->sd = lc_moving->sd;
-	     for (l2 = lc_moving->items; l2; l2 = l2->next)
-	       lc_back->items = eina_list_append(lc_back->items, l2->data);
+	     EINA_LIST_FOREACH(lc_moving->items, l2, lc)
+	       lc_back->items = eina_list_append(lc_back->items, lc);
 	     lc_back->state = lc_moving->state;
-	     bi_moving = lc_back->items->data;
+	     bi_moving = eina_list_data_get(lc_back->items);
+	     
 	     break;
 	  }
 	lc_moving = NULL;
@@ -4049,16 +4041,17 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
    if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC) 
      { 
 	_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd, &lc_moving, lc_back, list); 
-	for (l = *list; (l) && (l->data != lc_moving); l = l->next); 
+	EINA_LIST_FOREACH(*list, l, lc)
+	   if (lc == lc_moving) break;
 
 	ok = 0;
-	if ((l) && (l->prev))
+	if ((l) && eina_list_prev(l))
 	  {
-	     lc = l->prev->data;
+	     lc = eina_list_data_get(eina_list_prev(l));
 
 	     if (lc_moving->pos < (lc->pos + lc->size))
 	       {
-		  bi = lc_moving->items->data;
+		  bi = eina_list_data_get(lc_moving->items);
 		  if (bi->gcc->state_info.resist <= E_LAYOUT_ITEM_DRAG_RESIST_LEVEL)
 		    {
 		       if (lc_moving->prev_pos == (lc->pos + lc->size))
@@ -4082,7 +4075,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 			      ok = 1;
 
 			    l->data = lc3;
-			    *list = eina_list_remove_list(*list, l->prev);
+			    *list = eina_list_remove_list(*list, eina_list_prev(l));
 			    LC_FREE(lc_moving);
 			    LC_FREE(lc);
 			    lc_moving = lc3;
@@ -4094,51 +4087,33 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	  { 
 	     int pos, prev_pos, stop;
 
-	     for (l = *list; (l) && (l->data != lc_moving); l = l->next);
+	     EINA_LIST_FOREACH(*list, l, lc)
+		if (lc == lc_moving) break;
+
 	     pos = lc_moving->pos + lc_moving->size;
 	     prev_pos = lc_moving_prev_pos;
-	     if ((l) && (l->next)) 
+	     if ((l) && (eina_list_next(l)))
 	       { 
 		  stop = 0;
-		  for (l2 = l->next; l2 && !stop; l2 = l2->next)
+		  EINA_LIST_FOREACH(eina_list_next(l), l2, lc)
 		    {
-		       lc = l2->data;
-
+		       if (stop) break;
 		       if (lc->pos != prev_pos) break;
 		       prev_pos = lc->pos + lc->size;
 
-		       for (l3 = lc->items; l3; l3 = l3->next)
+		       EINA_LIST_FOREACH(lc->items, l3, bi)
 			 {
-			    bi = l3->data;
 			    if (bi->ask.pos <= pos)
 			      {
-				 if (sd->horizontal) 
-				   { 
-				      bi->x = pos;
-				      pos = bi->x + bi->w;
-				   }
-				 else
-				   { 
-				      bi->y = pos;
-				      pos = bi->y + bi->h;
-				   }
+				bi->x = pos;
+				pos = (bi->x) + (bi->w);
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos < bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos < bi->y)))
+			    else if (bi->ask.pos < bi->x)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = bi->ask.pos;
-				      pos = bi->x + bi->w;
-				   }
-				 else
-				   {
-				      bi->y = bi->ask.pos;
-				      pos = bi->y + bi->h;
-				   }
+				bi->x = bi->ask.pos;
+				pos = (bi->x) + (bi->w);				
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos == bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos == bi->y)))
+			    else if (bi->ask.pos == bi->x)
 			      {
 				 stop = 1;
 				 break;
@@ -4149,18 +4124,19 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	  }
      }
    else if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC)
-     { 
+     {
 	_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd, &lc_moving, lc_back, list); 
-	for (l = *list; (l) && (l->data != lc_moving); l = l->next); 
+	EINA_LIST_FOREACH(*list, l, lc)
+	   if (lc == lc_moving) break;
 
 	ok = 0;
-	if ((l) && (l->next))
+	if ((l) && eina_list_next(l))
 	  {
-	     lc = l->next->data;
+	     lc = eina_list_data_get(eina_list_next(l));
 
 	     if ((lc_moving->pos + lc_moving->size) > lc->pos)
 	       {
-		  bi = lc_moving->items->data;
+		  bi = eina_list_data_get(lc_moving->items);
 		  if (bi->gcc->state_info.resist <= E_LAYOUT_ITEM_DRAG_RESIST_LEVEL)
 		    {
 		       if ((lc_moving->prev_pos + lc_moving->size) == lc->pos)
@@ -4184,7 +4160,7 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 			      ok = 1;
 
 			    l->data = lc3;
-			    *list = eina_list_remove_list(*list, l->next);
+			    *list = eina_list_remove_list(*list, eina_list_next(l));
 			    LC_FREE(lc_moving);
 			    LC_FREE(lc);
 			    lc_moving = lc3;
@@ -4196,55 +4172,38 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	if (!ok)
 	  {
 	     int pos, prev_pos, stop;
-
-	     for (l = *list; (l) && (l->data != lc_moving); l = l->next);
+	     
+	     EINA_LIST_FOREACH(*list, l, lc)
+		if (lc == lc_moving) break;
 
 	     pos = lc_moving->pos;
 	     prev_pos = lc_moving_prev_pos;
 
-	     if ((l) && (l->prev))
+	     if ((l) && eina_list_prev(l))
 	       {
 		  stop = 0;
-		  for (l2 = l->prev; l2 && !stop; l2 = l2->prev)
+		  /* EINA_FUCK_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
+		  for (l2 = l->prev; l2; l2 = l2->prev)
 		    {
 		       lc = l2->data;
+		       
+		       if (stop) break;
 		       if ((lc->pos + lc->size) == prev_pos) break;
 		       prev_pos = lc->pos;
 
-		       for (l3 = eina_list_last(lc->items); l3; l3 = l3->prev)
+		       EINA_LIST_REVERSE_FOREACH(lc->items, l3, bi)
 			 {
-			    bi = l3->data;
-
-			    if (((sd->horizontal) && ((bi->ask.pos + bi->w) >= pos)) ||
-			        ((!sd->horizontal) && ((bi->ask.pos + bi->h) >= pos)))
+			    if ((bi->ask.pos + bi->w) >= pos)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = pos - bi->w;
-				      pos = bi->x;
-				   }
-				 else
-				   {
-				      bi->y = pos - bi->h;
-				      pos = bi->y;
-				   }
+				 bi->x = pos - bi->w;
+				 pos = bi->x;
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos > bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos > bi->w)))
+			    else if (bi->ask.pos > bi->x)
 			      {
-				 if (sd->horizontal)
-				   {
-				      bi->x = bi->ask.pos;
-				      pos = bi->x;
-				   }
-				 else
-				   {
-				      bi->y = bi->ask.pos;
-				      pos = bi->y;
-				   }
+				 bi->x = bi->ask.pos;
+				 pos = bi->x;
 			      }
-			    else if (((sd->horizontal) && (bi->ask.pos == bi->x)) ||
-				     ((!sd->horizontal) && (bi->ask.pos == bi->y)))
+			    else if (bi->ask.pos == bi->x)
 			      {
 				 stop = 1;
 				 break;
@@ -4257,17 +4216,19 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
    else if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MIN_END_DEC)
      { 
 	_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd, &lc_moving, lc_back, list); 
-	for (l = *list; (l) && (l->data != lc_moving); l = l->next);
+	EINA_LIST_FOREACH(*list, l, lc)
+	   if (lc == lc_moving) break;
 
-	if ((l) && (l->prev))
+	if ((l) && eina_list_prev(l))
 	  {
 	     int new_pos = 0;
 
 	     ok = 0;
 	     new_pos = lc_moving->pos;
+	     /* EINA_FUCK_REVERSE_FOREACH(eina_list_prev(l), l2, lc) */
 	     for (l2 = l->prev; l2; l2 = l2->prev)
 	       {
-		  lc = l2->data;
+		  lc = l2->data;		  
 		  if (new_pos >= (lc->pos + lc->size)) break;
 
 		  ok = 1;
@@ -4279,11 +4240,8 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 		  lc_moving->size += new_pos;
 		  lc_moving->pos -= new_pos;
 
-		  bi = lc_moving->items->data;
-		  if (sd->horizontal)
-		    bi->w = lc_moving->size;
-		  else
-		    bi->h = lc_moving->size;
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
 		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
 
 		  new_pos = 0;
@@ -4292,34 +4250,31 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	     if (ok)
 	       { 
 		  if (!l2) l2 = *list; 
-		  else l2 = l2->next;
+		  else l2 = eina_list_next(l2);
 
-		  for (; l2 != l; l2 = l2->next) 
+		  EINA_LIST_FOREACH(l2, l2, lc)
 		    { 
-		       lc = l2->data; 
+		       if (l2 == l) break;
 		       lc->pos = new_pos; 
 		       _e_gadcon_layout_smart_position_items_inside_container(sd, lc); 
-		       for (l3 = lc->items; l3; l3 = l3->next)
+		       EINA_LIST_FOREACH(lc->items, l3, bi)
 			 {
-			    bi = l3->data;
 			    bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 			 }
 		       new_pos += lc->size; 
 		    }
 	       }
 	  }
-	else if ((l) && (!l->prev))
+	else if ((l) && (!eina_list_prev(l)))
 	  {
 	     if (lc_moving->pos <= 0)
 	       {
 		  lc_moving->size = lc_moving->prev_size;
 		  lc_moving->pos = 0;
 
-		  bi = lc_moving->items->data;
-		  if (sd->horizontal)
-		    bi->w = lc_moving->size;
-		  else
-		    bi->h = lc_moving->size;
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
+
 		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
 	       }
 	  }
@@ -4333,19 +4288,18 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
    else if (lc_moving->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_INC)
      {
 	_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd, &lc_moving, lc_back, list); 
-	for (l = *list; (l) && (l->data != lc_moving); l = l->next);
+	EINA_LIST_FOREACH(*list, l, lc)
+	   if (lc == lc_moving) break;
 
-	if ((l) && (l->next))
+	if ((l) && eina_list_next(l))
 	  {
 	     Eina_List *stop = NULL;
 	     int new_pos = 0;
 
 	     ok = 0;
 	     new_pos = lc_moving->pos + lc_moving->size;
-	     for (l2 = l->next; l2; l2 = l2->next)
+	     EINA_LIST_FOREACH(eina_list_next(l), l2, lc)
 	       {
-		  lc = l2->data;
-
 		  if (new_pos <= lc->pos)
 		    {
 		       stop = l2;
@@ -4353,67 +4307,40 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 		    }
 
 		  ok = 1;
-		  new_pos += lc->size;
+		  /* new_pos += lc->size; */
 	       }
 
-	     if (sd->horizontal)
-	       {
-		  if (new_pos > sd->w)
-		    {
-		       lc_moving->size -= (new_pos - sd->w);
-		       bi = lc_moving->items->data;
-		       bi->w = lc_moving->size;
-
-		       new_pos = lc_moving->pos + lc_moving->size;
-		    }
-	       }
-	     else
+	     if (new_pos > sd->w)
 	       {
-		  if (new_pos > sd->h)
-		    {
-		       lc_moving->size -= (new_pos - sd->h);
-		       bi = lc_moving->items->data;
-		       bi->h = lc_moving->size;
+		  lc_moving->size -= (new_pos - sd->w);
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
 
-		       new_pos = lc_moving->pos + lc_moving->size;
-		    }
+		  new_pos = lc_moving->pos + lc_moving->size;
 	       }
 
 	     if (ok)
 	       {
-		  for (l2 = l->next; l2 && l2 != stop; l2 = l2->next)
+		  EINA_LIST_FOREACH(eina_list_next(l), l2, lc)
 		    {
-		       lc = l2->data;
+		       if (l2 == stop) break;
 		       lc->pos = new_pos;
 		       _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
-		       for (l3 = lc->items; l3; l3 = l3->next)
+		       EINA_LIST_FOREACH(lc->items, l3, bi)
 			 {
-			    bi = l3->data;
 			    bi->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 			 }
 		       new_pos += lc->size;
 		    }
 	       }
 	  }
-	else if ((l) && (!l->next))
+	else if ((l) && (!eina_list_next(l)))
 	  {
-	     if (sd->horizontal) 
-	       {
-		  if ((lc_moving->pos + lc_moving->size) >= sd->w)
-		    {
-		       lc_moving->size = lc_moving->prev_size;
-		       bi = lc_moving->items->data;
-		       bi->w = lc_moving->size;
-		    }
-	       }
-	     else
+	     if ((lc_moving->pos + lc_moving->size) >= sd->w)
 	       {
-		  if ((lc_moving->pos + lc_moving->size) > sd->h)
-		    {
-		       lc_moving->size = lc_moving->prev_size;
-		       bi = lc_moving->items->data;
-		       bi->h = lc_moving->size;
-		    }
+		  lc_moving->size = lc_moving->prev_size;
+		  bi = eina_list_data_get(lc_moving->items);
+		  bi->w = lc_moving->size;
 	       }
 	  }
      }
@@ -4424,16 +4351,8 @@ _e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Eina_List **list)
 	LC_FREE(lc_back);
      }
 
-   if (sd->horizontal) 
-     { 
-	bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x; 
-	bi_moving->gcc->config.size = bi_moving->w;
-     }
-   else
-     {
-	bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->y;
-	bi_moving->gcc->config.size = bi_moving->h;
-     }
+   bi_moving->gcc->config.pos = bi_moving->ask.pos = bi_moving->x; 
+   bi_moving->gcc->config.size = bi_moving->w;
 }
 
 static void
@@ -4446,12 +4365,11 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **lis
    *list = eina_list_sort(*list, eina_list_count(*list), _e_gadcon_layout_smart_containers_sort_cb);
 
    __reposition_again:
-   for (l = *list; l; l = l->next)
+   EINA_LIST_FOREACH(*list, l, lc)
      {
-	if (!l->next) continue;
+	if (!eina_list_next(l)) continue;
 
-	lc = l->data;
-	lc2 = l->next->data;
+	lc2 = eina_list_data_get(eina_list_next(l));
 
 	if (LC_OVERLAP(lc, lc2))
 	  {
@@ -4459,7 +4377,7 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **lis
 	     if (lc3)
 	       { 
 		  l->data = lc3; 
-		  *list = eina_list_remove_list(*list, l->next); 
+		  *list = eina_list_remove_list(*list, eina_list_next(l)); 
 		  LC_FREE(lc);
 		  LC_FREE(lc2);
 		  goto __reposition_again;
@@ -4468,9 +4386,8 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **lis
      }
 
    ok = 1;
-   for (l = *list; l; l = l->next)
+   EINA_LIST_FOREACH(*list, l, lc)
      {
-	lc = l->data;
 	if (lc->pos < 0)
 	  {
 	     ok = 0;
@@ -4479,23 +4396,11 @@ _e_gadcon_layout_smart_gadcons_position_static(E_Smart_Data *sd, Eina_List **lis
 	     continue;
 	  }
 
-	if (sd->horizontal)
+	if (((lc->pos + lc->size) > sd->w) && (lc->size <= sd->w))
 	  {
-	     if (((lc->pos + lc->size) > sd->w) && (lc->size <= sd->w))
-	       {
-		  ok = 0;
-		  lc->pos = sd->w - lc->size;
-		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
-	       }
-	  }
-	else
-	  {
-	     if (((lc->pos + lc->size) > sd->h) && (lc->size <= sd->h))
-	       {
-		  ok = 0;
-		  lc->pos = sd->h - lc->size;
-		  _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
-	       }
+	     ok = 0;
+	     lc->pos = sd->w - lc->size;
+	     _e_gadcon_layout_smart_position_items_inside_container(sd, lc);
 	  }
      }
    if (!ok)
@@ -4541,21 +4446,14 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 	  {
 	     int t;
 
-	     bi = lc->items->data;
-	     bi2  = lc2->items->data;
+	     bi = eina_list_data_get(lc->items);
+	     bi2 = eina_list_data_get(lc2->items);
+
+	     bi->x = ((bi2->x) + (bi2->w)) - (bi->w);
+	     bi->gcc->config.pos = bi->ask.pos = bi->x;
+	     bi->gcc->config.size = bi->w;
+	     bi2->x = (bi->x) - (bi2->w);
 
-	     if (sd->horizontal)
-	       {
-		  bi->gcc->config.pos = bi->ask.pos = bi->x = (bi2->x + bi2->w) - bi->w;
-		  bi->gcc->config.size = bi->w;
-		  bi2->x = bi->x - bi2->w;
-	       }
-	     else
-	       {
-		  bi->gcc->config.pos = bi->ask.pos = bi->y = (bi2->y + bi2->h) - bi->h;
-		  bi->gcc->config.size = bi->h;
-		  bi2->y = bi->y - bi2->h;
-	       }
 	     bi2->gcc->state_info.flags &= ~E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE;
 
 	     t = bi->gcc->state_info.seq;
@@ -4585,34 +4483,29 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 
 		  _e_gadcon_layout_smart_containers_merge(sd, lc, lc2);
 
-		  for (l = lc->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION)
 			 {
-			    if (sd->horizontal) shift = bi->ask.pos - bi->x;
-			    else shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			 }
 
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 break;
 		    }
 
-		  for (l = lc->items; l && shift; l = l->next)
+		  if (shift)
 		    {
-		       bi = l->data;
-
-		       if (sd->horizontal) bi->x += shift;
-		       else bi->y += shift;
-
-		       if (l == lc->items)
-			 {
-			    if (sd->horizontal) lc->pos = bi->x;
-			    else lc->pos = bi->y;
-			 }
-		    }
-	       } 
-	  } 
+     		       EINA_LIST_FOREACH(lc->items, l, bi)
+     			 {
+			    bi->x += shift;
+			    
+     			    if (l == lc->items)
+			      lc->pos = bi->x;
+     			 }
+     		    } 
+     	       } 
+	  }
 	create_new = 1; 
 	new_state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
      }
@@ -4638,53 +4531,39 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 	       {
 		  int shift = 0;
 
-		  for (l = lc->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION)
 			 {
-			    if (sd->horizontal) shift = bi->ask.pos - bi->x;
-			    else shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			 }
 
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 break;
 		    }
 
-		  for (l = lc->items; l && shift; l = l->next)
+		  if (shift)
 		    {
-		       bi = l->data;
-
-		       if (sd->horizontal) bi->x += shift;
-		       else bi->y += shift;
+  		       EINA_LIST_FOREACH(lc->items, l, bi)
+  			 {
+			    bi->x += shift;
 
-		       if (l == lc->items)
-			 {
-			    if (sd->horizontal) lc->pos = bi->x;
-			    else lc->pos = bi->y;
-			 }
-		    }
+     			    if (l == lc->items)
+			      lc->pos = bi->x;
+     			 }
+     		    }
 	       }
 	  }
 	else if (lc2->state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC)
 	  {
 	     int t;
 
-	     bi = (eina_list_last(lc->items))->data;
-	     bi2 = lc2->items->data;
+	     bi = eina_list_data_get(eina_list_last(lc->items));
+	     bi2 = eina_list_data_get(lc2->items);
 
-	     if (sd->horizontal)
-	       {
-		  bi2->gcc->config.pos = bi2->ask.pos = bi2->x = bi->x;
-		  bi2->gcc->config.size = bi2->w;
-		  bi->x = bi2->x + bi2->w;
-	       }
-	     else
-	       {
-		  bi2->gcc->config.pos = bi2->ask.pos = bi2->y = bi->y;
-		  bi2->gcc->config.size = bi2->h;
-		  bi->y = bi2->y + bi2->h;
-	       }
+	     bi2->gcc->config.pos = bi2->ask.pos = (bi2->x) = (bi->x);
+	     bi2->gcc->config.size = bi2->w;
+	     bi->x = bi2->x + bi2->w;
 
 	     t = bi->gcc->state_info.seq;
 	     bi->gcc->state_info.seq = bi2->gcc->state_info.seq;
@@ -4712,18 +4591,16 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 		  int move_lc1 = 1;
 		  int move_lc2 = 1;
 
-		  for (l = lc->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 {
 			    move_lc1 = 0;
 			    break;
 			 }
 		    }
-		  for (l = lc2->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc2->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 {
 			    move_lc2 = 0;
@@ -4747,18 +4624,16 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 		  int move_lc1 = 1;
 		  int move_lc2 = 1;
 
-		  for (l = lc->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 {
 			    move_lc1 = 0;
 			    break;
 			 }
 		    }
-		  for (l = lc2->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc2->items, l, bi)
 		    {
-		       bi = l->data;
 		       if (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE)
 			 {
 			    move_lc2 = 0;
@@ -4786,36 +4661,25 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 
 		  _e_gadcon_layout_smart_containers_merge(sd, lc, lc2);
 
-		  for (l = lc->items; l; l = l->next)
+		  EINA_LIST_FOREACH(lc->items, l, bi)
 		    {
-		       bi = l->data;
 		       if ((bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_POSITION) &&
 			   (bi->gcc->state_info.flags & E_GADCON_LAYOUT_ITEM_LOCK_ABSOLUTE))
 			 {
-			    if (sd->horizontal)
-			      shift = bi->ask.pos - bi->x;
-			    else
-			      shift = bi->ask.pos - bi->y;
+			    shift = bi->ask.pos - bi->x;
 			    break;
 			 }
 		    }
 
-		  for (l = lc->items; l && shift; l = l->next)
+		  if (shift)
 		    {
-		       bi = l->data;
-
-		       if (sd->horizontal)
-			 bi->x += shift;
-		       else
-			 bi->y += shift;
-
-		       if (l == lc->items)
-			 {
-			    if (sd->horizontal)
+		       EINA_LIST_FOREACH(lc->items, l, bi)
+     			 {
+			    bi->x += shift;
+			    
+     			    if (l == lc->items)
 			      lc->pos = bi->x;
-			    else
-			      lc->pos = bi->y;
-			 }
+     			 }
 		    }
 	       } 
 	     create_new = 1; 
@@ -4830,10 +4694,10 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 	if (lc->pos < lc2->pos)
 	  {
 	     lc3->pos = lc->pos;
-	     for (l = lc->items; l; l = l->next)
-	       lc3->items = eina_list_append(lc3->items, l->data);
-	     for (l = lc2->items; l; l = l->next)
-	       lc3->items = eina_list_append(lc3->items, l->data);
+	     EINA_LIST_FOREACH(lc->items, l, bi)
+		lc3->items = eina_list_append(lc3->items, bi);
+	     EINA_LIST_FOREACH(lc2->items, l, bi)
+		lc3->items = eina_list_append(lc3->items, bi);
 
 	     lc3->state_info.min_seq = lc->state_info.min_seq;
 	     if (lc2->items)
@@ -4844,10 +4708,10 @@ _e_gadcon_layout_smart_containers_position_adjust(E_Smart_Data *sd, E_Layout_Ite
 	else
 	  {
 	     lc3->pos = lc2->pos;
-	     for (l = lc2->items; l; l = l->next)
-	       lc3->items = eina_list_append(lc3->items, l->data);
-	     for (l = lc->items; l; l = l->next)
-	       lc3->items = eina_list_append(lc3->items, l->data);
+	     EINA_LIST_FOREACH(lc2->items, l, bi)
+	       lc3->items = eina_list_append(lc3->items, bi);
+	     EINA_LIST_FOREACH(lc->items, l, bi)
+	       lc3->items = eina_list_append(lc3->items, bi);
 
 	     lc3->state_info.min_seq = lc2->state_info.min_seq;
 	     if (lc->items)
@@ -4871,28 +4735,19 @@ _e_gadcon_layout_smart_position_items_inside_container(E_Smart_Data *sd, E_Layou
 
    if (!lc->items) return;
 
-   bi = lc->items->data;
-   if (sd->horizontal)
-     shift = lc->pos - bi->x;
-   else
-     shift = lc->pos - bi->y;
+   bi = eina_list_data_get(lc->items);
+   shift = lc->pos - bi->x;
+   
    if (!shift) return;
 
-   for (l = lc->items; l; l = l->next)
+   EINA_LIST_FOREACH(lc->items, l, bi)
      {
-	bi = l->data;
-	if (sd->horizontal)
-	  bi->x += shift;
-	else
-	  bi->y += shift;
-
+	bi->x += shift;
+	
 	if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) ||
 	    (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC))
 	  {
-	     if (sd->horizontal)
-	       bi->gcc->config.pos = bi->ask.pos = bi->x;
-	     else
-	       bi->gcc->config.pos = bi->ask.pos = bi->y;
+	     bi->gcc->config.pos = bi->ask.pos = bi->x;
 	  }
      }
 } 
@@ -4904,47 +4759,30 @@ _e_gadcon_layout_smart_containers_merge(E_Smart_Data *sd, E_Layout_Item_Containe
    Eina_List *l, *nl = NULL;
    E_Gadcon_Layout_Item *bi;
 
-   for (l = lc->items; l; l = l->next)
-     nl = eina_list_append(nl, l->data);
-   for (l = lc2->items; l; l = l->next)
-     nl = eina_list_append(nl, l->data);
+   EINA_LIST_FOREACH(lc->items, l, bi)
+     nl = eina_list_append(nl, bi);
+   EINA_LIST_FOREACH(lc2->items, l, bi)
+     nl = eina_list_append(nl, bi);
 
    nl = eina_list_sort(nl, eina_list_count(nl), _e_gadcon_layout_smart_seq_sort_cb);
 
-   for (l = nl; l; l = l->next)
+   EINA_LIST_FOREACH(nl, l, bi)
      {
-	bi = l->data;
 	if (l == nl)
 	  {
 	     min_seq = max_seq = bi->gcc->state_info.seq;
-	     if (sd->horizontal)
-	       {
-		  start = bi->x;
-		  size = bi->w;
-		  next = bi->x + bi->w;
-	       }
-	     else
-	       {
-		  start = bi->y;
-		  size = bi->h;
-		  next = bi->y + bi->h;
-	       }
+	     start = bi->x;
+	     size = bi->w;
+	     next = bi->x + bi->w;
+
 	     continue;
 	  }
 
 	max_seq = bi->gcc->state_info.seq;
-	if (sd->horizontal)
-	  {
-	     bi->x = next;
-	     size += bi->w;
-	     next = bi->x + bi->w;
-	  }
-	else
-	  {
-	     bi->y = next;
-	     size += bi->h;
-	     next = bi->y + bi->h;
-	  }
+
+	bi->x = next;
+	size += bi->w;
+	next = bi->x + bi->w;
      }
 
    lc->items = eina_list_free(lc->items);
@@ -4973,11 +4811,9 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
        ((*lc_moving)->state == E_LAYOUT_ITEM_CONTAINER_STATE_SIZE_MAX_END_DEC))
      {
 	(*lc_moving)->size = (*lc_moving)->prev_size;
-	bi = (*lc_moving)->items->data;
-	if (sd->horizontal)
-	  bi->w = (*lc_moving)->prev_size;
-	else
-	  bi->h = (*lc_moving)->prev_size;
+	bi = eina_list_data_get((*lc_moving)->items);
+
+	bi->w = (*lc_moving)->prev_size;
      }
    _e_gadcon_layout_smart_position_items_inside_container(sd, (*lc_moving));
    (*lc_moving)->state = E_LAYOUT_ITEM_CONTAINER_STATE_POS_LOCKED;
@@ -4986,20 +4822,14 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
    lc2 = NULL;
    lc3 = NULL;
    ok = 0;
-   for (l = *con_list; l; l = l->next)
+   EINA_LIST_FOREACH(*con_list, l, lc)
      {
-	lc = l->data;
 	if (lc->state == E_LAYOUT_ITEM_CONTAINER_STATE_NONE) continue;
 
 	if (eina_list_count(lc->items) == 1)
 	  {
-	     bi = lc->items->data;
-	     if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC) || 
-		 (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC))
+	     bi = eina_list_data_get(lc->items);
+	     if (bi->gcc->state_info.state != E_LAYOUT_ITEM_STATE_NONE)
 	       {
 		  LC_FREE(lc);
 		  l->data = *lc_moving = lc_back;
@@ -5008,25 +4838,16 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
 		  if (((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC) &&
 		      ((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC))
 		    {
-		       bi = (*lc_moving)->items->data;
-		       if (sd->horizontal)
-			 bi->w = (*lc_moving)->size;
-		       else
-			 bi->h = (*lc_moving)->size;
+		       bi = eina_list_data_get((*lc_moving)->items);
+		       bi->w = (*lc_moving)->size;
 		    }
 	       }
 	  }
 	else
 	  {
-	     for (l2 = lc->items; l2; l2 = l2->next)
+	     EINA_LIST_FOREACH(lc->items, l2, bi)
 	       {
-		  bi = l2->data; 
-		  if ((bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_POS_DEC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MIN_END_DEC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_INC) || 
-		      (bi->gcc->state_info.state == E_LAYOUT_ITEM_STATE_SIZE_MAX_END_DEC))
+		  if (bi->gcc->state_info.state != E_LAYOUT_ITEM_STATE_NONE)
 		    {
 		       ok = 1;
 		       if (l2 != lc->items)
@@ -5034,39 +4855,32 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
 			    lc2 = E_NEW(E_Layout_Item_Container, 1);
 			    lc2->sd = sd;
 			    lc2->state = E_LAYOUT_ITEM_CONTAINER_STATE_NONE;
-			    for (l3 = lc->items; l3 != l2; l3 = l3->next)
+			    EINA_LIST_FOREACH(lc->items, l3, bi2)
 			      {
-				 bi2 = l3->data;
+				 if(l2 == l3) break;
 				 lc2->items = eina_list_append(lc2->items, bi2);
 				 if (l3 == lc->items)
 				   {
 				      lc2->state_info.min_seq = bi2->gcc->state_info.seq;
-				      if (sd->horizontal)
-					lc2->pos = lc2->prev_pos = bi2->x;
-				      else
-					lc2->pos = lc2->prev_pos = bi2->y;
+				      lc2->pos = lc2->prev_pos = bi2->x;
 				   }
 				 lc2->state_info.max_seq = bi2->gcc->state_info.seq;
 				 E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(lc2, bi2, 1);
 			      }
 			 }
 
-		       if (l2->next)
+		       if (eina_list_next(l2))
 			 {
 			    lc3 = E_NEW(E_Layout_Item_Container, 1);
 			    lc3->sd = sd;
 			    lc3->state = E_LAYOUT_ITEM_CONTAINER_STATE_NONE;
-			    for (l3 = l2->next; l3; l3 = l3->next)
+			    EINA_LIST_FOREACH(eina_list_next(l2), l3, bi2)
 			      {
-				 bi2 = l3->data;
 				 lc3->items = eina_list_append(lc3->items, bi2);
-				 if (l3 == l2->next)
+				 if (l3 == eina_list_next(l2))
 				   {
 				      lc3->state_info.min_seq = bi2->gcc->state_info.seq;
-				      if (sd->horizontal)
-					lc3->pos = lc3->prev_pos = bi2->x;
-				      else
-					lc3->pos = lc3->prev_pos = bi2->y;
+				      lc3->pos = lc3->prev_pos = bi2->x;
 				   }
 				 lc3->state_info.max_seq = bi2->gcc->state_info.seq;
 				 E_LAYOUT_ITEM_CONTAINER_SIZE_CHANGE_BY(lc3, bi2, 1);
@@ -5078,11 +4892,8 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
 		       if (((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_INC) && 
 			   ((*lc_moving)->state != E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC)) 
 			 { 
-			    bi = (*lc_moving)->items->data; 
-			    if (sd->horizontal) 
-			      bi->w = (*lc_moving)->size; 
-			    else 
-			      bi->h = (*lc_moving)->size; 
+			    bi = eina_list_data_get((*lc_moving)->items); 
+			    bi->w = (*lc_moving)->size; 
 			 }
 		       break;
 		    }
@@ -5114,15 +4925,38 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
 	  }
      }
 
-   for (l = *con_list; l; l = l->next)
+   EINA_LIST_FOREACH(*con_list, l, lc)
      {
-	lc = l->data;
 	if (lc == *lc_moving) continue;
 	lc->state = E_LAYOUT_ITEM_CONTAINER_STATE_NONE;
      }
 }
 
 static int
+_e_gadcon_custom_populate_idler(void *data)
+{
+   const E_Gadcon_Client_Class *cc;
+   const Eina_List *l;
+   E_Gadcon *gc;
+
+   EINA_LIST_FREE(custom_populate_requests, gc)
+     {
+	e_gadcon_layout_freeze(gc->o_container);
+	EINA_LIST_FOREACH(providers_list, l, cc)
+	  {
+	     if (gc->populate_class.func)
+	       gc->populate_class.func(gc->populate_class.data, gc, cc);
+	     else
+	       e_gadcon_populate_class(gc, cc);
+	  }
+	e_gadcon_layout_thaw(gc->o_container);
+     }
+
+   custom_populate_idler = NULL;
+   return 0;
+}
+
+static int
 _e_gadcon_provider_populate_idler(void *data __UNUSED__)
 {
    const E_Gadcon_Client_Class *cc;
@@ -5169,3 +5003,69 @@ _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc)
 	populate_idler = NULL;
      }
 }
+
+/* gadgets movement between different gadcons */
+
+EAPI E_Gadcon_Location *
+e_gadcon_location_new(const char * name, 
+		      E_Gadcon_Site site,
+		      int (*add_func) (void *data, const E_Gadcon_Client_Class *cc),
+		      void * add_data,
+		      void (*remove_func) (void *data, E_Gadcon_Client *cc),
+		      void * remove_data)
+{
+   E_Gadcon_Location *loc;
+
+   loc  = E_NEW(E_Gadcon_Location, 1);
+   loc->name = eina_stringshare_add(name);
+   loc->site = site;
+   loc->gadget_add.func = add_func; 
+   loc->gadget_add.data = add_data; 
+   loc->gadget_remove.func = remove_func; 
+   loc->gadget_remove.data = remove_data; 
+   loc->icon_name = NULL;
+   return loc;
+}
+
+EAPI void
+e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name)
+{
+   if (loc->icon_name) eina_stringshare_del(loc->icon_name);
+   if (name)
+     loc->icon_name = eina_stringshare_add(name);
+   else
+     loc->icon_name = NULL;
+}
+
+EAPI void
+e_gadcon_location_free(E_Gadcon_Location *loc)
+{
+   eina_stringshare_del(loc->name);
+   if (loc->icon_name) eina_stringshare_del(loc->icon_name);
+   free(loc);
+}
+
+EAPI void
+e_gadcon_location_register (E_Gadcon_Location * loc)
+{
+   gadcon_locations = eina_list_append(gadcon_locations, loc);
+}
+
+EAPI void
+e_gadcon_location_unregister (E_Gadcon_Location * loc)
+{
+   gadcon_locations = eina_list_remove(gadcon_locations, loc);
+}
+
+static int
+_e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst)
+{
+   E_Gadcon_Client_Class *cc;
+
+   cc = eina_hash_find(providers, gcc->cf->name);
+   if (!cc) return 0;
+   if (!dst->gadget_add.func(dst->gadget_add.data, cc)) return 0;
+   src->gadget_remove.func(src->gadget_remove.data, gcc);
+   return 1;
+}
+
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index 0b97b3b..570e724 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -44,9 +44,10 @@ typedef enum _E_Gadcon_Site
 #define E_GADCON_CLIENT_STYLE_PLAIN "plain"
 #define E_GADCON_CLIENT_STYLE_INSET "inset"
 
-typedef struct _E_Gadcon              E_Gadcon;
-typedef struct _E_Gadcon_Client       E_Gadcon_Client;
+typedef struct _E_Gadcon E_Gadcon;
+typedef struct _E_Gadcon_Client E_Gadcon_Client;
 typedef struct _E_Gadcon_Client_Class E_Gadcon_Client_Class;
+typedef struct _E_Gadcon_Location E_Gadcon_Location;
 
 #else
 #ifndef E_GADCON_H
@@ -57,27 +58,27 @@ typedef struct _E_Gadcon_Client_Class E_Gadcon_Client_Class;
 
 struct _E_Gadcon
 {
-   E_Object             e_obj_inherit;
+   E_Object e_obj_inherit;
+
+   const char *name;
+   int id;
 
-   const char          *name;
-   int                  id;
-   
    E_Gadcon_Layout_Policy layout_policy;
-   
+
    struct 
      {
-	Evas_Object    *o_parent;
-	const char     *swallow_name;
+	Evas_Object *o_parent;
+	const char *swallow_name;
      } edje;
-   Ecore_Evas          *ecore_evas;
-   E_Zone              *zone;
-   
-   E_Gadcon_Orient      orient;
-   
-   Evas                *evas;
-   Evas_Object         *o_container;
-   Eina_List           *clients;
-   
+   Ecore_Evas *ecore_evas;
+   E_Zone *zone;
+
+   E_Gadcon_Orient orient;
+
+   Evas *evas;
+   Evas_Object *o_container;
+   Eina_List *clients;
+
    struct 
      {
 	void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
@@ -109,18 +110,18 @@ struct _E_Gadcon
 	void *data;
      } urgent_show;
    
-   E_Config_Dialog    *config_dialog;
-   unsigned char       editing : 1;
-   Ecore_X_Window      dnd_win;
-   Ecore_X_Window      xdnd_win;
-   E_Shelf            *shelf;
-   E_Toolbar          *toolbar;
+   E_Config_Dialog *config_dialog;
+   unsigned char editing : 1;
+   Ecore_X_Window dnd_win, xdnd_win;
+   E_Shelf *shelf;
+   E_Toolbar *toolbar;
+   E_Gadcon_Location *location;
 
    E_Drop_Handler *drop_handler;
 
    E_Config_Gadcon *cf;
 
-   unsigned char          instant_edit : 1;
+   unsigned char instant_edit : 1;
 };
 
 #define GADCON_CLIENT_CLASS_VERSION 3
@@ -151,21 +152,22 @@ struct _E_Gadcon_Client_Class
 
 struct _E_Gadcon_Client
 {
-   E_Object               e_obj_inherit;
-   E_Gadcon              *gadcon;
-   const char            *name;
-   int                    id;
-   Evas_Object           *o_base;
-   Evas_Object           *o_box;
-   Evas_Object           *o_frame;
-   Evas_Object           *o_control;
-   Evas_Object           *o_event;
+   E_Object e_obj_inherit;
+   E_Gadcon *gadcon;
+   const char *name;
+   int id;
+   Evas_Object *o_base;
+   Evas_Object *o_box;
+   Evas_Object *o_frame;
+   Evas_Object *o_control;
+   Evas_Object *o_event;
    const E_Gadcon_Client_Class *client_class;
-   void                  *data;
+   void *data;
+
    struct 
      {
-	int               pos, size, res;                 //gadcon
-	double            pos_x, pos_y, size_w, size_h;   //gadman
+	int pos, size, res;                 //gadcon
+	double pos_x, pos_y, size_w, size_h;   //gadman
      } config; 
 
    struct 
@@ -178,38 +180,62 @@ struct _E_Gadcon_Client
 
    struct 
      {
-	Evas_Coord        w, h;
+	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;
+
+   Ecore_Timer *scroll_timer;
+   Ecore_Timer *instant_edit_timer;
+   Ecore_Animator *scroll_animator;
+   double scroll_pos, scroll_wanted;
+
    struct 
      {
 	void *data;
 	void (*func) (void *data);
      } scroll_cb;
 
-   E_Menu                *menu;
-   const char            *style;
-   unsigned char          autoscroll : 1;
-   unsigned char          resizable : 1;
+   E_Menu *menu;
+   const char *style;
+   unsigned char autoscroll : 1;
+   unsigned char resizable : 1;
    
-   unsigned char          moving : 1;
-   unsigned char          resizing : 1;
-   Evas_Coord             dx, dy;
+   unsigned char moving : 1;
+   unsigned char resizing : 1;
+   Evas_Coord dx, dy;
 
    struct 
      {
 	int x, y;
      } drag;
 
-   unsigned char       hidden : 1;
+   unsigned char hidden : 1;
 
    E_Config_Gadcon_Client *cf;
 };
 
+/* defines usable gadget placements such as Desktop, Shelf #, etc */
+/* next fields are mandatory (not NULL): name, add_gadget.func, remove_gadget.func */
+struct _E_Gadcon_Location
+{
+   /* location name */
+   const char * name;
+   /* icon related to location, such as "preferences-desktop-shelf" for shelves, "preferences-desktop" for menus */
+   const char * icon_name;
+   E_Gadcon_Site site;
+   /* adds gadcon client to location. Returns nonzero on success */
+   struct 
+     {
+	int (*func) (void *data, const E_Gadcon_Client_Class *cc);
+	void *data;
+     } gadget_add;
+   /* removes existing gadcon client from location */
+   struct 
+     {
+	void (*func) (void *data, E_Gadcon_Client *gcc);
+	void *data;
+     } gadget_remove;
+};
+
 EAPI int              e_gadcon_init(void);
 EAPI int              e_gadcon_shutdown(void);
 EAPI void             e_gadcon_provider_register(const E_Gadcon_Client_Class *cc);
@@ -270,12 +296,26 @@ EAPI void             e_gadcon_urgent_show(E_Gadcon *gc);
 
 /* site helpers */
 
-EAPI Eina_Bool        e_gadcon_site_is_shelf      (E_Gadcon_Site site);
-EAPI Eina_Bool        e_gadcon_site_is_desktop    (E_Gadcon_Site site);
+EAPI Eina_Bool        e_gadcon_site_is_shelf(E_Gadcon_Site site);
+EAPI Eina_Bool        e_gadcon_site_is_desktop(E_Gadcon_Site site);
 EAPI Eina_Bool        e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site);
 
 EAPI Eina_Bool        e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities
 EAPI Eina_Bool        e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all non-toolbar sities
 
+/* location helpers */
+
+EAPI E_Gadcon_Location *
+e_gadcon_location_new(const char * name, E_Gadcon_Site site,
+		       int (*add_func) (void *data, const E_Gadcon_Client_Class *cc),
+		       void *add_data,
+		       void (*remove_func) (void *data, E_Gadcon_Client *cc),
+		       void *remove_data);
+EAPI void e_gadcon_location_free(E_Gadcon_Location *loc);
+EAPI void e_gadcon_location_register (E_Gadcon_Location *loc);
+EAPI void e_gadcon_location_unregister (E_Gadcon_Location *loc);
+EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name);
+EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu);
+
 #endif
 #endif
diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index eb50eeb..bfeaa21 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -148,7 +148,7 @@ _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj)
 {
    Evas_Coord w = 0, h = 0;
 
-   e_widget_min_size_get(obj, &w, &h);
+   e_widget_size_min_get(obj, &w, &h);
    if ((!w) || (!h)) evas_object_size_hint_min_get(obj, &w, &h);
    if ((!w) || (!h))
      {
diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index 09083d4..0a4f0d4 100644
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -123,12 +123,15 @@ _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
 	ecore_x_window_focus(win);
         ecore_x_sync(); // let x actually get the x focus request
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
+        ecore_x_sync(); // let x actually get the x focus request
 	break;
       case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
 	ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
+        ecore_x_sync(); // let x actually get the x focus request
 	break;
       case E_FOCUS_METHOD_PASSIVE:
 	ecore_x_window_focus(win);
+        ecore_x_sync(); // let x actually get the x focus request
 	break;
       default:
 	break;
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 825d691..087a868 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -180,6 +180,10 @@ e_hints_init(void)
 
 	     ecore_x_netwm_supported_set(roots[i], supported, supported_num);
 
+	     /* fake mwm, this might crash some ol' motif apps, if
+		they still exist, but at least it makes borderless
+		feature of Eterm and urxvt work... */
+	     ecore_x_atom_get("_MOTIF_WM_INFO");
 	  }
         free(roots);
      }
@@ -216,6 +220,7 @@ e_hints_manager_init(E_Manager *man)
    int			i = 0, num = 0;
    unsigned int		*areas = NULL;
    Eina_List		*cl;
+   E_Container		*c;
    Ecore_X_Window	*vroots = NULL;
    /* FIXME: Desktop names not yet implemented */
 /*   char			**names; */
@@ -236,11 +241,8 @@ e_hints_manager_init(E_Manager *man)
 	return;
      }
    
-   for (cl = man->containers; cl; cl = cl->next)
+   EINA_LIST_FOREACH(man->containers, cl, c)
      {
-	E_Container *c;
-
-	c = cl->data;
 	areas[4 * i] = c->x;
 	areas[4 * i + 1] = c->y;
 	areas[4 * i + 2] = c->w;
@@ -277,12 +279,10 @@ e_hints_client_list_set(void)
    Ecore_X_Window *clients = NULL;
 
    /* Get client count by adding client lists on all containers */
-   for (ml = e_manager_list(); ml; ml = ml->next)
+   EINA_LIST_FOREACH(e_manager_list(), ml, m)
      {
-	m = ml->data;
-	for (cl = m->containers; cl; cl = cl->next)
+	EINA_LIST_FOREACH(m->containers, cl, c)
 	  {
-	     c = cl->data;
 	     num += e_container_borders_count(c);
 	  }
      }
@@ -294,13 +294,11 @@ e_hints_client_list_set(void)
    /* Fetch window IDs and add to array */
    if (num > 0)
      {
-	for (ml = e_manager_list(); ml; ml = ml->next)
+     	EINA_LIST_FOREACH(e_manager_list(), ml, m)
 	  {
-	     m = ml->data;
 	     i = 0;
-	     for (cl = m->containers; cl; cl = cl->next)
+     	     EINA_LIST_FOREACH(m->containers, cl, c)
 	       {
-		  c = cl->data;
 		  bl = e_container_border_list_first(c);
 		  while ((b = e_container_border_list_next(bl)))
 		    clients[i++] = b->client.win;
@@ -320,9 +318,8 @@ e_hints_client_list_set(void)
      }
    else
      {
-	for (ml = e_manager_list(); ml; ml = ml->next)
+     	EINA_LIST_FOREACH(e_manager_list(), ml, m)
 	  {
-	     m = ml->data;
 	     ecore_x_netwm_client_list_set(m->root, NULL, 0);
 	     ecore_x_netwm_client_list_stacking_set(m->root, NULL, 0);
 	  }
@@ -344,12 +341,10 @@ e_hints_client_stacking_set(void)
    Ecore_X_Window *clients = NULL;
 
    /* Get client count */
-   for (ml = e_manager_list(); ml; ml = ml->next)
+   EINA_LIST_FOREACH(e_manager_list(), ml, m)
      {
-	m = ml->data;
-	for (cl = m->containers; cl; cl = cl->next)
+	EINA_LIST_FOREACH(m->containers, cl, c)
 	  {
-	     c = cl->data;
 	     num += e_container_borders_count(c);
 	  }
      }
@@ -359,12 +354,10 @@ e_hints_client_stacking_set(void)
 	clients = calloc(num, sizeof(Ecore_X_Window));
 	if (!clients) return;
 	
-	for (ml = e_manager_list(); ml; ml = ml->next)
+     	EINA_LIST_FOREACH(e_manager_list(), ml, m)
 	  {
-	     m = ml->data;
-	     for (cl = m->containers; cl; cl = cl->next)
+     	     EINA_LIST_FOREACH(m->containers, cl, c)
 	       {
-		  c = cl->data;
 		  bl = e_container_border_list_first(c);
 		  while ((b = e_container_border_list_next(bl)))
 		    {
@@ -390,18 +383,16 @@ e_hints_client_stacking_set(void)
 				  "This is strange, but not harmful.\n"
 				  "Please report this.\n");
 	  }
-	for (ml = e_manager_list(); ml; ml = ml->next)
+     	EINA_LIST_FOREACH(e_manager_list(), ml, m)
 	  {
-	     m = ml->data;
 	     ecore_x_netwm_client_list_stacking_set(m->root, clients, num);
 	  }
 	E_FREE(clients);
      }
    else
      {
-	for (ml = e_manager_list(); ml; ml = ml->next)
+     	EINA_LIST_FOREACH(e_manager_list(), ml, m)
 	  {
-	     m = ml->data;
 	     ecore_x_netwm_client_list_stacking_set(m->root, NULL, 0);
 	  }
      }
@@ -1050,6 +1041,10 @@ e_hints_allowed_action_update(E_Border *bd, Ecore_X_Action action)
 	 break;
       case ECORE_X_ACTION_CLOSE:
 	 break;
+      case ECORE_X_ACTION_ABOVE:
+	 break;
+      case ECORE_X_ACTION_BELOW:
+	 break;
      }
 }
 
@@ -1108,6 +1103,10 @@ e_hints_allowed_action_get(E_Border *bd)
 		case ECORE_X_ACTION_CLOSE:
 		  bd->client.netwm.action.close = 1;
 		  break;
+		case ECORE_X_ACTION_ABOVE:
+		   break;
+		case ECORE_X_ACTION_BELOW:
+		   break;
 	       }
 	  }
 	free(action);
diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c
index f6daf44..e1ec5ec 100644
--- a/src/bin/e_icon.c
+++ b/src/bin/e_icon.c
@@ -13,6 +13,7 @@ struct _E_Smart_Data
    unsigned char fill_inside : 1;
    unsigned char scale_up : 1;
    unsigned char preload : 1;
+   unsigned char loading : 1;
 }; 
 
 /* local subsystem functions */
@@ -66,10 +67,19 @@ e_icon_file_set(Evas_Object *obj, const char *file)
    /* smart code here */
    _e_icon_obj_prepare(obj, sd);
    /* FIXME: 64x64 - unhappy about this. use icon size */
+   sd->loading = 0;
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+   if (sd->preload)
+     evas_object_hide(sd->obj);
    evas_object_image_file_set(sd->obj, file, NULL);
-   if (sd->preload) evas_object_image_preload(sd->obj, 0);
+   if (sd->preload)
+     {
+        sd->loading = 1;
+        evas_object_image_preload(sd->obj, 0);
+     }
+   else if (evas_object_visible_get(obj))
+     evas_object_show(sd->obj);
    _e_icon_smart_reconfigure(sd);
 }
 
@@ -81,11 +91,20 @@ 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 */
+   sd->loading = 0;
    _e_icon_obj_prepare(obj, sd);
    if (sd->size != 0)
      evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+   if (sd->preload)
+     evas_object_hide(sd->obj);
    evas_object_image_file_set(sd->obj, file, key);
-   if (sd->preload) evas_object_image_preload(sd->obj, 0);
+   if (sd->preload)
+     {
+        sd->loading = 1;
+        evas_object_image_preload(sd->obj, 0);
+     }
+   else if (evas_object_visible_get(obj))
+     evas_object_show(sd->obj);
    _e_icon_smart_reconfigure(sd);
 }
 
@@ -98,8 +117,11 @@ e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
    if (!sd) return;
    /* smart code here */
    if (sd->obj) evas_object_del(sd->obj);
+   sd->loading = 0;
    sd->obj = edje_object_add(evas_object_evas_get(obj));
    edje_object_file_set(sd->obj, file, part);
+   if (evas_object_visible_get(obj))
+     evas_object_show(sd->obj);
    evas_object_smart_member_add(sd->obj, obj);
    _e_icon_smart_reconfigure(sd);
 }
@@ -113,8 +135,11 @@ e_icon_object_set(Evas_Object *obj, Evas_Object *o)
    if (!sd) return;
    /* smart code here */
    if (sd->obj) evas_object_del(sd->obj);
+   sd->loading = 0;
    sd->obj = o;
    evas_object_smart_member_add(sd->obj, obj);
+   if (evas_object_visible_get(obj))
+     evas_object_show(sd->obj);
    _e_icon_smart_reconfigure(sd);   
 }
 
@@ -210,7 +235,7 @@ e_icon_size_get(Evas_Object *obj, int *w, int *h)
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   return evas_object_image_size_get(sd->obj, w, h);
+   evas_object_image_size_get(sd->obj, w, h);
 }
 
 EAPI int
@@ -399,7 +424,12 @@ _e_icon_smart_init(void)
 static void
 _e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
+   E_Smart_Data *sd;
+   
+   sd = evas_object_smart_data_get(data);
    evas_object_smart_callback_call(data, "preloaded", NULL);
+   evas_object_show(sd->obj);
+   sd->loading = 0;
 }
 
 static void
@@ -467,7 +497,8 @@ _e_icon_smart_show(Evas_Object *obj)
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
-   evas_object_show(sd->obj);
+   if (!((sd->preload) && (sd->loading)))
+     evas_object_show(sd->obj);
 }
 
 static void
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index f4345c9..5a23152 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -325,15 +325,14 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label,
 EAPI void 
 e_ilist_clear(Evas_Object *obj) 
 {
+   E_Ilist_Item *si = NULL;
+
    API_ENTRY return;
 
    e_ilist_freeze(obj);
-   while (sd->items) 
+   EINA_LIST_FREE(sd->items, si)
      {
-	E_Ilist_Item *si = NULL;
-
-	if (!(si = sd->items->data)) continue;
-	sd->items = eina_list_remove_list(sd->items, sd->items);
+	if (!si) continue;
 	if (si->o_icon) evas_object_del(si->o_icon);
 	evas_object_del(si->o_base);
 	E_FREE(si);
@@ -392,27 +391,26 @@ e_ilist_multi_select_set(Evas_Object *obj, int multi)
 }
 
 EAPI void 
-e_ilist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 
+e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 
 {
    API_ENTRY return;
-   e_box_min_size_get(sd->o_box, w, h);
+   e_box_size_min_get(sd->o_box, w, h);
 }
 
 EAPI void 
 e_ilist_unselect(Evas_Object *obj) 
 {
    Eina_List *l = NULL;
+   E_Ilist_Item *si = NULL;
    const char *stacking, *selectraise;
 
    API_ENTRY return;
 
    if (!sd->items) return;
    if (sd->selected < 0) return;
-   for (l = sd->items; l; l = l->next) 
+   EINA_LIST_FOREACH(sd->items, l, si)
      {
-	E_Ilist_Item *si = NULL;
-
-	if (!(si = l->data)) continue;
+	if (!si) continue;
 	if (!si->selected) continue;
 	edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
 	si->selected = 0;
@@ -442,9 +440,9 @@ e_ilist_selected_set(Evas_Object *obj, int n)
    if (n >= i) n = i - 1;
    else if (n < 0) n = 0;
 
-   for (l = sd->items; l; l = l->next) 
+   EINA_LIST_FOREACH(sd->items, l, si)
      {
-	if (!(si = l->data)) continue;
+	if (!si) continue;
 	if ((!si->selected) || (si->header)) continue;
 	edje_object_signal_emit(si->o_base, "e,state,unselected", "e");
 	si->selected = 0;
@@ -484,6 +482,7 @@ EAPI int
 e_ilist_selected_get(Evas_Object *obj) 
 {
    Eina_List *l = NULL;
+   E_Ilist_Item *li = NULL;
    int i, j;
 
    API_ENTRY return -1;
@@ -493,12 +492,11 @@ e_ilist_selected_get(Evas_Object *obj)
    else
      {
 	j = -1;
-	for (i = 0, l = sd->items; l; l = l->next, i++) 
+	i = 0;
+	EINA_LIST_FOREACH(sd->items, l, li)
 	  {
-	     E_Ilist_Item *li = NULL;
-
-	     if (!(li = l->data)) continue;
-	     if (li->selected) j = i;
+	     if (li && li->selected) j = i;
+	     i++;
 	  }
 	return j;
      }
@@ -578,15 +576,14 @@ EAPI int
 e_ilist_selected_count_get(Evas_Object *obj) 
 {
    Eina_List *l = NULL;
+   E_Ilist_Item *si = NULL;
    int count = 0;
 
    API_ENTRY return 0;
    if (!sd->items) return 0;
-   for (l = sd->items; l; l = l->next) 
+   EINA_LIST_FOREACH(sd->items, l, si)
      {
-	E_Ilist_Item *si = NULL;
-
-	if (!(si = l->data)) continue;
+	if (!si) continue;
 	if (si->selected) count++;
      }
    return count;
@@ -701,17 +698,17 @@ EAPI void
 e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 
 {
    Eina_List *l = NULL;
+   E_Ilist_Item *si = 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) 
+   EINA_LIST_FOREACH(sd->items, l, si)
      {
-	E_Ilist_Item *si = NULL;
 	Evas_Coord mw = 0, mh = 0;
 
-	if (!(si = l->data)) continue;
+	if (!si) 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);
@@ -960,7 +957,7 @@ _e_smart_event_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_in
 {
    E_Smart_Data *sd;
    Evas_Event_Mouse_Up *ev;
-   E_Ilist_Item *si;
+   E_Ilist_Item *si, *item;
    Eina_List *l = NULL;
    int i;
 
@@ -982,9 +979,10 @@ _e_smart_event_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_in
 
    if (!sd->items) return;
 
-   for (i = 0, l = sd->items; l; l = l->next, i++) 
+   i = 0;
+   EINA_LIST_FOREACH(sd->items, l, item)
      {
-	if (l->data == si) 
+	if (item == si) 
 	  {
 	     if (!sd->multi_select)
 	       e_ilist_selected_set(sd->o_smart, i);
@@ -999,6 +997,7 @@ _e_smart_event_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_in
 	       }
 	     break;
 	  }
+	i++;
      }
 
    if(!sd->selector) return;
@@ -1204,13 +1203,10 @@ _e_typebuf_match(Evas_Object *obj)
    strcat(match, sd->typebuf.buf);
    strcat(match, "*");
 
-   l = sd->items;
    n = 0;
-
-   while (l)
+   EINA_LIST_FOREACH(sd->items, l, si)
      {
 	const char *label = NULL;
-	si = l->data;
 	if (si) 
 	  {
 	     label = edje_object_part_text_get(si->o_base, "e.text.label");
@@ -1221,7 +1217,6 @@ _e_typebuf_match(Evas_Object *obj)
 		  break;
 	       }
 	  }
-	l = l->next;
 	n++;
      }
 
diff --git a/src/bin/e_ilist.h b/src/bin/e_ilist.h
index b9314cc..e0fb455 100644
--- a/src/bin/e_ilist.h
+++ b/src/bin/e_ilist.h
@@ -34,7 +34,7 @@ EAPI int          e_ilist_selector_get          (Evas_Object *obj);
 EAPI void         e_ilist_selector_set          (Evas_Object *obj, int selector);
 EAPI int          e_ilist_multi_select_get      (Evas_Object *obj);
 EAPI void         e_ilist_multi_select_set      (Evas_Object *obj, int multi);
-EAPI void         e_ilist_min_size_get          (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EAPI void         e_ilist_size_min_get          (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 EAPI void         e_ilist_unselect              (Evas_Object *obj);
 EAPI void         e_ilist_selected_set          (Evas_Object *obj, int n);
 EAPI int          e_ilist_selected_get          (Evas_Object *obj);
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index 1fc82ec..2ec81eb 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -3,6 +3,10 @@
  */
 #include "e.h"
 
+/* local function prototypes */
+static int _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+
+/* local variables */
 static const char *title = NULL;
 static const char *version = NULL;
 static Ecore_Exe *init_exe = NULL;
@@ -12,27 +16,13 @@ static int done = 0;
 static int undone = 0;
 static Eina_List *stats = NULL;
 
-static int
-_e_init_cb_exe_event_del(void *data, int type, void *event)
-{
-   Ecore_Exe_Event_Del *ev;
-
-   ev = event;
-   if (ev->exe == init_exe)
-     {
-	/* init exited */
-//	ecore_exe_free(init_exe);
-	init_exe = NULL;
-     }
-   return 1;
-}
-
+/* public functions */
 EAPI int
 e_init_init(void)
 {
-   exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
-					      _e_init_cb_exe_event_del,
-					      NULL);
+   exe_del_handler = 
+     ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
+                             _e_init_cb_exe_event_del, NULL);
    client = NULL;
    done = 0;
    return 1;
@@ -77,12 +67,11 @@ e_init_show(void)
    if (version) ver = strdup(e_util_filename_escape(version));
    else ver = strdup("XvX");
 
-   snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
-	    e_prefix_lib_get(),
-	    theme,
+   snprintf(buf, sizeof(buf), 
+            "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'",
+	    e_prefix_lib_get(), theme,
 	    e_canvas_engine_decide(e_config->evas_engine_init),
-	    e_config->font_hinting,
-	    tit, ver);
+	    e_config->font_hinting, tit, ver);
    printf("RUN INIT: %s\n", buf);
    free(theme);
    free(tit);
@@ -145,7 +134,6 @@ e_init_undone(void)
    undone++;
 }
 
-
 EAPI void
 e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
 {
@@ -163,12 +151,10 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e)
 	     for (i = 0; i < num; i+= 2)
 	       {
 		  Eina_List *l;
+		  E_Manager *man;
 
-		  for (l = e_manager_list(); l; l = l->next)
+		  EINA_LIST_FOREACH(e_manager_list(), l, man)
 		    {
-		       E_Manager *man;
-
-		       man = l->data;
 		       if (man->root == initwins[i + 0])
 			 {
 			    man->initwin = initwins[i + 1];
@@ -203,14 +189,28 @@ e_init_client_del(Ecore_Ipc_Event_Client_Del *e)
    if (e->client == client)
      {
 	Eina_List *l;
+	E_Manager *man;
 
 	client = NULL;
-	for (l = e_manager_list(); l; l = l->next)
+	EINA_LIST_FOREACH(e_manager_list(), l, man)
 	  {
-	     E_Manager *man;
-
-	     man = l->data;
 	     man->initwin = 0;
 	  }
      }
 }
+
+/* local functions */
+static int
+_e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Del *ev;
+
+   ev = event;
+   if (ev->exe == init_exe)
+     {
+	/* init exited */
+//	ecore_exe_free(init_exe);
+	init_exe = NULL;
+     }
+   return 1;
+}
diff --git a/src/bin/e_init_main.c b/src/bin/e_init_main.c
index a7fe4cf..0395159 100644
--- a/src/bin/e_init_main.c
+++ b/src/bin/e_init_main.c
@@ -276,11 +276,9 @@ e_init_init(void)
    screens = (Eina_List *)e_xinerama_screens_get();
    if (screens)
      {
-	for (l = screens; l; l = l->next)
+	E_Screen *scr;
+	EINA_LIST_FOREACH(screens, l, scr)
 	  {
-	     E_Screen *scr;
-	     
-	     scr = l->data;
 	     o = edje_object_add(_e_init_evas);
 	     if (l == screens)
 	       {
@@ -485,7 +483,7 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
    evas_image_cache_set(e, 4096 * 1024);
    evas_font_cache_set(e, 512 * 1024);
    
-   EINA_LIST_FOREACH(fpath, l, path) evas_font_path_append(e, l->data);
+   EINA_LIST_FOREACH(fpath, l, path) evas_font_path_append(e, path);
    
    if (font_hinting == 0)
      {
diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c
index 59bb7e0..e5a20b0 100644
--- a/src/bin/e_int_border_locks.c
+++ b/src/bin/e_int_border_locks.c
@@ -192,8 +192,8 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	if (cfdata->border->remember)
 	  {
 	     cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS;
-             cfdata->border->remember->match = e_remember_default_match(cfdata->border);
-	     e_remember_update(cfdata->border->remember, cfdata->border);
+             e_remember_default_match_set(cfdata->border->remember, cfdata->border);
+	     e_remember_update(cfdata->border);
 	  }
      }
    else
@@ -252,8 +252,8 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	if (cfdata->border->remember)
 	  {
 	     cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS;
-             cfdata->border->remember->match = e_remember_default_match(cfdata->border);
-	     e_remember_update(cfdata->border->remember, cfdata->border);
+             e_remember_default_match_set(cfdata->border->remember, cfdata->border);
+	     e_remember_update(cfdata->border);
 	  }
      }
    else
diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index 6dcc41f..66d50bb 100644
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -143,7 +143,10 @@ e_int_border_menu_create(E_Border *bd)
 	  (bd->client.icccm.min_h == bd->client.icccm.max_h)) ||
 	 (bd->lock_user_maximize)))
      {
-	if ((!bd->lock_user_maximize) && (!bd->shaded) && (!bd->fullscreen))
+	if ((!bd->lock_user_maximize) && (!bd->shaded) && (!bd->fullscreen) && 
+            ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+             (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+            )
 	  {
 	     separator = 0;
 	     mi = e_menu_item_new(m);
@@ -158,7 +161,10 @@ e_int_border_menu_create(E_Border *bd)
 
    if (!bd->internal)
      {
-	if ((!bd->lock_user_iconify) && (!bd->fullscreen))
+	if ((!bd->lock_user_iconify) && (!bd->fullscreen) && 
+            ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+             (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+            )
 	  {
 	     separator = 0;
 	     mi = e_menu_item_new(m);
@@ -672,7 +678,7 @@ _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi)
    else
      bd->user_skip_winlist = 0;
    bd->changed = 1;
-   if (bd->remember) e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 static void
@@ -687,7 +693,7 @@ _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi)
    else
      bd->client.netwm.state.skip_pager = 0;
    bd->changed = 1;
-   if (bd->remember) e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 static void
@@ -702,7 +708,7 @@ _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi)
    else
      bd->client.netwm.state.skip_taskbar = 0;
    bd->changed = 1;
-   if (bd->remember) e_remember_update(bd->remember, bd);
+   e_remember_update(bd);
 }
 
 static void 
@@ -1032,7 +1038,10 @@ _e_border_menu_cb_state_pre(void *data, E_Menu *m, E_Menu_Item *mi)
 				  "e/widgets/border/default/stick");
      }
 
-   if ((!bd->lock_user_fullscreen) && (!bd->shaded))
+   if ((!bd->lock_user_fullscreen) && (!bd->shaded) && 
+       ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) ||
+        (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))
+       )
      {
 	submi = e_menu_item_new(subm);
 	e_menu_item_label_set(submi, _("Fullscreen"));
diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c
index b097a0b..7465d83 100644
--- a/src/bin/e_int_border_prop.c
+++ b/src/bin/e_int_border_prop.c
@@ -373,7 +373,7 @@ _bd_go(void *data, void *data2)
    
    e_widget_list_object_append(c, ob, 0, 0, 1.0);
    
-   e_widget_min_size_get(c, &w, &h);
+   e_widget_size_min_get(c, &w, &h);
    e_dialog_content_set(dia, c, w, h);
    e_dialog_show(dia);
 }
@@ -387,8 +387,8 @@ _bd_go(void *data, void *data2)
       ob = e_widget_entry_add(evas, &(cfdata->val), NULL, NULL, NULL); \
       if (!cfdata->val) e_widget_disabled_set(ob, 1); \
       e_widget_entry_readonly_set(ob, 1); \
-      e_widget_min_size_get(ob, &mw, &mh); \
-      e_widget_min_size_set(ob, 160, mh); \
+      e_widget_size_min_get(ob, &mw, &mh); \
+      e_widget_size_min_set(ob, 160, mh); \
       e_widget_frametable_object_append(of, ob, x + 1, y, 1, 1,    1, 1, 1, 1); \
    }
 #define CHK_ENTRY(label, x, y, val) \
diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c
index e0be340..95712e7 100644
--- a/src/bin/e_int_border_remember.c
+++ b/src/bin/e_int_border_remember.c
@@ -24,6 +24,12 @@ struct _E_Config_Dialog_Data
    int mode;
    int warned;
    /*- ADVANCED -*/
+   char *name;
+   char *class;
+   char *title;
+   char *role;
+   char *command;
+   char *desktop;
    struct {
       int match_name;
       int match_class;
@@ -47,8 +53,12 @@ struct _E_Config_Dialog_Data
       int apply_skip_taskbar;
       int apply_run;
       int apply_icon_pref;
+      int apply_desktop_file;
       int set_focus_on_start;
+      int keep_settings;
    } remember;
+
+  int applied;
 };
 
 /* a nice easy setup function that does the dirty work */
@@ -57,7 +67,7 @@ e_int_border_remember(E_Border *bd)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   
+
    v = E_NEW(E_Config_Dialog_View, 1);
    if (v)
       {
@@ -69,7 +79,7 @@ e_int_border_remember(E_Border *bd)
          v->advanced.apply_cfdata   = _advanced_apply_data;
          v->advanced.create_widgets = _advanced_create_widgets;
 	 v->override_auto_apply = 1;
-	 
+
          /* create config dialog for bd object/data */
          cfd = e_config_dialog_new(bd->zone->container,
 				   _("Window Remember"),
@@ -83,52 +93,173 @@ e_int_border_remember(E_Border *bd)
 static void
 _fill_data(E_Config_Dialog_Data *cfdata)
 {
-   if (cfdata->border->remember)
+   E_Border *bd;
+   E_Remember *rem;
+
+   bd = cfdata->border;
+   rem = bd->remember;
+
+   if (rem)
+     {
+	if (rem->name && rem->name[0])
+	  cfdata->name = strdup(rem->name);
+	if (rem->class && rem->class[0])
+	  cfdata->class = strdup(rem->class);
+	if (rem->title && rem->title[0])
+	  cfdata->title = strdup(rem->title);
+	if (rem->role && rem->role[0])
+	  cfdata->role = strdup(rem->role);
+	if (rem->prop.command && rem->prop.command[0])
+	  cfdata->command = strdup(rem->prop.command);
+	if (rem->prop.desktop_file && rem->prop.desktop_file[0])
+	  cfdata->desktop = strdup(rem->prop.desktop_file);
+	if (cfdata->desktop)
+	  cfdata->remember.apply_desktop_file = 1;
+     }
+
+   if (!cfdata->name &&
+       bd->client.icccm.name &&
+       bd->client.icccm.name[0])
+     cfdata->name = strdup(bd->client.icccm.name);
+   if (!cfdata->class &&
+       bd->client.icccm.class &&
+       bd->client.icccm.class[0])
+     cfdata->class = strdup(bd->client.icccm.class);
+   if (!cfdata->role &&
+       bd->client.icccm.window_role &&
+       bd->client.icccm.window_role[0])
+     cfdata->role = strdup(bd->client.icccm.window_role);
+   if (!cfdata->title)
+     {
+	const char *title = e_border_name_get(bd);
+	if (title && title[0])
+	  cfdata->title = strdup(title);	  
+     }
+   if (!cfdata->desktop && bd->desktop)
+     cfdata->desktop = strdup(bd->desktop->name);
+
+   if (!cfdata->command &&
+       (bd->client.icccm.command.argc > 0) &&
+       (bd->client.icccm.command.argv))
      {
-	if (cfdata->border->remember->apply_first_only) cfdata->remember.apply_first_only = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_NAME) cfdata->remember.match_name = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_CLASS) cfdata->remember.match_class = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TITLE) cfdata->remember.match_title = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_ROLE) cfdata->remember.match_role = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TYPE) cfdata->remember.match_type = 1;
-	if (cfdata->border->remember->match & E_REMEMBER_MATCH_TRANSIENT) cfdata->remember.match_transient = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_POS) cfdata->remember.apply_pos = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SIZE) cfdata->remember.apply_size = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_LAYER) cfdata->remember.apply_layer = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_LOCKS) cfdata->remember.apply_locks = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_BORDER) cfdata->remember.apply_border = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_STICKY) cfdata->remember.apply_sticky = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_DESKTOP) cfdata->remember.apply_desktop = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_SHADE) cfdata->remember.apply_shade = 1;
-	if (cfdata->border->remember->apply & E_REMEMBER_APPLY_FULLSCREEN) cfdata->remember.apply_fullscreen = 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;
+	char buf[4096];
+	int i, j, k;
+
+	buf[0] = 0;
+	k = 0;
+	for (i = 0; i < bd->client.icccm.command.argc; i++)
+	  {
+	     if (i > 0)
+	       {
+		  buf[k] = ' ';
+		  k++;
+	       }
+	     for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
+	       {
+		  if (k >= (sizeof(buf) - 10))
+		    {
+		       buf[k] = 0;
+		       goto done;
+		    }
+		  if ((bd->client.icccm.command.argv[i][j] == ' ') ||
+		      (bd->client.icccm.command.argv[i][j] == '\t') ||
+		      (bd->client.icccm.command.argv[i][j] == '\\') ||
+		      (bd->client.icccm.command.argv[i][j] == '\"') ||
+		      (bd->client.icccm.command.argv[i][j] == '\'') ||
+		      (bd->client.icccm.command.argv[i][j] == '$') ||
+		      (bd->client.icccm.command.argv[i][j] == '%'))
+		    {
+		       buf[k] = '\\';
+		       k++;
+		    }
+		  buf[k] = bd->client.icccm.command.argv[i][j];
+		  k++;
+	       }
+	  }
+	buf[k] = 0;
+     done:
+	cfdata->command = strdup(buf);
+     }
 
+   if (rem)
+     {
+	if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
+	if (rem->keep_settings)    cfdata->remember.keep_settings = 1;
+	
+	if (rem->match & E_REMEMBER_MATCH_NAME)
+	  cfdata->remember.match_name = 1;
+	if (rem->match & E_REMEMBER_MATCH_CLASS)
+	  cfdata->remember.match_class = 1;
+	if (rem->match & E_REMEMBER_MATCH_TITLE)
+	  cfdata->remember.match_title = 1;
+	if (rem->match & E_REMEMBER_MATCH_ROLE)
+	  cfdata->remember.match_role = 1;
+	if (rem->match & E_REMEMBER_MATCH_TYPE)
+	  cfdata->remember.match_type = 1;
+	if (rem->match & E_REMEMBER_MATCH_TRANSIENT)
+	  cfdata->remember.match_transient = 1;
+	if (rem->apply & E_REMEMBER_APPLY_POS)
+	  cfdata->remember.apply_pos = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SIZE)
+	  cfdata->remember.apply_size = 1;
+	if (rem->apply & E_REMEMBER_APPLY_LAYER)
+	  cfdata->remember.apply_layer = 1;
+	if (rem->apply & E_REMEMBER_APPLY_LOCKS)
+	  cfdata->remember.apply_locks = 1;
+	if (rem->apply & E_REMEMBER_APPLY_BORDER)
+	  cfdata->remember.apply_border = 1;
+	if (rem->apply & E_REMEMBER_APPLY_STICKY)
+	  cfdata->remember.apply_sticky = 1;
+	if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
+	  cfdata->remember.apply_desktop = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SHADE)
+	  cfdata->remember.apply_shade = 1;
+	if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
+	  cfdata->remember.apply_fullscreen = 1;
+	if (rem->apply & E_REMEMBER_APPLY_ZONE)
+	  cfdata->remember.apply_zone = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
+	  cfdata->remember.apply_skip_winlist = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)
+	  cfdata->remember.apply_skip_pager = 1;
+	if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR)
+	  cfdata->remember.apply_skip_taskbar = 1;
+	if (rem->apply & E_REMEMBER_APPLY_RUN)
+          cfdata->remember.apply_run = 1;
+	if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)
+	  cfdata->remember.apply_icon_pref = 1;
+	if (rem->apply & E_REMEMBER_SET_FOCUS_ON_START)
+	  cfdata->remember.set_focus_on_start = 1;
      }
-   if (!cfdata->border->remember) cfdata->mode = MODE_NOTHING;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
-	    (cfdata->remember.apply_locks) && (cfdata->remember.apply_layer) &&
-	    (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_fullscreen) &&
+
+   if (!rem) cfdata->mode = MODE_NOTHING;
+   else if ((cfdata->remember.apply_pos) &&
+	    (cfdata->remember.apply_size) &&
+	    (cfdata->remember.apply_locks) &&
+	    (cfdata->remember.apply_layer) &&
+	    (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_fullscreen) &&
 	    (cfdata->remember.apply_skip_taskbar))
      cfdata->mode = MODE_ALL;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && 
+   else if ((cfdata->remember.apply_pos) &&
+	    (cfdata->remember.apply_size) &&
 	    (cfdata->remember.apply_locks))
      cfdata->mode = MODE_GEOMETRY_LOCKS;
-   else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size)) 
+   else if ((cfdata->remember.apply_pos) &&
+	    (cfdata->remember.apply_size))
      cfdata->mode = MODE_GEOMETRY;
    else if ((cfdata->remember.apply_locks))
      cfdata->mode = MODE_LOCKS;
    else cfdata->mode = MODE_NOTHING;
 }
 
+
 static void *
 _create_data(E_Config_Dialog *cfd)
 {
@@ -137,9 +268,10 @@ _create_data(E_Config_Dialog *cfd)
     * the running systems/config in the apply methods
     */
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = cfd->data;
+   cfdata->applied = 1;
    _fill_data(cfdata);
    return cfdata;
 }
@@ -148,60 +280,99 @@ static void
 _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Free the cfdata */
+   if (cfdata->name)    free(cfdata->name);
+   if (cfdata->class)   free(cfdata->class);
+   if (cfdata->title)   free(cfdata->title);
+   if (cfdata->role)    free(cfdata->role);
+   if (cfdata->command) free(cfdata->command);
+   if (cfdata->desktop) free(cfdata->desktop);
+
+   if (!cfdata->applied && cfdata->border->remember)
+     {
+	e_remember_unuse(cfdata->border->remember);
+	e_remember_del(cfdata->border->remember);
+	e_config_save_queue();
+     }
+
    cfdata->border->border_remember_dialog = NULL;
    free(cfdata);
 }
 
-/**--APPLY--**/
+static void
+_warning_dialog_show(E_Container *con)
+{
+   E_Dialog *dia;
+
+   dia = e_dialog_new(con, "E", "_border_remember_error_multi_dialog");
+   e_dialog_title_set(dia, _("Window properties are not a unique match"));
+   e_dialog_text_set
+     (dia,
+      _("You are trying to ask Enlightenment to remember to apply<br>"
+	"properties (such as size, location, border style etc.) to<br>"
+	"a window that <hilight>does not have unique properties</hilight>.<br>"
+	"<br>"
+	"This means it shares Name/Class, Transience, Role etc. properties<br>"
+	"with more than 1 other window on the screen and remembering<br>"
+	"properties for this window will apply to all other windows<br>"
+	"that match these properties.<br>"
+	"<br>"
+	"This is just a warning in case you did not intend this to happen.<br>"
+	"If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>"
+	"and your settings will be accepted. Press <hilight>Cancel</hilight> if you<br>"
+	"are not sure and nothing will be affected.")
+      );
+   e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
+   e_win_centered_set(dia->win, 1);
+   e_dialog_show(dia);
+}
+
 static int
-_check_matches(E_Border *bd, int matchflags)
+_check_matches(E_Remember *rem, int update)
 {
    Eina_List *l;
-   int n = 0;
+   E_Border *bd;
    const char *title;
-   
-   title = e_border_name_get(bd);
-   for (l = e_border_client_list(); l; l = l->next)
+   int n = 0;
+
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
      {
-	E_Border *bd2;
-	int required_matches;
-	int matches;
-	const char *title2;
-	
-	bd2 = l->data;
-        matches = 0;
-	required_matches = 0;
-	if (matchflags & E_REMEMBER_MATCH_NAME) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_CLASS) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TITLE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_ROLE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TYPE) required_matches++;
-	if (matchflags & E_REMEMBER_MATCH_TRANSIENT) required_matches++;
-	title2 = e_border_name_get(bd2);
-        if ((matchflags & E_REMEMBER_MATCH_NAME) &&
-	    ((!e_util_strcmp(bd->client.icccm.name, bd2->client.icccm.name)) ||
-	     (e_util_both_str_empty(bd->client.icccm.name, bd2->client.icccm.name))))
-	  matches++;
-	if ((matchflags & E_REMEMBER_MATCH_CLASS) &&
-	    ((!e_util_strcmp(bd->client.icccm.class, bd2->client.icccm.class)) ||
-	     (e_util_both_str_empty(bd->client.icccm.class, bd2->client.icccm.class))))
-	  matches++;
-	if ((matchflags & E_REMEMBER_MATCH_TITLE) &&
-	    ((!e_util_strcmp(title, title2)) ||
-	     (e_util_both_str_empty(title, title2))))
-	  matches++;
-	if ((matchflags & E_REMEMBER_MATCH_ROLE) &&
-	    ((!e_util_strcmp(bd->client.icccm.window_role, bd2->client.icccm.window_role)) ||
-	     (e_util_both_str_empty(bd->client.icccm.window_role, bd2->client.icccm.window_role))))
-	  matches++;
-	if ((matchflags & E_REMEMBER_MATCH_TYPE) &&
-	    (bd->client.netwm.type == bd2->client.netwm.type))
-	  matches++;
-	if ((matchflags & E_REMEMBER_MATCH_TRANSIENT) &&
-	    (((bd->client.icccm.transient_for) && (bd2->client.icccm.transient_for != 0)) ||
-	     ((!bd->client.icccm.transient_for) && (bd2->client.icccm.transient_for == 0))))
-	  matches++;
-	if (matches >= required_matches) n++;
+	int match = rem->match;
+	title = e_border_name_get(bd);
+
+        if ((match & E_REMEMBER_MATCH_NAME) &&
+	    (e_util_glob_match(bd->client.icccm.name, rem->name)))
+	  match &= ~E_REMEMBER_MATCH_NAME;
+
+	if ((match & E_REMEMBER_MATCH_CLASS) &&
+	    (e_util_glob_match(bd->client.icccm.class, rem->class)))
+	  match &= ~E_REMEMBER_MATCH_CLASS;
+
+	if ((match & E_REMEMBER_MATCH_TITLE) &&
+	    (e_util_glob_match(title, rem->title)))
+	  match &= ~E_REMEMBER_MATCH_TITLE;
+
+	if ((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))))
+	  match &= ~E_REMEMBER_MATCH_ROLE;
+
+	if ((match & E_REMEMBER_MATCH_TYPE) &&
+	    (rem->type == bd->client.netwm.type))
+	  match &= ~E_REMEMBER_MATCH_TYPE;
+
+	if ((match & E_REMEMBER_MATCH_TRANSIENT) &&
+	    ((rem->transient && bd->client.icccm.transient_for != 0) ||
+	     (!rem->transient && (bd->client.icccm.transient_for == 0))))
+	  match &= ~E_REMEMBER_MATCH_TRANSIENT;
+
+	if (match == 0) n++;
+
+	if (update)
+	  {
+	     bd->changed = 1;
+	     bd->changes.icon = 1;
+	  }
+	else if (n > 1) break;
      }
    return n;
 }
@@ -210,88 +381,59 @@ static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    /* Actually take our cfdata settings and apply them in real life */
+   E_Border *bd = cfdata->border;
+   E_Remember *rem = bd->remember;;
    
    if (cfdata->mode == MODE_NOTHING)
      {
-	if (cfdata->border->remember)
+	if (rem)
 	  {
-	     E_Remember *rem;
-	     
-	     rem = cfdata->border->remember;
-	     cfdata->border->remember = NULL;
 	     e_remember_unuse(rem);
 	     e_remember_del(rem);
 	  }
 	e_config_save_queue();
 	return 1;
      }
-   if (!cfdata->warned)
+
+   if (!rem)
      {
-	int matches = 0;
-	
-	if ((cfdata->border->client.icccm.name) &&
-	    (cfdata->border->client.icccm.class) &&
-	    (cfdata->border->client.icccm.name[0] != 0) &&
-	    (cfdata->border->client.icccm.class[0] != 0))
-	  matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT);
-	else
-	  matches = _check_matches(cfdata->border, E_REMEMBER_MATCH_TITLE | E_REMEMBER_MATCH_ROLE | E_REMEMBER_MATCH_TYPE | E_REMEMBER_MATCH_TRANSIENT);
-	if (matches > 1)
+	rem = e_remember_new();
+	if (rem)
 	  {
-	     E_Dialog *dia;
-	     
-	     dia = e_dialog_new(cfd->con, "E", "_border_remember_error_multi_dialog");
-	     e_dialog_title_set(dia, _("Window properties are not a unique match"));
-	     e_dialog_text_set
-	       (dia,
-		_("You are trying to ask Enlightenment to remember to apply<br>"
-		  "properties (such as size, location, border style etc.) to<br>"
-		  "a window that <hilight>does not have unique properties</hilight>.<br>"
-		  "<br>"
-		  "This means it shares Name/Class, Transience, Role etc. properties<br>"
-		  "with more than 1 other window on the screen and remembering<br>"
-		  "properties for this window will apply to all other windows<br>"
-		  "that match these properties.<br>"
-		  "<br>"
-		  "This is just a warning in case you did not intend this to happen.<br>"
-		  "If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>"
-		  "and your settings will be accepted. Press <hilight>Cancel</hilight> if you<br>"
-		  "are not sure and nothing will be affected.")
-		);
-	     e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
-	     e_win_centered_set(dia->win, 1);
-	     e_dialog_show(dia);
-	     cfdata->warned = 1;
-	     return 0;
+	     bd->remember = rem;
+	     cfdata->applied = 0;
 	  }
+	else
+	  return 0;
      }
-   if (!cfdata->border->remember)
-     {
-	cfdata->border->remember = e_remember_new();
-	if (cfdata->border->remember)
-          e_remember_use(cfdata->border->remember);
-     }
+   
+   e_remember_default_match_set(rem, cfdata->border);
 
-   if (cfdata->border->remember)
+   if ((!cfdata->warned) && (_check_matches(rem, 0) > 1))
      {
-	cfdata->border->remember->match = e_remember_default_match(cfdata->border);
-
-	if (cfdata->mode == MODE_GEOMETRY)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE;
-	else if (cfdata->mode == MODE_LOCKS)
-	  cfdata->border->remember->apply = E_REMEMBER_APPLY_LOCKS;
-	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 | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR |
-	                                    E_REMEMBER_APPLY_FULLSCREEN | E_REMEMBER_APPLY_ICON_PREF;
-	cfdata->border->remember->apply_first_only = 0;
-       e_remember_update(cfdata->border->remember, cfdata->border);
+	_warning_dialog_show(cfd->con);
+	cfdata->warned = 1;
+	return 0;
      }
-  
+   
+   if (cfdata->mode == MODE_GEOMETRY)
+     rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE;
+   else if (cfdata->mode == MODE_LOCKS)
+     rem->apply = E_REMEMBER_APPLY_LOCKS;
+   else if (cfdata->mode == MODE_GEOMETRY_LOCKS)
+     rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LOCKS;
+   else if (cfdata->mode == MODE_ALL)
+     rem->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 | E_REMEMBER_APPLY_FULLSCREEN | E_REMEMBER_APPLY_ICON_PREF;
+
+   rem->apply_first_only = 0;
+
+   e_remember_use(rem);
+   e_remember_update(bd);
+   cfdata->applied = 1;
    e_config_save_queue();
    return 1; /* Apply was OK */
 }
@@ -299,36 +441,76 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static int
 _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   /* Actually take our cfdata settings and apply them in real life */
+   E_Border *bd = cfdata->border;
+   E_Remember *rem = bd->remember;
+
+   if (!rem)
+     {
+	cfdata->applied = 0;
+	rem = e_remember_new();
+	if (rem)
+	   e_remember_use(rem);
+	else
+	  return 0;
+     }
+   else
+     {
+	if (rem->name)  eina_stringshare_del(rem->name);
+	if (rem->class) eina_stringshare_del(rem->class);
+	if (rem->title) eina_stringshare_del(rem->title);
+	if (rem->role)  eina_stringshare_del(rem->role);
+	if (rem->prop.command) eina_stringshare_del(rem->prop.command);
+	if (rem->prop.desktop_file) eina_stringshare_del(rem->prop.desktop_file);
+	rem->name = NULL;
+	rem->class = NULL;
+	rem->title = NULL;
+	rem->role = NULL;
+	rem->prop.command = NULL;
+	rem->prop.desktop_file = NULL;
+     }
    
-   if (!((cfdata->remember.apply_pos) || (cfdata->remember.apply_size) || 
-	 (cfdata->remember.apply_locks) || (cfdata->remember.apply_layer) ||
-	 (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) || (cfdata->remember.apply_fullscreen)))
+   rem->match = 0;
+   rem->apply_first_only = cfdata->remember.apply_first_only;
+
+   if (cfdata->remember.match_name && cfdata->name && cfdata->name[0])
      {
-	if (cfdata->border->remember)
-	  {
-	     e_remember_unuse(cfdata->border->remember);
-	     e_remember_del(cfdata->border->remember);
-	     cfdata->border->remember = NULL;
-	  }
-	e_config_save_queue();
-	return 1;
+	rem->match |= E_REMEMBER_MATCH_NAME;
+	rem->name = eina_stringshare_add(cfdata->name);
+     }
+   if (cfdata->remember.match_class && cfdata->class && cfdata->class[0])
+     {
+	rem->match |= E_REMEMBER_MATCH_CLASS;
+	rem->class = eina_stringshare_add(cfdata->class);
+     }
+   if (cfdata->remember.match_title && cfdata->title && cfdata->title[0])
+     {
+	rem->match |= E_REMEMBER_MATCH_TITLE;
+	rem->title = eina_stringshare_add(cfdata->title);
+     }
+   if (cfdata->remember.match_role && cfdata->role  && cfdata->role[0])
+     {
+	rem->match |= E_REMEMBER_MATCH_ROLE;
+	rem->role = eina_stringshare_add(cfdata->role);
+     }
+   if (cfdata->remember.match_type)
+     {
+	rem->match |= E_REMEMBER_MATCH_TYPE;
+	rem->type = bd->client.netwm.type;
      }
    
-   if (cfdata->remember.match_name) cfdata->remember.match_class = 1;
-   else cfdata->remember.match_class = 0;
+   if (cfdata->remember.match_transient)
+     {
+	rem->match |= E_REMEMBER_MATCH_TRANSIENT;
+	if (bd->client.icccm.transient_for != 0)
+	  rem->transient = 1;
+	else
+	  rem->transient = 0;
+     }
 
-   if (!((cfdata->remember.match_name) || (cfdata->remember.match_class) ||
-	 (cfdata->remember.match_title) || (cfdata->remember.match_role) ||
-	 (cfdata->remember.match_type) || (cfdata->remember.match_transient)))
+   if (!rem->match)
      {
 	E_Dialog *dia;
-	
+
 	dia = e_dialog_new(cfd->con, "E", "_border_remember_error_noprop_dialog");
 	e_dialog_title_set(dia, _("No match properties set"));
 	e_dialog_text_set
@@ -342,90 +524,79 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
 	e_win_centered_set(dia->win, 1);
 	e_dialog_show(dia);
+	cfdata->border->remember = rem;
 	return 0;
      }
+
+   /* TODO warn when match doesnt match the current window
+    * (when using globs) */
+
    if (!cfdata->warned)
      {
-	int matchflags = 0;
-	  
-	if (cfdata->remember.match_name) matchflags |= E_REMEMBER_MATCH_NAME;
-	if (cfdata->remember.match_class) matchflags |= E_REMEMBER_MATCH_CLASS;
-	if (cfdata->remember.match_title) matchflags |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role) matchflags |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type) matchflags |= E_REMEMBER_MATCH_TYPE;
-	if (cfdata->remember.match_transient) matchflags |= E_REMEMBER_MATCH_TRANSIENT;
 	if ((!cfdata->remember.apply_first_only) &&
-	    (_check_matches(cfdata->border, matchflags) > 1))
+	    (_check_matches(rem, 0) > 1))
 	  {
-	     E_Dialog *dia;
-	     
-	     dia = e_dialog_new(cfd->con, "E", "_border_remember_error_no_remember_dialog");
-	     e_dialog_title_set(dia, _("No match properties set"));
-	     e_dialog_text_set
-	       (dia,
-		_("You are trying to ask Enlightenment to remember to apply<br>"
-		  "properties (such as size, location, border style etc.) to<br>"
-		  "a window that <hilight>does not have unique properties</hilight>.<br>"
-		  "<br>"
-		  "This means it shares Name/Class, Transience, Role etc. properties<br>"
-		  "with more than 1 other window on the screen and remembering<br>"
-		  "properties for this window will apply to all other windows<br>"
-		  "that match these properties.<br>"
-		  "<br>"
-		  "You may wish to enable the <hilight>Match only one window</hilight> option if<br>"
-		  "you only intend one instance of this window to be modified, with<br>"
-		  "additional instances not being modified.<br>"
-		  "<br>"
-		  "This is just a warning in case you did not intend this to happen.<br>"
-		  "If you did, simply press <hilight>Apply</hilight> or <hilight>OK</hilight> buttons<br>"
-		  "and your settings will be accepted. Press <hilight>Cancel</hilight> if you<br>"
-		  "are not sure and nothing will be affected.")
-		);
-	     e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
-	     e_win_centered_set(dia->win, 1);
-	     e_dialog_show(dia);
+	     _warning_dialog_show(cfd->con);
 	     cfdata->warned = 1;
 	     return 0;
 	  }
      }
+   
+   if (cfdata->command && cfdata->command[0])
+     rem->prop.command = eina_stringshare_add(cfdata->command);
+   if (cfdata->remember.apply_desktop_file && cfdata->desktop)
+     rem->prop.desktop_file = eina_stringshare_add(cfdata->desktop);
 
-   if (!cfdata->border->remember)
+   rem->apply = 0;
+   if (cfdata->remember.apply_pos)
+     rem->apply |= E_REMEMBER_APPLY_POS;
+   if (cfdata->remember.apply_size)
+     rem->apply |= E_REMEMBER_APPLY_SIZE;
+   if (cfdata->remember.apply_layer)
+     rem->apply |= E_REMEMBER_APPLY_LAYER;
+   if (cfdata->remember.apply_locks)
+     rem->apply |= E_REMEMBER_APPLY_LOCKS;
+   if (cfdata->remember.apply_border)
+     rem->apply |= E_REMEMBER_APPLY_BORDER;
+   if (cfdata->remember.apply_sticky)
+     rem->apply |= E_REMEMBER_APPLY_STICKY;
+   if (cfdata->remember.apply_desktop)
+     rem->apply |= E_REMEMBER_APPLY_DESKTOP;
+   if (cfdata->remember.apply_shade)
+     rem->apply |= E_REMEMBER_APPLY_SHADE;
+   if (cfdata->remember.apply_fullscreen)
+     rem->apply |= E_REMEMBER_APPLY_FULLSCREEN;
+   if (cfdata->remember.apply_zone)
+     rem->apply |= E_REMEMBER_APPLY_ZONE;
+   if (cfdata->remember.apply_skip_winlist)
+     rem->apply |= E_REMEMBER_APPLY_SKIP_WINLIST;
+   if (cfdata->remember.apply_skip_pager)
+     rem->apply |= E_REMEMBER_APPLY_SKIP_PAGER;
+   if (cfdata->remember.apply_skip_taskbar)
+     rem->apply |= E_REMEMBER_APPLY_SKIP_TASKBAR;
+   if (cfdata->remember.apply_run)
+     rem->apply |= E_REMEMBER_APPLY_RUN;
+   if (cfdata->remember.apply_icon_pref)
+     rem->apply |= E_REMEMBER_APPLY_ICON_PREF;
+   if (cfdata->remember.set_focus_on_start)
+     rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
+  
+   if (!rem->apply && !rem->prop.desktop_file)
      {
-	cfdata->border->remember = e_remember_new();
+	e_remember_unuse(rem);
+	e_remember_del(rem);
 	if (cfdata->border->remember)
-	   e_remember_use(cfdata->border->remember);
+	  e_config_save_queue();
+    	return 1;
      }
-   if (cfdata->border->remember)
-     {
-	cfdata->border->remember->apply = 0;
-	cfdata->border->remember->match = 0;
-	if (cfdata->remember.match_name) cfdata->border->remember->match |= E_REMEMBER_MATCH_NAME;
-	if (cfdata->remember.match_class) cfdata->border->remember->match |= E_REMEMBER_MATCH_CLASS;
-	if (cfdata->remember.match_title) cfdata->border->remember->match |= E_REMEMBER_MATCH_TITLE;
-	if (cfdata->remember.match_role) cfdata->border->remember->match |= E_REMEMBER_MATCH_ROLE;
-	if (cfdata->remember.match_type) cfdata->border->remember->match |= E_REMEMBER_MATCH_TYPE;
-	if (cfdata->remember.match_transient) cfdata->border->remember->match |= E_REMEMBER_MATCH_TRANSIENT;
-	if (cfdata->remember.apply_pos) cfdata->border->remember->apply |= E_REMEMBER_APPLY_POS;
-	if (cfdata->remember.apply_size) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SIZE;
-	if (cfdata->remember.apply_layer) cfdata->border->remember->apply |= E_REMEMBER_APPLY_LAYER;
-	if (cfdata->remember.apply_locks) cfdata->border->remember->apply |= E_REMEMBER_APPLY_LOCKS;
-	if (cfdata->remember.apply_border) cfdata->border->remember->apply |= E_REMEMBER_APPLY_BORDER;
-	if (cfdata->remember.apply_sticky) cfdata->border->remember->apply |= E_REMEMBER_APPLY_STICKY;
-	if (cfdata->remember.apply_desktop) cfdata->border->remember->apply |= E_REMEMBER_APPLY_DESKTOP;
-	if (cfdata->remember.apply_shade) cfdata->border->remember->apply |= E_REMEMBER_APPLY_SHADE;
-	if (cfdata->remember.apply_fullscreen) cfdata->border->remember->apply |= E_REMEMBER_APPLY_FULLSCREEN;
-	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;
-
-	cfdata->border->remember->apply_first_only = cfdata->remember.apply_first_only;
-	e_remember_update(cfdata->border->remember, cfdata->border);
-     }
-   
+
+   _check_matches(rem, 1);
+   rem->keep_settings = 0;
+   cfdata->border->remember = rem;
+   e_remember_update(cfdata->border);
+   rem->keep_settings = cfdata->remember.keep_settings;
+
+   cfdata->applied = 1;
    e_config_save_queue();
    return 1; /* Apply was OK */
 }
@@ -437,7 +608,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    /* generate the core widget layout for a basic dialog */
    Evas_Object *o, *ob;
    E_Radio_Group *rg;
-   
+
    o = e_widget_list_add(evas, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->mode));
    ob = e_widget_radio_add(evas, _("Nothing"), MODE_NOTHING, rg);
@@ -459,35 +630,51 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    /* generate the core widget layout for an advanced dialog */
    Evas_Object *o, *ob, *of;
 
-   o = e_widget_list_add(evas, 0, 0);
-   
+   o = e_widget_table_add(evas, 0);
+
    of = e_widget_framelist_add(evas, _("Remember using"), 0);
-   if ((cfdata->border->client.icccm.name) &&
-       (cfdata->border->client.icccm.class) &&
-       (cfdata->border->client.icccm.name[0] != 0) &&
-       (cfdata->border->client.icccm.class[0] != 0))
+   if (cfdata->name)
      {
-	ob = e_widget_check_add(evas, _("Window name and class"), &(cfdata->remember.match_name));
+	ob = e_widget_check_add(evas, _("Window name"),
+				&(cfdata->remember.match_name));
+	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->name, NULL, NULL, NULL);
 	e_widget_framelist_object_append(of, ob);
      }
    else
      {
 	cfdata->remember.match_name = 0;
+     }
+   if (cfdata->class)
+     {
+	ob = e_widget_check_add(evas, _("Window class"),
+				&(cfdata->remember.match_class));
+	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->class, NULL, NULL, NULL);
+	e_widget_framelist_object_append(of, ob);
+     }
+   else
+     {
 	cfdata->remember.match_class = 0;
      }
-   if ((e_border_name_get(cfdata->border))[0] != 0)
+   if (cfdata->title)
      {
-	ob = e_widget_check_add(evas, _("Title"), &(cfdata->remember.match_title));
+	ob = e_widget_check_add(evas, _("Title"),
+				&(cfdata->remember.match_title));
+	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->title, NULL, NULL, NULL);
 	e_widget_framelist_object_append(of, ob);
      }
    else
      {
 	cfdata->remember.match_title = 0;
      }
-   if ((cfdata->border->client.icccm.window_role) && 
-       (cfdata->border->client.icccm.window_role[0] != 0))
+   if (cfdata->role)
      {
-	ob = e_widget_check_add(evas, _("Window Role"), &(cfdata->remember.match_role));
+	ob = e_widget_check_add(evas, _("Window Role"),
+				&(cfdata->remember.match_role));
+	e_widget_framelist_object_append(of, ob);
+	ob = e_widget_entry_add(evas, &cfdata->role, NULL, NULL, NULL);
 	e_widget_framelist_object_append(of, ob);
      }
    else
@@ -496,59 +683,91 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
      }
    if (cfdata->border->client.netwm.type != ECORE_X_WINDOW_TYPE_UNKNOWN)
      {
-	ob = e_widget_check_add(evas, _("Window type"), &(cfdata->remember.match_type));
+	ob = e_widget_check_add(evas, _("Window type"),
+				&(cfdata->remember.match_type));
 	e_widget_framelist_object_append(of, ob);
      }
    else
      {
 	cfdata->remember.match_type = 0;
      }
-   ob = e_widget_check_add(evas, _("Transience"), &(cfdata->remember.match_transient));
+   ob = e_widget_label_add(evas, _("wildcard matches are allowed"));
    e_widget_framelist_object_append(of, ob);
-   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   ob = e_widget_check_add(evas, _("Transience"),
+			   &(cfdata->remember.match_transient));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
 
    of = e_widget_frametable_add(evas, _("Properties to remember"), 0);
-   ob = e_widget_check_add(evas, _("Position"), &(cfdata->remember.apply_pos));
+   ob = e_widget_check_add(evas, _("Position"),
+			   &(cfdata->remember.apply_pos));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Size"), &(cfdata->remember.apply_size));
+   ob = e_widget_check_add(evas, _("Size"),
+			   &(cfdata->remember.apply_size));
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Stacking"), &(cfdata->remember.apply_layer));
+   ob = e_widget_check_add(evas, _("Stacking"),
+			   &(cfdata->remember.apply_layer));
    e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Locks"), &(cfdata->remember.apply_locks));
+   ob = e_widget_check_add(evas, _("Locks"),
+			   &(cfdata->remember.apply_locks));
    e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Border style"), &(cfdata->remember.apply_border));
+   ob = e_widget_check_add(evas, _("Border style"),
+			   &(cfdata->remember.apply_border));
    e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Icon Preference"), &(cfdata->remember.apply_icon_pref));
+   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));
+   ob = e_widget_check_add(evas, _("Stickiness"),
+			   &(cfdata->remember.apply_sticky));
    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));
+   ob = e_widget_check_add(evas, _("Virtual Desktop"),
+			   &(cfdata->remember.apply_desktop));
    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));
+   ob = e_widget_check_add(evas, _("Shaded state"),
+			   &(cfdata->remember.apply_shade));
    e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->remember.apply_fullscreen));
+   ob = e_widget_check_add(evas, _("Fullscreen state"),
+			   &(cfdata->remember.apply_fullscreen));
    e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Current Screen"), &(cfdata->remember.apply_zone));
+   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);
-   ob = e_widget_check_add(evas, _("Skip Window List"), &(cfdata->remember.apply_skip_winlist));
+   ob = e_widget_check_add(evas, _("Skip Window List"),
+			   &(cfdata->remember.apply_skip_winlist));
    e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Skip Pager"), &(cfdata->remember.apply_skip_pager));
+   ob = e_widget_check_add(evas, _("Skip Pager"),
+			   &(cfdata->remember.apply_skip_pager));
    e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("Skip Taskbar"), &(cfdata->remember.apply_skip_taskbar));
+   ob = e_widget_check_add(evas, _("Skip Taskbar"),
+			   &(cfdata->remember.apply_skip_taskbar));
    e_widget_frametable_object_append(of, ob, 1, 6, 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));
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   ob = e_widget_check_add(evas, _("Application file or name (.desktop)"),
+			   &(cfdata->remember.apply_desktop_file));
+   e_widget_frametable_object_append(of, ob, 0, 7, 2, 1, 1, 1, 1, 1);
+   ob = e_widget_entry_add(evas, &cfdata->desktop, NULL, NULL, NULL);
+   e_widget_frametable_object_append(of, ob, 0, 8, 2, 1, 1, 1, 1, 1);
+   e_widget_table_object_append(o, of, 1, 0, 1, 2, 1, 1, 1, 1);
 
-   if (cfdata->border->client.icccm.command.argv)
+   of = e_widget_frametable_add(evas, _("Options"), 0);
+   ob = e_widget_check_add(evas, _("Match only one window"),
+			   &(cfdata->remember.apply_first_only));
+   e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
+
+   ob = e_widget_check_add(evas, _("Always focus on start"),
+			   &(cfdata->remember.set_focus_on_start));
+   e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
+
+   ob = e_widget_check_add(evas, _("Keep current properties"),
+			   &(cfdata->remember.keep_settings));
+   e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 1);
+
+   if (cfdata->command)
      {
-	ob = e_widget_check_add(evas, _("Start this program on login"), &(cfdata->remember.apply_run));
-	e_widget_list_object_append(o, ob, 1, 1, 0.5);
+	ob = e_widget_check_add(evas, _("Start this program on login"),
+				&(cfdata->remember.apply_run));
+	e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 1);
      }
+   e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1);
 
-   ob = e_widget_check_add(evas, _("Always focus on start"), &(cfdata->remember.set_focus_on_start));
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
-  
    return o;
 }
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index 2de32ef..e26b1f0 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -143,16 +143,15 @@ static void
 _fill_data(E_Config_Dialog_Data *cfdata) 
 {
    Eina_List *mdirs = NULL, *l = NULL;
+   E_Path_Dir *epd = NULL;
 
    if (!cfdata) return;
 
    /* loop each path_modules dir and load modules for that path */
    mdirs = e_path_dir_list_get(path_modules);
-   for (l = mdirs; l; l = l->next) 
+   EINA_LIST_FOREACH(mdirs, l, epd)
      {
-	E_Path_Dir *epd = NULL;
-
-	if (!(epd = l->data)) continue;
+	if (!epd) continue;
 	if (!ecore_file_is_dir(epd->dir)) continue;
 	_load_modules(epd->dir);
      }
@@ -207,7 +206,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
    ol = e_widget_textblock_add(evas);
-   e_widget_min_size_set(ol, 200, 70);
+   e_widget_size_min_set(ol, 200, 70);
    cfdata->o_desc = ol;
    e_widget_textblock_markup_set(ol, _("Description: Unavailable"));
    e_widget_table_object_append(o, ol, 0, 1, 2, 1, 1, 0, 1, 0);
@@ -339,8 +338,8 @@ _fill_list(Evas_Object *obj, int enabled)
      }
 
    e_widget_ilist_go(obj);
-   e_widget_min_size_get(obj, &w, NULL);
-   e_widget_min_size_set(obj, w > 180 ? w : 180, 200);
+   e_widget_size_min_get(obj, &w, NULL);
+   e_widget_size_min_set(obj, w > 180 ? w : 180, 200);
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas);
@@ -612,16 +611,16 @@ static void
 _select_all_modules(Evas_Object *obj, void *data)
 {
    Eina_List *l = NULL;
+   E_Ilist_Item *item = NULL;
    E_Config_Dialog_Data *cfdata = NULL;
-   int i = 0;
+   int i = -1;
 
    if (!(cfdata = data)) return;
-   for (i = 0, l = e_widget_ilist_items_get(obj); l; l = l->next, i++)
+   EINA_LIST_FOREACH(e_widget_ilist_items_get(obj), l, item)
      {
-	E_Ilist_Item *item = NULL;
 	CFModule *mod = NULL;
+	i++;
 
-	item = l->data;
 	if ((!item) || (!item->selected)) continue;
 	if (!(mod = e_widget_ilist_nth_data_get(obj, i))) continue;
 	mod->selected = 1;
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index f51ca11..9c9711d 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -15,7 +15,7 @@ static void _load_sel_gadgets(void *data);
 static void _cb_add(void *data, void *data2);
 static void _cb_del(void *data, void *data2);
 static void _set_description(void *data, const char *name);
-static int _gad_list_sort(void *data1, void *data2);
+//static int _gad_list_sort(void *data1, void *data2);
 
 struct _E_Config_Dialog_Data 
 {
@@ -144,7 +144,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
    ow = e_widget_textblock_add(evas);
-   e_widget_min_size_set(ow, 200, 70);
+   e_widget_size_min_set(ow, 200, 70);
    e_widget_textblock_markup_set(ow, _("Description: Unavailable"));
    cfdata->o_desc = ow;
    e_widget_table_object_append(o, ow, 0, 1, 2, 1, 1, 1, 1, 0);
@@ -216,6 +216,7 @@ _load_avail_gadgets(void *data)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Eina_List *l = NULL;
+   E_Gadcon_Client_Class *cc;
    Evas *evas;
    int w;
 
@@ -227,13 +228,12 @@ _load_avail_gadgets(void *data)
    e_widget_ilist_clear(cfdata->o_avail);
 //   l = e_gadcon_provider_list();
 //   if (l) l = eina_list_sort(l, -1, _gad_list_sort);
-   for (l = e_gadcon_provider_list(); l; l = l->next) 
+   EINA_LIST_FOREACH(e_gadcon_provider_list(), l, cc)
      {
-        E_Gadcon_Client_Class *cc;
         Evas_Object *icon = NULL;
         const char *lbl = NULL;
 
-        if (!(cc = l->data)) continue;
+        if (!cc) continue;
         // check the current site is allowed for this gadcon client
         if (cc->func.is_site && !cc->func.is_site(cfdata->site))
            continue;
@@ -244,9 +244,9 @@ _load_avail_gadgets(void *data)
                               (void *)cc->name, NULL);
      }
    e_widget_ilist_go(cfdata->o_avail);
-   e_widget_min_size_get(cfdata->o_avail, &w, NULL);
+   e_widget_size_min_get(cfdata->o_avail, &w, NULL);
    if (w < 200) w = 200;
-   e_widget_min_size_set(cfdata->o_avail, w, 250);
+   e_widget_size_min_set(cfdata->o_avail, w, 250);
    e_widget_ilist_thaw(cfdata->o_avail);
    edje_thaw();
    evas_event_thaw(evas);
@@ -257,6 +257,8 @@ _load_sel_gadgets(void *data)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Eina_List *l = NULL, *l2 = NULL;
+   E_Config_Gadcon_Client *cgc;
+   E_Gadcon_Client_Class *gcc;
    Evas *evas;
    int w;
 
@@ -266,18 +268,15 @@ _load_sel_gadgets(void *data)
    edje_freeze();
    e_widget_ilist_freeze(cfdata->o_sel);
    e_widget_ilist_clear(cfdata->o_sel);
-   for (l = cfdata->gc->cf->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(cfdata->gc->cf->clients, l, cgc)
      {
-        E_Config_Gadcon_Client *cgc;
-
-        if (!(cgc = l->data)) continue;
-        for (l2 = e_gadcon_provider_list(); l2; l2 = l2->next) 
+        if (!cgc) continue;
+	EINA_LIST_FOREACH(e_gadcon_provider_list(), l2, gcc)
           {
-             E_Gadcon_Client_Class *gcc;
              Evas_Object *icon = NULL;
              const char *lbl = NULL;
 
-             if (!(gcc = l2->data)) continue;
+             if (!gcc) continue;
              if ((cgc->name) && (gcc->name) && 
                  (!strcmp(cgc->name, gcc->name))) 
                {
@@ -290,9 +289,9 @@ _load_sel_gadgets(void *data)
           }
      }
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
    if (w < 200) w = 200;
-   e_widget_min_size_set(cfdata->o_sel, w, 250);
+   e_widget_size_min_set(cfdata->o_sel, w, 250);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
@@ -303,15 +302,17 @@ _cb_add(void *data, void *data2)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Eina_List *l = NULL;
+   E_Ilist_Item *item = NULL;
    int i = 0, update = 0;
 
    if (!(cfdata = data)) return;
-   for (i = 0, l = e_widget_ilist_items_get(cfdata->o_avail); l; l = l->next, i++) 
+   i = -1;
+   EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_avail), l, item)
      {
-        E_Ilist_Item *item = NULL;
         const char *name = NULL;
 
-        if (!(item = l->data)) continue;
+        i++;
+        if (!item) continue;
         if (!item->selected) continue;
         name = (char *)e_widget_ilist_nth_data_get(cfdata->o_avail, i);
         if (!name) continue;
@@ -334,23 +335,24 @@ _cb_del(void *data, void *data2)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Eina_List *l = NULL, *g = NULL;
+   E_Ilist_Item *item = NULL;
+   E_Config_Gadcon_Client *cgc;
    int i = 0, update = 0;
 
    if (!(cfdata = data)) return;
-   for (i = 0, l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next, i++) 
+   i = -1;
+   EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_sel), l, item)
      {
-        E_Ilist_Item *item = NULL;
         const char *name = NULL;
 
-        if (!(item = l->data)) continue;
+	i++;
+        if (!item) continue;
         if (!item->selected) continue;
         name = (char *)e_widget_ilist_nth_data_get(cfdata->o_sel, i);
         if (!name) continue;
-        for (g = cfdata->gc->cf->clients; g; g = g->next)
+	EINA_LIST_FOREACH(cfdata->gc->cf->clients, g, cgc)
           {
-             E_Config_Gadcon_Client *cgc;
-
-             if (!(cgc = g->data)) continue;
+             if (!cgc) continue;
              if (strcmp(name, cgc->name)) continue;
              e_gadcon_client_config_del(cfdata->gc->cf, cgc);
              update = 1;
@@ -391,6 +393,8 @@ _set_description(void *data, const char *name)
    efreet_desktop_free(desk);
 }
 
+/* FIXME unused */
+#if 0
 static int 
 _gad_list_sort(void *data1, void *data2) 
 {
@@ -408,3 +412,4 @@ _gad_list_sort(void *data1, void *data2)
 
    return (strcmp(lbl1, lbl2));
 }
+#endif
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 469951a..f9e64b4 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -889,6 +889,7 @@ static void
 _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m)
 {
    Eina_List *l = NULL;
+   E_Border *bd;
    E_Menu_Item *mi;
 
    if (eina_list_count(borders) > 0)
@@ -896,11 +897,8 @@ _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m)
 	mi = e_menu_item_new(m); 
 	e_menu_item_separator_set(mi, 1); 
 
-	for (l = borders; l; l = l->next)
+	EINA_LIST_FOREACH(borders, l, bd)
 	  { 
-	     E_Border *bd; 
-
-	     bd = l->data;
 	     _e_int_menus_clients_item_create(bd, m);
 	  }
      }
@@ -910,16 +908,14 @@ static void
 _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
 {
    Eina_List *l = NULL, *ico = NULL;
+   E_Border *bd; 
    E_Menu *subm = NULL;
    E_Menu_Item *mi;
    char *class = NULL;
 
    class = strdup("");
-   for (l = borders; l; l = l->next) 
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd; 
-
-	bd = l->data; 
 	if ((bd->iconic) && 
 	    (e_config->clientlist_separate_iconified_apps == E_CLIENTLIST_GROUPICONS_SEP))
 	  {
@@ -963,15 +959,13 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
 {
    E_Desk *desk = NULL;
    Eina_List *l = NULL, *alt = NULL, *ico = NULL;
+   E_Border *bd;
    E_Menu *subm;
    E_Menu_Item *mi;
 
    /* Deal with present desk first */
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP) 
 	  {
 	     ico = eina_list_append(ico, bd); 
@@ -1002,11 +996,8 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
 	     e_menu_item_separator_set(mi, 1);
 	  }
 
-	for (l = alt; l; l = l->next)
+	EINA_LIST_FOREACH(alt, l, bd)
 	  {
-	     E_Border *bd;
-
-	     bd = l->data; 
 	     if ((bd->desk != desk) && 
 		 (e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE))
 	       {
@@ -1042,12 +1033,10 @@ static void
 _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m)
 {
    Eina_List *l = NULL, *ico = NULL;
+   E_Border *bd;
 
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) && 
             (E_CLIENTLIST_GROUPICONS_SEP)) 
 	  {
@@ -1065,6 +1054,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
    E_Menu *subm;
    E_Menu_Item *mi;
    Eina_List *l = NULL, *borders = NULL;
+   E_Border *border;
    E_Zone *zone = NULL;
    E_Desk *desk = NULL;
    Main_Data *dat;
@@ -1078,11 +1068,8 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
      l = e_border_focus_stack_get(); 
    else
      l = e_border_client_list();
-   for (; l; l = l->next)
+   EINA_LIST_FOREACH(l, l, border)
      {
-	E_Border *border;
-
-	border = l->data;
 	if (border->client.netwm.state.skip_taskbar) continue;
 	if (border->user_skip_winlist) continue;
 	if ((border->zone == zone) || (border->iconic) ||
@@ -1267,6 +1254,7 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
    Eina_List *l, *borders = NULL;
+   E_Border *bd; 
    E_Menu *root;
    E_Zone *zone = NULL;
 
@@ -1283,12 +1271,10 @@ _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m)
 	e_menu_item_label_set(mi, _("(No Windows)"));
 	return;
      }
-   for (l = borders; l; l = l->next)
+   EINA_LIST_FOREACH(borders, l, bd)
      {
-	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]))
@@ -1358,6 +1344,7 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
 {
    E_Menu_Item *mi;
    Eina_List *l, *shelves = NULL;
+   E_Shelf *s;
    E_Container *con;
    E_Zone *zone;
 
@@ -1374,13 +1361,12 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, _("(No Shelves)"));
      }
-   for (l = shelves; l; l = l->next)
+   EINA_LIST_FOREACH(shelves, l, s)
      {
-	E_Shelf *s;
 	const char *name;
 	char buf[4096];
 
-	if (!(s = l->data)) continue;
+	if (!s) continue;
 	if (s->zone->num != zone->num) continue;
 	if (s->cfg->container != con->num) continue;
 
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index dddc153..ea9fbf6 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -11,6 +11,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
 static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _cb_disable_check_list(void *data, Evas_Object *obj);
+static void _calibrate_binginds(void);
 
 #define MODE_CUSTOM 0
 #define MODE_BOTTOM_MIDDLE 1
@@ -180,16 +181,15 @@ _desk_sel_list_load(E_Config_Dialog_Data *cfdata)
      {
 	E_Desk *desk;
 	Eina_List *l = NULL;
+	E_Config_Shelf_Desk *sd;
 
 	desk = e_desk_at_xy_get(cfdata->es->zone, x, y);
 	e_widget_ilist_append(cfdata->desk_sel_list, NULL, desk->name, 
                               NULL, NULL, NULL);
 
-	for (l = cfdata->desk_list; l; l = l->next)
+	EINA_LIST_FOREACH(cfdata->desk_list, l, sd)
 	    {
-	       E_Config_Shelf_Desk *sd;
-
-	       if (!(sd = l->data)) continue;
+	       if (!sd) continue;
 	       if ((sd->x != x) || (sd->y != y)) continue;
 
 	       e_widget_ilist_multi_select(cfdata->desk_sel_list, 
@@ -301,6 +301,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_shelf_populate(cfdata->es);
    e_shelf_toggle(cfdata->es, 1);
    e_shelf_show(cfdata->es);
+   _calibrate_binginds();
    e_config_save_queue();
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */
@@ -413,14 +414,15 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      {
 	Eina_List *l = NULL;
 	Eina_List *desk_list = NULL;
+	E_Ilist_Item *item;
 
-	for (idx = 0, l = e_widget_ilist_items_get(cfdata->desk_sel_list); l; l = l->next, idx++)
+	idx = -1;
+	EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->desk_sel_list), l, item)
 	  {
-	     E_Ilist_Item *item;
 	     E_Desk *desk;
 	     E_Config_Shelf_Desk *sd;
 
-	     item = l->data;
+	     idx++;
 	     if ((!item) || (!item->selected)) continue;
 
 	     desk = e_desk_at_pos_get(cfdata->es->zone, idx);
@@ -456,14 +458,12 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      {
 	E_Desk *desk;
 	Eina_List *l;
+	E_Config_Shelf_Desk *sd;
 	int show_shelf=0;
 
 	desk = e_desk_current_get(cfdata->es->zone);
-	for (l = cfdata->escfg->desk_list; l; l = l->next)
+	EINA_LIST_FOREACH(cfdata->escfg->desk_list, l, sd)
           {
-             E_Config_Shelf_Desk *sd;
-
-             sd = l->data;
              if ((desk->x == sd->x) && (desk->y == sd->y))
                {
 	          show_shelf=1;
@@ -484,6 +484,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      e_shelf_toggle(cfdata->es, 1);
 
    e_zone_useful_geometry_dirty(cfdata->es->zone);
+   _calibrate_binginds();
    e_config_save_queue();   
    cfdata->es->config_dialog = cfd;
    return 1; /* Apply was OK */
@@ -498,6 +499,68 @@ _cb_configure(void *data, void *data2)
    if (!cfdata->es->gadcon->config_dialog)
      e_int_gadcon_config_shelf(cfdata->es->gadcon);
 }
+
+static void
+_calibrate_binginds(void)
+{
+   E_Binding_Edge *bind;
+   Eina_List *l;
+   E_Shelf *es;
+
+#define EDGE_BINDING_REMOVE(type, click, delay) \
+   bind = e_bindings_edge_get("shelf_show", type, click); \
+   if (bind) \
+     e_bindings_edge_del(E_BINDING_CONTEXT_ZONE, type, \
+	   0, 1, "shelf_show", NULL, delay);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_LEFT, 0, 0.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_RIGHT, 0, 0.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_TOP, 0, 0.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_BOTTOM, 0, 0.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_LEFT, 1, -1.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_RIGHT, 1, -1.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_TOP, 1, -1.0);
+   EDGE_BINDING_REMOVE(E_ZONE_EDGE_BOTTOM, 1, -1.0);
+#undef EDGE_BINDING_REMOVE
+
+#define EDGE_BINDING_ADD(es, type) \
+   if (es->cfg->autohide) \
+     { \
+	if (es->cfg->autohide_show_action) \
+	  e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, type, \
+		0, 1, "shelf_show", NULL, -1.0); \
+	else \
+	  e_bindings_edge_add(E_BINDING_CONTEXT_ZONE, type, \
+		0, 1, "shelf_show", NULL, 0.0); \
+     }
+
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
+     {
+	switch(es->gadcon->orient)
+	  {
+	   case E_GADCON_ORIENT_LEFT:
+	   case E_GADCON_ORIENT_CORNER_LT:
+	   case E_GADCON_ORIENT_CORNER_LB:
+	      EDGE_BINDING_ADD(es, E_ZONE_EDGE_LEFT)
+	      break;
+	   case E_GADCON_ORIENT_RIGHT:
+	   case E_GADCON_ORIENT_CORNER_RT:
+	   case E_GADCON_ORIENT_CORNER_RB:
+	      EDGE_BINDING_ADD(es, E_ZONE_EDGE_RIGHT)
+	      break;
+	   case E_GADCON_ORIENT_TOP:
+	   case E_GADCON_ORIENT_CORNER_TL:
+	   case E_GADCON_ORIENT_CORNER_TR:
+	      EDGE_BINDING_ADD(es, E_ZONE_EDGE_TOP)
+	      break;
+	   case E_GADCON_ORIENT_BOTTOM:
+	   case E_GADCON_ORIENT_CORNER_BL:
+	   case E_GADCON_ORIENT_CORNER_BR:
+	      EDGE_BINDING_ADD(es, E_ZONE_EDGE_BOTTOM)
+	      break;
+	  }
+     }
+#undef EDGE_BINDING_ADD
+}
     
 /**--GUI--**/
 static Evas_Object *
@@ -565,6 +628,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    E_Radio_Group *rg;
    Evas_Coord wmw, wmh;
    Eina_List *styles, *l;
+   char *style;
    int sel, n;
    
    /* FIXME: this is just raw config now - it needs UI improvments */
@@ -650,21 +714,23 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    sel = 0;
    styles = e_theme_shelf_list();
 
-   for (n = 0, l = styles; l; l = l->next, n++)
+   n = 0;
+   EINA_LIST_FOREACH(styles, l, style)
      {
 	char buf[4096];
 	
 	ob = e_livethumb_add(evas);
 	e_livethumb_vsize_set(ob, 120, 40);
 	oj = edje_object_add(e_livethumb_evas_get(ob));
-	snprintf(buf, sizeof(buf), "e/shelf/%s/base", (char *)l->data);
+	snprintf(buf, sizeof(buf), "e/shelf/%s/base", style);
 	e_theme_edje_object_set(oj, "base/theme/shelf", buf);
 	e_livethumb_thumb_set(ob, oj);
-	e_widget_ilist_append(oi, ob, (char *)l->data, NULL, NULL, l->data);
-	if (!strcmp(cfdata->es->style, (char *)l->data)) sel = n;
+	e_widget_ilist_append(oi, ob, style, NULL, NULL, style);
+	if (!strcmp(cfdata->es->style, style)) sel = n;
+	n++;
      }
-   e_widget_min_size_get(oi, &wmw, &wmh);
-   e_widget_min_size_set(oi, wmw, 160);
+   e_widget_size_min_get(oi, &wmw, &wmh);
+   e_widget_size_min_set(oi, wmw, 160);
    
    e_widget_ilist_go(oi);
    e_widget_ilist_selected_set(oi, sel);
@@ -729,8 +795,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->desk_sel_list = ob;
    e_widget_ilist_multi_select_set(ob, 1);
    _desk_sel_list_load(cfdata);
-   e_widget_min_size_get(ob, &wmw, &wmh);
-   e_widget_min_size_set(ob, wmw, 64);
+   e_widget_size_min_get(ob, &wmw, &wmh);
+   e_widget_size_min_set(ob, wmw, 64);
    e_widget_framelist_object_append(of, ob);
 
    e_widget_list_object_append(o2, of, 1, 1, 0.5);
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index e84b6e4..a27055a 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -466,6 +466,8 @@ _e_intl_language_path_find(char *language)
    Eina_List	*search_list;
    Eina_List	*next_dir;
    Eina_List	*next_search;
+   E_Path_Dir	*epd;
+   char		*search_locale;
    int		 found;
 
    search_list = _e_intl_locale_search_order_get(language);
@@ -477,18 +479,15 @@ _e_intl_language_path_find(char *language)
    dir_list = e_path_dir_list_get(path_messages);
 
    /* For each directory in the path */
-   for (next_dir = dir_list; next_dir && !found; next_dir = next_dir->next)
+   EINA_LIST_FOREACH(dir_list, next_dir, epd)
      {
-	E_Path_Dir *epd;
-	epd = next_dir->data;
+	if (found) break;
 
 	/* Match canonicalized locale against each possible search */
-	for (next_search = search_list; next_search && !found; next_search = next_search->next)
+	EINA_LIST_FOREACH(search_list, next_search, search_locale)
 	  {
-	     char *search_locale;
 	     char message_path[PATH_MAX];
 
-	     search_locale = next_search->data;
 	     snprintf(message_path, sizeof(message_path), "%s/%s/LC_MESSAGES/%s.mo", epd->dir, search_locale, PACKAGE);
 
 	     if ((ecore_file_exists(message_path)) && (!ecore_file_is_dir(message_path)))
@@ -580,19 +579,17 @@ _e_intl_locale_alias_hash_get(void)
 {
    Eina_List *next;
    Eina_List *dir_list;
+   E_Path_Dir *epd;
    Eina_Hash *alias_hash;
 
    dir_list = e_path_dir_list_get(path_messages);
    alias_hash = NULL;
 
-   for (next = dir_list; next; next = next->next)
+   EINA_LIST_FOREACH(dir_list, next, epd)
      {
 	char buf[4096];
-	E_Path_Dir *epd;
 	FILE *f;
 
-	epd = next->data;
-
 	snprintf(buf, sizeof(buf), "%s/locale.alias", epd->dir);
 	f = fopen(buf, "r");
 	if (f)
@@ -1027,16 +1024,15 @@ _e_intl_imc_dir_scan(const char *dir)
    files = ecore_file_ls(dir);
 
    EINA_LIST_FREE(files, file)
+     {
+	if (strstr(file, ".imc") != NULL)
 	  {
-	     if (strstr(file, ".imc") != NULL)
-	       {
-		  char buf[PATH_MAX];
-
-		  snprintf(buf, sizeof(buf), "%s/%s", dir, file);
-		  imcs = eina_list_append(imcs, strdup(buf));
-	       }
-	free(file);
+	     char buf[PATH_MAX];
+	     
+	     snprintf(buf, sizeof(buf), "%s/%s", dir, file);
+	     imcs = eina_list_append(imcs, strdup(buf));
 	  }
-
+	free(file);
+     }
    return imcs;
 }
diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index 6dc779c..d5c5e07 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -2,9 +2,9 @@
 
 #ifdef USE_IPC  
 /* local subsystem functions */
-static int _e_ipc_cb_client_add(void *data, int type, void *event);
-static int _e_ipc_cb_client_del(void *data, int type, void *event);
-static int _e_ipc_cb_client_data(void *data, int type, void *event);
+static int _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event);
+static int _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static int _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event);
 
 /* local subsystem globals */
 static Ecore_Ipc_Server *_e_ipc_server = NULL;
@@ -71,7 +71,7 @@ e_ipc_init(void)
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _e_ipc_cb_client_add, NULL);
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _e_ipc_cb_client_del, NULL);
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _e_ipc_cb_client_data, NULL);
-
+   
    e_ipc_codec_init();
 #endif   
    return 1;
@@ -131,14 +131,53 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
       case E_IPC_DOMAIN_REQUEST:
       case E_IPC_DOMAIN_REPLY:
       case E_IPC_DOMAIN_EVENT:
-	switch (e->minor)
-	  {
-#define TYPE  E_WM_IN
-#include "e_ipc_handlers.h"
-#undef TYPE	
-	   default:
-	     break;
-	  }
+        switch (e->minor)
+          {
+          case E_IPC_OP_EXEC_ACTION:
+               {
+                  E_Ipc_2Str *req = NULL;
+                  
+                  if (e_ipc_codec_2str_dec(e->data, e->size, &req))
+                    {
+                       Eina_List *m = e_manager_list();
+                       int len, ok = 0;
+                       void *d;
+                       
+                       if (m)
+                         {
+                            E_Manager *man = eina_list_data_get(m);
+                            
+                            if (man)
+                              {
+                                 E_Action *act = e_action_find(req->str1);
+                                 
+                                 if (act && act->func.go)
+                                   {
+                                      act->func.go(E_OBJECT(man), req->str2);
+                                      ok = 1;
+                                   }
+                              }
+                         }
+                       
+                       d = e_ipc_codec_int_enc(ok, &len);
+                       if (d)
+                         {
+                            ecore_ipc_client_send(e->client, 
+                                                  E_IPC_DOMAIN_REPLY, 
+                                                  E_IPC_OP_EXEC_ACTION_REPLY, 
+                                                  0, 0, 0, d, len);
+                            free(d);
+                         }
+                       
+                       E_FREE(req->str1);
+                       E_FREE(req->str2);
+                       E_FREE(req);
+                    }
+               }
+             break;
+          default:
+             break;
+          }
 	break;
       case E_IPC_DOMAIN_THUMB:
 	e_thumb_client_data(e);
diff --git a/src/bin/e_ipc.h b/src/bin/e_ipc.h
index d2e8036..b8b912f 100644
--- a/src/bin/e_ipc.h
+++ b/src/bin/e_ipc.h
@@ -4,8 +4,10 @@
 #ifdef E_TYPEDEFS
 
 #ifdef USE_IPC
-#include      "e_ipc_handlers_list.h"
 
+#define E_IPC_OP_EXEC_ACTION 386
+#define E_IPC_OP_EXEC_ACTION_REPLY 387
+  
 typedef enum _E_Ipc_Domain
 {
    E_IPC_DOMAIN_NONE,
diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c
index b25eccf..5a8f122 100644
--- a/src/bin/e_ipc_codec.c
+++ b/src/bin/e_ipc_codec.c
@@ -28,71 +28,58 @@ static Eet_Data_Descriptor *_e_ipc_3int_3str_list_edd = NULL;
 static Eet_Data_Descriptor *_e_ipc_str_4int_edd = NULL;
 static Eet_Data_Descriptor *_e_ipc_str_4int_list_edd = NULL;
 
-static void *
-_e_ipc_codec_eina_hash_add(void *hash, const void *key, void *data)
-{
-   Eina_Hash *result = hash;
-
-   if (!result) result = eina_hash_string_superfast_new(NULL);
-   if (!result) return NULL;
-
-   eina_hash_add(result, key, data);
-   return result;
-}
-
-#define E_IPC_DD_NEW(str, typ) \
-   eet_data_descriptor_new(str, sizeof(typ), \
-			      (void *(*) (void *))eina_list_next, \
-			      (void *(*) (void *, void *))eina_list_append, \
-			      (void *(*) (void *))eina_list_data_get, \
-			      (void *(*) (void *))eina_list_free, \
-                              (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))eina_hash_foreach, \
-			      (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \
-			      (void  (*) (void *))eina_hash_free)
+#define E_IPC_DD(Edd, Eddc, Name, Type)		\
+  Eddc.name = Name;				\
+  Eddc.size = sizeof (Type);			\
+  Edd = eet_data_descriptor_stream_new(&Eddc);
 
 /* externally accessible functions */
 EAPI int
 e_ipc_codec_init(void)
 {
-   _e_ipc_int_edd = E_IPC_DD_NEW("int", E_Ipc_Int);
+   Eet_Data_Descriptor_Class eddc;
+
+   if (!eet_eina_stream_data_descriptor_class_set(&eddc, "int", sizeof (E_Ipc_Int)))
+     return 0;
+   _e_ipc_int_edd = eet_data_descriptor_stream_new(&eddc);
    E_CONFIG_VAL(_e_ipc_int_edd, E_Ipc_Int, val, INT);
 
-   _e_ipc_double_edd = E_IPC_DD_NEW("double", E_Ipc_Double);
+   E_IPC_DD(_e_ipc_double_edd, eddc, "double", E_Ipc_Double);
    E_CONFIG_VAL(_e_ipc_double_edd, E_Ipc_Double, val, DOUBLE);
-   
-   _e_ipc_2int_edd = E_IPC_DD_NEW("2int", E_Ipc_2Int);
+
+   E_IPC_DD(_e_ipc_2int_edd, eddc, "2int", E_Ipc_2Int);
    E_CONFIG_VAL(_e_ipc_2int_edd, E_Ipc_2Int, val1, INT);
    E_CONFIG_VAL(_e_ipc_2int_edd, E_Ipc_2Int, val2, INT);
 
-   _e_ipc_str_edd = E_IPC_DD_NEW("str", E_Ipc_Str);
+   E_IPC_DD(_e_ipc_str_edd, eddc, "str", E_Ipc_Str);
    E_CONFIG_VAL(_e_ipc_str_edd, E_Ipc_Str, str, STR);
 
-   _e_ipc_str_list_edd = E_IPC_DD_NEW("str_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_str_list_edd, eddc, "str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_str_list_edd, E_Ipc_List, list, _e_ipc_str_edd);
 
-   _e_ipc_2str_edd = E_IPC_DD_NEW("2str", E_Ipc_2Str);
+   E_IPC_DD(_e_ipc_2str_edd, eddc, "2str", E_Ipc_2Str);
    E_CONFIG_VAL(_e_ipc_2str_edd, E_Ipc_2Str, str1, STR);
    E_CONFIG_VAL(_e_ipc_2str_edd, E_Ipc_2Str, str2, STR);
-   
-   _e_ipc_2str_list_edd = E_IPC_DD_NEW("2str_list", E_Ipc_List);
+
+   E_IPC_DD(_e_ipc_2str_list_edd, eddc, "2str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_2str_list_edd, E_Ipc_List, list, _e_ipc_2str_edd);
 
-   _e_ipc_str_int_edd = E_IPC_DD_NEW("str_int", E_Ipc_Str_Int);
+   E_IPC_DD(_e_ipc_str_int_edd, eddc, "str_int", E_Ipc_Str_Int);
    E_CONFIG_VAL(_e_ipc_str_int_edd, E_Ipc_Str_Int, str, STR);
    E_CONFIG_VAL(_e_ipc_str_int_edd, E_Ipc_Str_Int, val, INT);
-   
-   _e_ipc_str_int_list_edd = E_IPC_DD_NEW("str_int_list", E_Ipc_List);
+
+   E_IPC_DD(_e_ipc_str_int_list_edd, eddc, "str_int_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_str_int_list_edd, E_Ipc_List, list, _e_ipc_str_int_edd);
 
-   _e_ipc_2str_int_edd = E_IPC_DD_NEW("2str_int", E_Ipc_2Str_Int);
+   E_IPC_DD(_e_ipc_2str_int_edd, eddc, "2str_int", E_Ipc_2Str_Int);
    E_CONFIG_VAL(_e_ipc_2str_int_edd, E_Ipc_2Str_Int, str1, STR);
    E_CONFIG_VAL(_e_ipc_2str_int_edd, E_Ipc_2Str_Int, str2, STR);
    E_CONFIG_VAL(_e_ipc_2str_int_edd, E_Ipc_2Str_Int, val, INT);
-   
-   _e_ipc_2str_int_list_edd = E_IPC_DD_NEW("2str_int_list", E_Ipc_List);
+
+   E_IPC_DD(_e_ipc_2str_int_list_edd, eddc, "2str_int_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_2str_int_list_edd, E_Ipc_List, list, _e_ipc_2str_int_edd);
-   
-   _e_ipc_4int_2str_edd = E_IPC_DD_NEW("4int_2str", E_Ipc_4Int_2Str);
+
+   E_IPC_DD(_e_ipc_4int_2str_edd, eddc, "4int_2str", E_Ipc_4Int_2Str);
    E_CONFIG_VAL(_e_ipc_4int_2str_edd, E_Ipc_4Int_2Str, val1, INT);
    E_CONFIG_VAL(_e_ipc_4int_2str_edd, E_Ipc_4Int_2Str, val2, INT);
    E_CONFIG_VAL(_e_ipc_4int_2str_edd, E_Ipc_4Int_2Str, val3, INT);
@@ -100,10 +87,10 @@ e_ipc_codec_init(void)
    E_CONFIG_VAL(_e_ipc_4int_2str_edd, E_Ipc_4Int_2Str, str1, STR);
    E_CONFIG_VAL(_e_ipc_4int_2str_edd, E_Ipc_4Int_2Str, str2, STR);
 
-   _e_ipc_4int_2str_list_edd = E_IPC_DD_NEW("4int_2str_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_4int_2str_list_edd, eddc, "4int_2str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_4int_2str_list_edd, E_Ipc_List, list, _e_ipc_4int_2str_edd);
 
-   _e_ipc_5int_2str_edd = E_IPC_DD_NEW("5int_2str", E_Ipc_5Int_2Str);
+   E_IPC_DD(_e_ipc_5int_2str_edd, eddc, "5int_2str", E_Ipc_5Int_2Str);
    E_CONFIG_VAL(_e_ipc_5int_2str_edd, E_Ipc_5Int_2Str, val1, INT);
    E_CONFIG_VAL(_e_ipc_5int_2str_edd, E_Ipc_5Int_2Str, val2, INT);
    E_CONFIG_VAL(_e_ipc_5int_2str_edd, E_Ipc_5Int_2Str, val3, INT);
@@ -112,10 +99,10 @@ e_ipc_codec_init(void)
    E_CONFIG_VAL(_e_ipc_5int_2str_edd, E_Ipc_5Int_2Str, str1, STR);
    E_CONFIG_VAL(_e_ipc_5int_2str_edd, E_Ipc_5Int_2Str, str2, STR);
 
-   _e_ipc_5int_2str_list_edd = E_IPC_DD_NEW("5int_2str_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_5int_2str_list_edd, eddc, "5int_2str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_5int_2str_list_edd, E_Ipc_List, list, _e_ipc_5int_2str_edd);
 
-   _e_ipc_3int_4str_edd = E_IPC_DD_NEW("3int_4str", E_Ipc_3Int_4Str);
+   E_IPC_DD(_e_ipc_3int_4str_edd, eddc, "3int_4str", E_Ipc_3Int_4Str);
    E_CONFIG_VAL(_e_ipc_3int_4str_edd, E_Ipc_3Int_4Str, val1, INT);
    E_CONFIG_VAL(_e_ipc_3int_4str_edd, E_Ipc_3Int_4Str, val2, INT);
    E_CONFIG_VAL(_e_ipc_3int_4str_edd, E_Ipc_3Int_4Str, val3, INT);
@@ -124,10 +111,10 @@ e_ipc_codec_init(void)
    E_CONFIG_VAL(_e_ipc_3int_4str_edd, E_Ipc_3Int_4Str, str3, STR);
    E_CONFIG_VAL(_e_ipc_3int_4str_edd, E_Ipc_3Int_4Str, str4, STR);
 
-   _e_ipc_3int_4str_list_edd = E_IPC_DD_NEW("3int_4str_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_3int_4str_list_edd, eddc, "3int_4str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_3int_4str_list_edd, E_Ipc_List, list, _e_ipc_3int_4str_edd);
 
-   _e_ipc_3int_3str_edd = E_IPC_DD_NEW("3int_3str", E_Ipc_3Int_3Str);
+   E_IPC_DD(_e_ipc_3int_3str_edd, eddc, "3int_3str", E_Ipc_3Int_3Str);
    E_CONFIG_VAL(_e_ipc_3int_3str_edd, E_Ipc_3Int_3Str, val1, INT);
    E_CONFIG_VAL(_e_ipc_3int_3str_edd, E_Ipc_3Int_3Str, val2, INT);
    E_CONFIG_VAL(_e_ipc_3int_3str_edd, E_Ipc_3Int_3Str, val3, INT);
@@ -135,17 +122,17 @@ e_ipc_codec_init(void)
    E_CONFIG_VAL(_e_ipc_3int_3str_edd, E_Ipc_3Int_3Str, str2, STR);
    E_CONFIG_VAL(_e_ipc_3int_3str_edd, E_Ipc_3Int_3Str, str3, STR);
 
-   _e_ipc_3int_3str_list_edd = E_IPC_DD_NEW("3int_3str_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_3int_3str_list_edd, eddc, "3int_3str_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_3int_3str_list_edd, E_Ipc_List, list, _e_ipc_3int_3str_edd);
 
-   _e_ipc_str_4int_edd = E_IPC_DD_NEW("str_4int", E_Ipc_Str_4Int);
+   E_IPC_DD(_e_ipc_str_4int_edd, eddc, "str_4int", E_Ipc_Str_4Int);
    E_CONFIG_VAL(_e_ipc_str_4int_edd, E_Ipc_Str_4Int, str, STR);
    E_CONFIG_VAL(_e_ipc_str_4int_edd, E_Ipc_Str_4Int, val1, INT);
    E_CONFIG_VAL(_e_ipc_str_4int_edd, E_Ipc_Str_4Int, val2, INT);
    E_CONFIG_VAL(_e_ipc_str_4int_edd, E_Ipc_Str_4Int, val3, INT);
    E_CONFIG_VAL(_e_ipc_str_4int_edd, E_Ipc_Str_4Int, val4, INT);
 
-   _e_ipc_str_4int_list_edd = E_IPC_DD_NEW("str_4int_list", E_Ipc_List);
+   E_IPC_DD(_e_ipc_str_4int_list_edd, eddc, "str_4int_list", E_Ipc_List);
    E_CONFIG_LIST(_e_ipc_str_4int_list_edd, E_Ipc_List, list, _e_ipc_str_4int_edd);
 
    return 1;
@@ -315,23 +302,17 @@ e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest)
 {
    E_Ipc_List *dat;
    Eina_List *list = NULL, *l;
+   E_Ipc_Str *str_node;
    
    if (!data) return 0;
    dat = eet_data_descriptor_decode(_e_ipc_str_list_edd, data, bytes);
    if (!dat) return 0;
-   for (l = dat->list; l; l = l->next)
+   EINA_LIST_FOREACH(dat->list, l, str_node)
      {
-        E_Ipc_Str *str_node;
-	
-        str_node = l->data;
 	list = eina_list_append(list, str_node->str);
      }
    if (dest) *dest = list;
-   while (dat->list)
-     {
-	free(dat->list->data);
-	dat->list = eina_list_remove_list(dat->list, dat->list);
-     }
+   E_FREE_LIST(dat->list, free);
    free(dat);
    return 1;
 }
@@ -341,23 +322,19 @@ e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret)
 {
    E_Ipc_List dat;
    Eina_List *l;
+   E_Ipc_Str *str_node;
+   char *str;
    void *data;
    
    dat.list = NULL;
-   for (l = list; l; l = l->next)
+   EINA_LIST_FOREACH(list, l, str)
      {
-	E_Ipc_Str *str_node;
-	
 	str_node = malloc(sizeof(E_Ipc_Str));
-	str_node->str = l->data;
+	str_node->str = str;
 	dat.list = eina_list_append(dat.list, str_node);
      }
    data = eet_data_descriptor_encode(_e_ipc_str_list_edd, &dat, size_ret);
-   while (dat.list)
-     {
-	free(dat.list->data);
-	dat.list = eina_list_remove_list(dat.list, dat.list);
-     }
+   E_FREE_LIST(dat.list, free);
    return data;
 }
 
diff --git a/src/bin/e_ipc_handlers.h b/src/bin/e_ipc_handlers.h
deleted file mode 100644
index 0e4ad12..0000000
--- a/src/bin/e_ipc_handlers.h
+++ /dev/null
@@ -1,7729 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-/* NOTE:
- * 
- * This is a very SPECIAL file. This serves as a kind of "auto code generator"
- * to handle the encoder, decoder etc. aspects of ipc requests. the aim here
- * is to make writing support for a new opcode simple and compact. It intends
- * to centralize the handling into 1 spot, instead of having ti spread around
- * the code in N different places, as well as providing common construct macros
- * to help make the code more compact and easier to create.
- */
-
-/* This is a bunch of convenience stuff for this to work */
-#ifndef E_IPC_HANDLERS_H
-# define E_IPC_HANDLERS_H
-
-/* 
- * add a new ooption for enlightenment_remote
- * OP(opt, num_params, description, num_expected_replies, HDL) 
- */
-# define OP(__a, __b, __c, __d, __e) \
-     {__a, __b, __c, __d, __e},
-
-
-# define STRING(__str, HDL) \
-case HDL: \
-if (e->data) { \
-   char *__str = NULL; \
-   if (e_ipc_codec_str_dec(e->data, e->size, &__str)) {
-# define END_STRING(__str) \
-      E_FREE(__str); \
-   } \
-} \
-break;
-
-/**
- * STRING2:
- * decode event data of type E_Ipc_2Str
- */
-# define STRING2(__str1, __str2, __2str, HDL) \
-case HDL: \
-if (e->data) { \
-   char *__str1 = NULL, *__str2 = NULL; \
-   E_Ipc_2Str *__2str = NULL; \
-   __2str = calloc(1, sizeof(E_Ipc_2Str)); \
-   if (e_ipc_codec_2str_dec(e->data, e->size, &(__2str))) { \
-      __str1 = __2str->str1; \
-      __str2 = __2str->str2;
-# define END_STRING2(__2str) \
-      E_FREE(__2str->str1); \
-      E_FREE(__2str->str2); \
-      free(__2str); \
-   } \
-} \
-break;
-
-/**
- * INT3_STRING3:
- * Decode event data of type E_Ipc_3Int_3Str
- */
-# define INT3_STRING3(__3int_3str, HDL) \
-case HDL: \
-if (e->data) { \
-   E_Ipc_3Int_3Str *__3int_3str = NULL; \
-   __3int_3str = calloc(1, sizeof(E_Ipc_3Int_3Str)); \
-   if (e_ipc_codec_3int_3str_dec(e->data, e->size, &(__3int_3str))) {
-# define END_INT3_STRING3(__3int_3str) \
-      E_FREE(__3int_3str->str1); \
-      E_FREE(__3int_3str->str2); \
-      E_FREE(__3int_3str->str3); \
-      free(__3int_3str); \
-   } \
-} \
-break;
-
-/**
- * INT4_STRING2:
- * Decode event data of type E_Ipc_4Int_2Str
- */
-# define INT4_STRING2(__4int_2str, HDL) \
-case HDL: \
-if (e->data) { \
-   E_Ipc_4Int_2Str *__4int_2str = NULL; \
-   __4int_2str = calloc(1, sizeof(E_Ipc_4Int_2Str)); \
-   if (e_ipc_codec_4int_2str_dec(e->data, e->size, &(__4int_2str))) {
-# define END_INT4_STRING2(__4int_2str) \
-      E_FREE(__4int_2str->str1); \
-      E_FREE(__4int_2str->str2); \
-      free(__4int_2str); \
-   } \
-} \
-break;
-
-/**
- * INT5_STRING2:
- * Decode event data of type E_Ipc_5Int_2Str
- */
-# define INT5_STRING2(__5int_2str, HDL) \
-case HDL: \
-if (e->data) { \
-   E_Ipc_5Int_2Str *__5int_2str = NULL; \
-   __5int_2str = calloc(1, sizeof(E_Ipc_5Int_2Str)); \
-   if (e_ipc_codec_5int_2str_dec(e->data, e->size, &(__5int_2str))) {
-# define END_INT5_STRING2(__5int_2str) \
-      E_FREE(__5int_2str->str1); \
-      E_FREE(__5int_2str->str2); \
-      free(__5int_2str); \
-   } \
-} \
-break;
-
-/**
- * INT3_STRING4:
- * Decode event data of type E_Ipc_4Int_2Str
- */
-# define INT3_STRING4(__3int_4str, HDL) \
-case HDL: \
-if (e->data) { \
-   E_Ipc_3Int_4Str *__3int_4str = NULL; \
-   __3int_4str = calloc(1, sizeof(E_Ipc_3Int_4Str)); \
-   if (e_ipc_codec_3int_4str_dec(e->data, e->size, &(__3int_4str))) {
-# define END_INT3_STRING4(__3int_4str) \
-      E_FREE(__3int_4str->str1); \
-      E_FREE(__3int_4str->str2); \
-      E_FREE(__3int_4str->str3); \
-      E_FREE(__3int_4str->str4); \
-      free(__3int_4str); \
-   } \
-} \
-break;
-
-# define STRING2_INT(__str1, __str2, __int, __2str_int, HDL) \
-case HDL: \
-if (e->data) { \
-   char *__str1 = NULL, *__str2 = NULL; \
-   int __int; \
-   E_Ipc_2Str_Int *__2str_int = NULL; \
-   __2str_int = calloc(1, sizeof(E_Ipc_2Str_Int)); \
-   if (e_ipc_codec_2str_int_dec(e->data, e->size, &(__2str_int))) { \
-      __str1 = __2str_int->str1; \
-      __str2 = __2str_int->str2; \
-      __int  = __2str_int->val;
-# define END_STRING2_INT(__2str_int) \
-      E_FREE(__2str_int->str1); \
-      E_FREE(__2str_int->str2); \
-      free(__2str_int); \
-   } \
-} \
-break;
-
-# define START_DOUBLE(__dbl, HDL) \
-case HDL: \
-if (e->data) { \
-   double __dbl = 0.0; \
-   if (e_ipc_codec_double_dec(e->data, e->size, &(__dbl))) {
-# define END_DOUBLE \
-   } \
-} \
-break;
-
-# define START_INT(__int, HDL) \
-case HDL: \
-if (e->data) { \
-   int __int = 0; \
-   if (e_ipc_codec_int_dec(e->data, e->size, &(__int))) {
-# define END_INT \
-   } \
-} \
-break;
-
-# define START_2INT(__int1, __int2, HDL) \
-case HDL: \
-if (e->data) { \
-   int __int1 = 0; \
-   int __int2 = 0; \
-   if (e_ipc_codec_2int_dec(e->data, e->size, &(__int1), &(__int2))) {
-# define END_2INT \
-   } \
-} \
-break;
-
-# define STRING_4INT(__str, __int1, __int2, __int3, __int4, __str_4int, HDL) \
-case HDL: \
-if (e->data) { \
-   char *__str = NULL; \
-   int __int1, __int2, __int3, __int4; \
-   E_Ipc_Str_4Int *__str_4int = NULL; \
-   __str_4int = calloc(1, sizeof(E_Ipc_Str_4Int)); \
-   if (e_ipc_codec_str_4int_dec(e->data, e->size, &(__str_4int))) { \
-      __str  = __str_4int->str; \
-      __int1 = __str_4int->val1; \
-      __int2 = __str_4int->val2; \
-      __int3 = __str_4int->val3; \
-      __int4 = __str_4int->val4; 
-# define END_STRING_4INT(__str_4int) \
-      E_FREE(__str_4int->str); \
-      free(__str_4int); \
-   } \
-} \
-break;
-
-
-/**
- * Get event data for libe processing
- */
-# define RESPONSE(__res, __store) \
-   __store *__res = calloc(1, sizeof(__store)); \
-   if (e->data) {
-#define END_RESPONSE(__res, __type) \
-   } \
-   ecore_event_add(__type, __res, NULL, NULL);
-#define END_RESPONSE_CALLBACK(__res, __type, __callback) \
-   } \
-   ecore_event_add(__type, __res, __callback, NULL);
-
-# define SAVE e_config_save_queue()
-
-# define REQ_STRING(__str, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_str_enc(__str, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_2STRING(__str1, __str2, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_2str_enc(__str1, __str2, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-#define REQ_2INT_START(HDL) \
-case HDL: { void *data; int bytes; \
-
-#define REQ_2INT_END(__val1, __val2, HDL) \
-   data = e_ipc_codec_2int_enc(__val1, __val2, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-#define REQ_3INT_3STRING_START(HDL) \
-case HDL: { void *data; int bytes; \
-
-#define REQ_3INT_3STRING_END(__val1, __val2, __val3, __str1, __str2, __str3, HDL) \
-   data = e_ipc_codec_3int_3str_enc(__val1, __val2, __val3, __str1, __str2, __str3, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-#define REQ_4INT_2STRING_START(HDL) \
-case HDL: { void *data; int bytes; \
-
-#define REQ_4INT_2STRING_END(__val1, __val2, __val3, __val4, __str1, __str2, HDL) \
-   data = e_ipc_codec_4int_2str_enc(__val1, __val2, __val3, __val4, __str1, __str2, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-#define REQ_5INT_2STRING_START(HDL) \
-case HDL: { void *data; int bytes; \
-
-#define REQ_5INT_2STRING_END(__val1, __val2, __val3, __val4, __val5, __str1, __str2, HDL) \
-   data = e_ipc_codec_5int_2str_enc(__val1, __val2, __val3, __val4, __val5, __str1, __str2, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-#define REQ_3INT_4STRING_START(HDL) \
-case HDL: { void *data; int bytes; \
-
-#define REQ_3INT_4STRING_END(__val1, __val2, __val3, __str1, __str2, __str3, __str4, HDL) \
-   data = e_ipc_codec_3int_4str_enc(__val1, __val2, __val3, __str1, __str2, __str3, __str4, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_2STRING_INT(__str1, __str2, __int, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_2str_int_enc(__str1, __str2, __int, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_STRING_4INT(__str, __int1, __int2, __int3, __int4, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_str_4int_enc(__str, __int1, __int2, __int3, __int4, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_DOUBLE(__dbl, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_double_enc(__dbl, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_INT_START(HDL) \
-case HDL: { void *data; int bytes;
-
-# define REQ_INT_END(__int, HDL) \
-   data = e_ipc_codec_int_enc(__int, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_INT(__int, HDL) \
-   REQ_INT_START(HDL) \
-   REQ_INT_END(__int, HDL)
-
-# define REQ_2INT(__int1, __int2, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_2int_enc(__int1, __int2, &bytes); \
-   if (data) { \
-      ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define REQ_NULL(HDL) \
-case HDL: \
-   ecore_ipc_server_send(e->server, E_IPC_DOMAIN_REQUEST, HDL, 0, 0, 0, NULL, 0); \
-break;
-
-# define FREE_LIST(__list) \
-while (__list) { \
-   free(__list->data); \
-   __list = eina_list_remove_list(__list, __list); \
-}
-
-# define SEND_DATA(__opcode) \
-ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, __opcode, 0, 0, 0, data, bytes); \
-free(data);
-
-# define STRING_INT_LIST(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_str_int_list_dec(e->data, e->size, &dat)) { \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_Str_Int *__v; \
-	  __v = l->data;
-#define END_STRING_INT_LIST(__v) \
-	  E_FREE(__v->str); \
-	  free(__v); \
-       } \
-       eina_list_free(dat); \
-    } \
- } \
-   break;
-
-#define SEND_STRING_INT_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_Str_Int *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_Str_Int));
-#define END_SEND_STRING_INT_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_str_int_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-/**
- * INT3_STRING3:
- * Decode event data is a list of E_Ipc_3Int_3Str objects and iterate
- * the list. For each iteration the object __v will contain a decoded list
- * element.
- *
- * Use END_INT3_STRING3_LIST to terminate the loop and free all data. 
- */
-#define INT3_STRING3_LIST(__v, HDL) \
-   INT3_STRING3_LIST_START(__v, HDL) \
-   INT3_STRING3_LIST_ITERATE(__v)
-
-#define INT3_STRING3_LIST_START(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_3int_3str_list_dec(e->data, e->size, &dat)) {
-#define INT3_STRING3_LIST_ITERATE(__v) \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_3Int_3Str *__v; \
-	  __v = l->data;
-#define END_INT3_STRING3_LIST(__v) \
-   END_INT3_STRING3_LIST_ITERATE(__v) \
-   END_INT3_STRING3_LIST_START()
-
-#define END_INT3_STRING3_LIST_ITERATE(__v) \
-          E_FREE(__v->str1); \
-          E_FREE(__v->str2); \
-          E_FREE(__v->str3); \
-          free(__v); \
-       } 
-#define END_INT3_STRING3_LIST_START() \
-       eina_list_free(dat); \
-    } \
- } \
-  break;
-
-/** 
- * SEND_INT3_STRING3_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_3Int_3Str. 
- *
- * Use END_SEND_INT3_STRING3_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_INT3_STRING3_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_3Int_3Str *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_3Int_3Str));
-#define END_SEND_INT3_STRING3_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_3int_3str_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-/**
- * INT4_STRING2:
- * Decode event data is a list of E_Ipc_4Int_2Str objects and iterate
- * the list. For each iteration the object __v will contain a decoded list
- * element.
- *
- * Use END_INT4_STRING2_LIST to terminate the loop and free all data. 
- */
-#define INT4_STRING2_LIST(__v, HDL) \
-   INT4_STRING2_LIST_START(__v, HDL) \
-   INT4_STRING2_LIST_ITERATE(__v)
-
-#define INT4_STRING2_LIST_START(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_4int_2str_list_dec(e->data, e->size, &dat)) { 
-#define INT4_STRING2_LIST_ITERATE(__v) \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_4Int_2Str *__v; \
-	  __v = l->data;
-#define END_INT4_STRING2_LIST(__v) \
-   END_INT4_STRING2_LIST_ITERATE(__v) \
-   END_INT4_STRING2_LIST_START()
-
-#define END_INT4_STRING2_LIST_ITERATE(__v) \
-          E_FREE(__v->str1); \
-          E_FREE(__v->str2); \
-          free(__v); \
-       } \
-       eina_list_free(dat);
-#define END_INT4_STRING2_LIST_START() \
-    } \
- } \
-  break;
-
-/** 
- * SEND_INT4_STRING2_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_4Int_2Str. 
- *
- * Use END_SEND_INT4_STRING2_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_INT4_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_4Int_2Str *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_4Int_2Str));
-#define END_SEND_INT4_STRING2_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_4int_2str_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-/**
- * INT5_STRING2:
- * Decode event data is a list of E_Ipc_5Int_2Str objects and iterate
- * the list. For each iteration the object __v will contain a decoded list
- * element.
- *
- * Use END_INT5_STRING2_LIST to terminate the loop and free all data. 
- */
-#define INT5_STRING2_LIST(__v, HDL) \
-   INT5_STRING2_LIST_START(__v, HDL) \
-   INT5_STRING2_LIST_ITERATE(__v)
-
-#define INT5_STRING2_LIST_START(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_5int_2str_list_dec(e->data, e->size, &dat)) { 
-#define INT5_STRING2_LIST_ITERATE(__v) \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_5Int_2Str *__v; \
-	  __v = l->data;
-#define END_INT5_STRING2_LIST(__v) \
-   END_INT5_STRING2_LIST_ITERATE(__v) \
-   END_INT5_STRING2_LIST_START()
-
-#define END_INT5_STRING2_LIST_ITERATE(__v) \
-          E_FREE(__v->str1); \
-          E_FREE(__v->str2); \
-          free(__v); \
-       } \
-       eina_list_free(dat);
-#define END_INT5_STRING2_LIST_START() \
-    } \
- } \
-  break;
-
-/** 
- * SEND_INT5_STRING2_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_5Int_2Str. 
- *
- * Use END_SEND_INT5_STRING2_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_INT5_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_5Int_2Str *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_5Int_2Str));
-#define END_SEND_INT5_STRING2_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_5int_2str_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-/**
- * INT3_STRING4:
- * Decode event data is a list of E_Ipc_3Int_4Str objects and iterate
- * the list. For each iteration the object __v will contain a decoded list
- * element.
- *
- * Use END_INT3_STRING4_LIST to terminate the loop and free all data. 
- */
-#define INT3_STRING4_LIST(__v, HDL) \
-   INT3_STRING4_LIST_START(__v, HDL) \
-   INT3_STRING4_LIST_ITERATE(__v)
-
-#define INT3_STRING4_LIST_START(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_3int_4str_list_dec(e->data, e->size, &dat)) { 
-#define INT3_STRING4_LIST_ITERATE(__v) \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_3Int_4Str *__v; \
-	  __v = l->data;
-#define END_INT3_STRING4_LIST(__v) \
-   END_INT3_STRING4_LIST_ITERATE(__v) \
-   END_INT3_STRING4_LIST_START()
-
-#define END_INT3_STRING4_LIST_ITERATE(__v) \
-          E_FREE(__v->str1); \
-          E_FREE(__v->str2); \
-          E_FREE(__v->str3); \
-          E_FREE(__v->str4); \
-          free(__v); \
-       } \
-       eina_list_free(dat);
-#define END_INT3_STRING4_LIST_START() \
-    } \
- } \
-  break;
-
-/** 
- * SEND_INT3_STRING4_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_3Int_4Str. 
- *
- * Use END_SEND_INT3_STRING4_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_INT3_STRING4_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_3Int_4Str *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_3Int_4Str));
-#define END_SEND_INT3_STRING4_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_3int_4str_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-# define STRING_INT4_LIST(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_str_4int_list_dec(e->data, e->size, &dat)) { \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_Str_4Int *__v; \
-	  __v = l->data;
-#define END_STRING_INT4_LIST(__v) \
-	  E_FREE(__v->str); \
-	  free(__v); \
-       } \
-       eina_list_free(dat); \
-    } \
- } \
-   break;
-
-/** 
- * SEND_STRING_INT4_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_Str_4Int. 
- *
- * Use END_SEND_STRING_INT4_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_STRING_INT4_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_Str_4Int *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_Str_4Int));
-#define END_SEND_STRING_INT4_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_str_4int_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-
-/**
- * STRING2_INT_LIST:
- * Decode event data which is a list of E_Ipc_2Str_Int objects and iterate 
- * the list. For each iteration the object __v will contain a decoded list
- * element. 
- *
- * Use END_STRING2_INT_LIST to terminate the loop and free all data.
- */
-#define STRING2_INT_LIST(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_2str_int_list_dec(e->data, e->size, &dat)) { \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_2Str_Int *__v; \
-	  __v = l->data;
-#define END_STRING2_INT_LIST(__v) \
-	  E_FREE(__v->str1); \
-	  E_FREE(__v->str2); \
-	  free(__v); \
-       } \
-       eina_list_free(dat); \
-    } \
- } \
-   break;
-
-/** 
- * SEND_STRING2_INT_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_2Str_Int. 
- *
- * Use END_SEND_STRING2_INT_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_STRING2_INT_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_2Str_Int *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_2Str_Int));
-#define END_SEND_STRING2_INT_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_2str_int_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-/**
- * STRING2_LIST:
- * Decode event data which is a list of E_Ipc_2Str objects and iterate 
- * the list. For each iteration the object __v will contain a decoded list
- * element. 
- *
- * Use END_STRING2_LIST to terminate the loop and free all data.
- */
-#define STRING2_LIST(__v, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    if (e_ipc_codec_2str_list_dec(e->data, e->size, &dat)) { \
-       for (l = dat; l; l = l->next) { \
-	  E_Ipc_2Str *__v; \
-	  __v = l->data;
-#define END_STRING2_LIST(__v) \
-	  E_FREE(__v->str1); \
-	  E_FREE(__v->str2); \
-	  free(__v); \
-       } \
-       eina_list_free(dat); \
-    } \
- } \
-   break;
-
-/** 
- * SEND_STRING2_LIST:
- * Start to encode a list of objects to prepare them for sending via
- * ipc. The object __v1 will be of type __typ1 and __v2 will be of type
- * E_Ipc_2Str. 
- *
- * Use END_SEND_STRING2_LIST to terminate the encode iteration and 
- * send that data. The list will be freed.
- */
-#define SEND_STRING2_LIST(__list, __typ1, __v1, __v2, HDL) \
- case HDL: { \
-    Eina_List *dat = NULL, *l; \
-    void *data; int bytes; \
-    for (l = __list; l; l = l->next) { \
-       __typ1 *__v1; \
-       E_Ipc_2Str *__v2; \
-       __v1 = l->data; \
-       __v2 = calloc(1, sizeof(E_Ipc_2Str));
-#define END_SEND_STRING2_LIST(__v1, __op) \
-       dat = eina_list_append(dat, __v1); \
-    } \
-    data = e_ipc_codec_2str_list_enc(dat, &bytes); \
-    SEND_DATA(__op); \
-    FREE_LIST(dat); \
- } \
-   break;
-
-
-#define SEND_STRING(__str, __op, HDL) \
-case HDL: { void *data; int bytes = 0; \
-   data = e_ipc_codec_str_enc(__str, &bytes); \
-   ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, __op, 0, 0, 0, data, bytes); \
-   E_FREE(data); \
-} \
-break;
-
-#define SEND_DOUBLE(__dbl, __op, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_double_enc(__dbl, &bytes); \
-   if (data) { \
-      ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, __op, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define SEND_INT(__int, __op, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_int_enc(__int, &bytes); \
-   if (data) { \
-      ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, __op, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-# define SEND_2INT(__int1, __int2,__op, HDL) \
-case HDL: { void *data; int bytes; \
-   data = e_ipc_codec_2int_enc(__int1, __int2, &bytes); \
-   if (data) { \
-      ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, __op, 0, 0, 0, data, bytes); \
-      free(data); \
-   } \
-} \
-break;
-
-/* 
-   Declare variables used when encoding that needs to first be 
-   constructed into a list using the FOR macro. The list to create
-   will be called 'dat' and the list to iterate will be l;
- */
-#define LIST_ENCODE_START() \
-   Eina_List *dat = NULL, *l; \
-   void *data; int bytes;
-
-/* 
-   Declare variables used by the encode macro. Is separate to allow
-   operations to be done between declairation and encoding. 
- */
-#define ENCODE_START() \
-   void *data; int bytes;
-
-#define ENCODE(__dat, __enc) \
-   data = __enc(__dat, &bytes);
-
-/*
-   Iterate an eina_list starting with the pointer to __start. l 
-   is the pointer to the current position in the list. 
- */
-#define FOR(__start) \
-   for (l = __start; l; l = l->next)
-#define GENERIC(HDL) \
- case HDL: {
-
-#define END_GENERIC() \
-   } \
-break;
-
-#define LIST() \
-   Eina_List *dat = NULL, *l;
-
-#define DECODE(__dec) \
-   if (__dec(e->data, e->size, &dat))
-
-# define E_PATH_GET(__path, __str) \
-   E_Path *__path = NULL; \
-   if (!strcmp(__str, "data")) \
-     __path = path_data; \
-   else if (!strcmp(__str, "images")) \
-     __path = path_images; \
-   else if (!strcmp(__str, "fonts")) \
-     __path = path_fonts; \
-   else if (!strcmp(__str, "themes")) \
-     __path = path_themes; \
-   else if (!strcmp(__str, "icons")) \
-     __path = path_icons; \
-   else if (!strcmp(__str, "modules")) \
-     __path = path_modules; \
-   else if (!strcmp(__str, "backgrounds")) \
-     __path = path_backgrounds; \
-   else if (!strcmp(__str, "messages")) \
-     __path = path_messages; 
-
-#endif
-
-
-
-
-
-
-
-
-
-
-/*
- * ****************
- * IPC handlers
- * ****************
- */
-
-/* what a handler looks like
- * 
- * E_REMOTE_OPTIONS
- *   OP(opt, num_params, description, num_expected_replies, HDL)
- * E_REMOTE_OUT
- *   ...
- * E_WM_IN
- *   ...
- * E_REMOTE_IN
- *   ...
- * E_LIB_IN
- *   ...
- */
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_LOAD
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-module-load", 1, "Loads the module named 'OPT1' into memory", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (!e_module_find(s)) {
-      e_module_new(s);
-      SAVE;
-   }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_UNLOAD
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-module-unload", 1, "Unloads the module named 'OPT1' from memory", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   E_Module *m;
-   if ((m = e_module_find(s))) {
-      e_module_disable(m);
-      e_object_del(E_OBJECT(m));
-      SAVE;
-   }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-   
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_ENABLE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-module-enable", 1, "Enable the module named 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   E_Module *m;
-   if ((m = e_module_find(s))) {
-      e_module_enable(m);
-      SAVE;
-   }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_DISABLE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-module-disable", 1, "Disable the module named 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   E_Module *m;
-   if ((m = e_module_find(s))) {
-      e_module_disable(m);
-      SAVE;
-   }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-module-list", 0, "List all loaded modules", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING_INT_LIST(e_module_list(), E_Module, mod, v, HDL);
-   v->str = (char *) mod->name;
-   v->val = mod->enabled;
-   END_SEND_STRING_INT_LIST(v, E_IPC_OP_MODULE_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_MODULE_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING_INT_LIST(v, HDL);
-   if (v->str) printf("REPLY: \"%s\" ENABLED %i\n", v->str, v->val);
-   else printf("REPLY: \"\" ENABLED %i\n", v->val);
-   END_STRING_INT_LIST(v);
-#elif (TYPE == E_LIB_IN)
-   GENERIC(HDL);
-   Eina_List *dat = NULL;
-   DECODE(e_ipc_codec_str_int_list_dec) {
-      LIST();
-      int count;
-      RESPONSE(r, E_Response_Module_List);
-
-      /* FIXME - this is a mess, needs to be merged into macros... */
-      count = eina_list_count(dat);
-      r->modules = malloc(sizeof(E_Response_Module_Data *) * count);
-      r->count = count;
-
-      count = 0;
-      FOR(dat) {
-	 E_Response_Module_Data *md;
-	 E_Ipc_Str_Int *v;
-	 
-	 v = l->data;
-	 md = malloc(sizeof(E_Response_Module_Data));
-	 
-	 md->name = v->str;
-	 md->enabled = v->val;
-	 r->modules[count] = md;
-	 count++;
-      }
-      END_RESPONSE_CALLBACK(r, E_RESPONSE_MODULE_LIST, _e_cb_module_list_free);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_BG_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-bg-set", 1, "Set the default background edje to the desktop background in the file 'OPT1' (must be a full path)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   /* TODO: Check if file exists */
-   if (e_config->desktop_default_background) eina_stringshare_del(e_config->desktop_default_background);
-   e_config->desktop_default_background = NULL;
-   if (s) e_config->desktop_default_background = eina_stringshare_add(s);
-   e_bg_update();
-   SAVE;
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_BG_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-bg-get", 0, "Get the default background edje file path", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->desktop_default_background, E_IPC_OP_BG_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_BG_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   if (s) printf("REPLY: \"%s\"\n", s);
-   else printf("REPLY: \"\"\n");
-   END_STRING(s);
-#elif (TYPE == E_LIB_IN)
-   STRING(s, HDL);
-   RESPONSE(r, E_Response_Background_Get);
-   if (s) r->file = strdup(s);
-   END_RESPONSE(r, E_RESPONSE_BACKGROUND_GET);
-   END_STRING(s);
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_AVAILABLE_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-available-list", 0, "List all available fonts", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   LIST_ENCODE_START();
-   E_Font_Available *fa;
-   Eina_List *fa_list;
-   fa_list = e_font_available_list();
-   FOR(fa_list) { fa = l->data;
-      dat = eina_list_append(dat, fa->name);
-   }
-   ENCODE(dat, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_FONT_AVAILABLE_LIST_REPLY);
-   eina_list_free(dat);
-   e_font_available_list_free(fa_list);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_AVAILABLE_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 if (l->data) printf("REPLY: \"%s\"\n", (char *)(l->data));
-	 else printf("REPLY: \"\"\n");
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_APPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-apply", 0, "Apply font settings changes", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   e_font_apply();
-   SAVE;
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
- 
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_APPEND
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP(	"-font-fallback-append", 
-	1 /*num_params*/, 
-	"Append OPT1 to the fontset", 
-	0 /*num_expected_replies*/, 
-	HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   e_font_fallback_append(s);
-   SAVE;   
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_PREPEND
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP(	"-font-fallback-prepend", 
-	1 /*num_params*/, 
-	"Prepend OPT1 to the fontset", 
-	0 /*num_expected_replies*/, 
-	HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   e_font_fallback_prepend(s);
-   SAVE;   
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-fallback-list", 0, "List the fallback fonts in order", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-
-   LIST_ENCODE_START();
-   E_Font_Fallback *ff;
-   FOR(e_config->font_fallbacks) { ff = l->data;
-      dat = eina_list_append(dat, ff->name);
-   }
-   ENCODE(dat, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_FONT_FALLBACK_LIST_REPLY);
-   eina_list_free(dat);
-
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 if (l->data) printf("REPLY: \"%s\"\n", (char *)(l->data));
-	 else printf("REPLY: \"\"\n");
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_REMOVE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-fallback-remove", 1, "Remove OPT1 from the fontset", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   e_font_fallback_remove(s);
-   SAVE;   
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-default-set", 3, "Set textclass (OPT1) font (OPT2) and size (OPT3)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2STRING_INT(params[0], params[1], atoi(params[2]), HDL) 
-#elif (TYPE == E_WM_IN)
-   STRING2_INT(text_class, font_name, font_size, e_2str_int, HDL);
-   /* TODO: Check if font_name (and text_class?) exists */
-   e_font_default_set(text_class, font_name, font_size);
-   SAVE;   
-   END_STRING2_INT(e_2str_int);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-default-get", 1, "List the default font associated with OPT1", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(text_class, HDL);
-   E_Font_Default *efd;
-   void *data;
-   int bytes;
-   
-   efd = e_font_default_get(text_class);
-   if (efd == NULL)
-     data = NULL;
-   else
-     data = e_ipc_codec_2str_int_enc(efd->text_class, efd->font, efd->size, &bytes);
-	
-   SEND_DATA(E_IPC_OP_FONT_DEFAULT_GET_REPLY);
-
-   END_STRING(text_class);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING2_INT(text_class, font_name, font_size, e_2str_int, HDL);
-   printf("REPLY: DEFAULT TEXT_CLASS=\"%s\" NAME=\"%s\" SIZE=%d\n",
-	  text_class, font_name, font_size); 
-   END_STRING2_INT(e_2str_int);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_REMOVE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-default-remove", 1, "Remove the default text class OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(text_class, HDL);
-   e_font_default_remove(text_class);
-   SAVE;
-   END_STRING(text_class);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-default-list", 0, "List all configured text classes", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING2_INT_LIST(e_font_default_list(), E_Font_Default, efd, v, HDL);
-   v->str1 = (char *) efd->text_class;
-   v->str2 = (char *) efd->font;
-   v->val  = efd->size;
-   END_SEND_STRING2_INT_LIST(v, E_IPC_OP_FONT_DEFAULT_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_DEFAULT_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING2_INT_LIST(v, HDL);
-   printf("REPLY: DEFAULT TEXT_CLASS=\"%s\" NAME=\"%s\" SIZE=%d\n", v->str1, v->str2, v->val);
-   END_STRING2_INT_LIST(v);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_FALLBACK_CLEAR
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-fallback-clear", 0, "Clear list of fallback fonts", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   e_font_fallback_clear();
-   SAVE;
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESTART
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-restart", 0, "Restart Enlightenment", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   e_sys_action_do(E_SYS_RESTART, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_SHUTDOWN
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-exit", 0, "Exit Enlightenment", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   e_sys_action_do(E_SYS_EXIT, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_LANG_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-lang-list", 0, "List all available languages", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   Eina_List *languages;
-   languages = e_intl_language_list();
-   ENCODE(languages, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_LANG_LIST_REPLY);
-   FREE_LIST(languages); 
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_LANG_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 if (l->data) printf("REPLY: \"%s\"\n", (char *)(l->data));
-         else printf("REPLY: \"\"\n");
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_LANG_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-lang-set", 1, "Set the current language to 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   /* TODO: Check if language exists */
-   if (e_config->language) eina_stringshare_del(e_config->language);
-   e_config->language = NULL;
-   if (s) e_config->language = eina_stringshare_add(s);
-   if ((e_config->language) && (e_config->language[0] != 0))
-     e_intl_language_set(e_config->language);
-   else
-     e_intl_language_set(NULL);
-   SAVE;
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_LANG_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-lang-get", 0, "Get the current language", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->language, E_IPC_OP_LANG_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_LANG_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   if (s) printf("REPLY: \"%s\"\n", s);
-   else printf("REPLY: \"\"\n");
-   END_STRING(s);
-#elif (TYPE == E_LIB_IN)
-   STRING(s, HDL);
-   RESPONSE(r, E_Response_Language_Get);
-   if (s) r->lang = strdup(s);
-   END_RESPONSE(r, E_RESPONSE_LANGUAGE_GET);
-   END_STRING(s);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DIRS_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-dirs-list", 1, "List the directory of type specified by 'OPT1', try 'themes'", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   LIST_ENCODE_START()
-   Eina_List *dir_list = NULL;
-   E_PATH_GET(path, s);
-   if (path)
-      dir_list = e_path_dir_list_get(path);
-     
-   E_Path_Dir *p;
-   if (s) {
-      dat = eina_list_append(dat, eina_stringshare_add(s));
-      FOR(dir_list) { p = l->data;
-	 dat = eina_list_append(dat, eina_stringshare_add(p->dir));
-      }
-   }
-
-   ENCODE(dat, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_DIRS_LIST_REPLY);
-   while (dat)
-     {
-	const char *dir;
-	
-	dir = dat->data;
-	eina_stringshare_del(dir);
-	dat = eina_list_remove_list(dat, dat);	
-     }
-   e_path_dir_list_free(dir_list);
-   END_STRING(s)
-#elif (TYPE == E_REMOTE_IN)
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DIRS_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-     FOR(dat) {
-       if (dat == l)
-	 printf("REPLY Listing for \"%s\"\n", (char *)(l->data));
-       else
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-     }
-     FREE_LIST(dat);
-   }
-   END_GENERIC();
-#elif (TYPE == E_LIB_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      int count;
-      char * type;
-      int res;
-
-      res = 0;
-      RESPONSE(r, E_Response_Dirs_List);
-
-      /* FIXME - this is a mess, needs to be merged into macros... */
-      count = eina_list_count(dat);
-      r->dirs = malloc(sizeof(char *) * count);
-      r->count = count - 1; /* leave off the "type" */
-
-      type = NULL;
-      count = 0;
-      FOR(dat) {
-	 if (dat == l)
-	   type = l->data;
-	 else {
-	   r->dirs[count] = l->data;
-	   count++;
-	 }
-      }
-
-      if (!strcmp(type, "data"))
-	res = E_RESPONSE_DATA_DIRS_LIST;
-      else if (!strcmp(type, "images"))
-	res = E_RESPONSE_IMAGE_DIRS_LIST;
-      else if (!strcmp(type, "fonts"))
-	res = E_RESPONSE_FONT_DIRS_LIST;
-      else if (!strcmp(type, "themes"))
-	res = E_RESPONSE_THEME_DIRS_LIST;
-      else if (!strcmp(type, "init"))
-	res = E_RESPONSE_INIT_DIRS_LIST;
-      else if (!strcmp(type, "icons"))
-	res = E_RESPONSE_ICON_DIRS_LIST;
-      else if (!strcmp(type, "modules"))
-	res = E_RESPONSE_MODULE_DIRS_LIST;
-      else if (!strcmp(type, "backgrounds"))
-	res = E_RESPONSE_BACKGROUND_DIRS_LIST;
-      END_RESPONSE_CALLBACK(r, res, _e_cb_dir_list_free);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DIRS_APPEND
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-dirs-list-append", 2, "Append the directory of type specified by 'OPT2' to the list in 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2STRING(params[0], params[1], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING2(s1, s2, e_2str, HDL);
-   {
-      E_PATH_GET(path, s1)
-      if (path) e_path_user_path_append(path, s2);
-   }
-   SAVE;
-   END_STRING2(e_2str)
-#elif (TYPE == E_REMOTE_IN)
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DIRS_PREPEND
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-dirs-list-prepend", 2, "Prepend the directory of type specified by 'OPT2' to the list in 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2STRING(params[0], params[1], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING2(s1, s2, e_2str, HDL);
-   {
-      E_PATH_GET(path, s1)
-      if (path) e_path_user_path_prepend(path, s2);
-   }
-   SAVE;
-   END_STRING2(e_2str)
-#elif (TYPE == E_REMOTE_IN)
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DIRS_REMOVE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-dirs-list-remove", 2, "Remove the directory of type specified by 'OPT2' from the list in 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2STRING(params[0], params[1], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING2(s1, s2, e_2str, HDL);
-   {
-      E_PATH_GET(path, s1)
-      if (path) e_path_user_path_remove(path, s2);
-   }
-   SAVE;
-   END_STRING2(e_2str)
-#elif (TYPE == E_REMOTE_IN)
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FRAMERATE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-framerate-set", 1, "Set the animation framerate (fps)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(dbl, HDL);
-   e_config->framerate = dbl;
-   E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
-   edje_frametime_set(1.0 / e_config->framerate);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FRAMERATE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-framerate-get", 0, "Get the animation framerate (fps)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->framerate, E_IPC_OP_FRAMERATE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FRAMERATE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(fps, HDL);
-   printf("REPLY: %3.3f\n", fps);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_SCROLL_SPEED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-scroll-speed-set", 1, "Set the scroll speed of menus (pixels/sec)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(dbl, HDL);
-   e_config->menus_scroll_speed = dbl;
-   E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_SCROLL_SPEED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-scroll-speed-get", 0, "Get the scroll speed of menus (pixels/sec)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->menus_scroll_speed, E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY, HDL)
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(speed, HDL);
-   printf("REPLY: %3.3f\n", speed);
-   END_DOUBLE;
-#endif
-#undef HDL
-   
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_POLICY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-policy-set", 1, "Set the focus policy. OPT1 = CLICK, MOUSE or SLOPPY", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "MOUSE")) value = E_FOCUS_MOUSE;
-   else if (!strcmp(params[0], "CLICK")) value = E_FOCUS_CLICK;
-   else if (!strcmp(params[0], "SLOPPY")) value = E_FOCUS_SLOPPY;
-   else
-     {
-	 printf("focus must be MOUSE, CLICK or SLOPPY\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_border_button_bindings_ungrab_all();
-   e_config->focus_policy = value;
-   E_CONFIG_LIMIT(e_config->focus_policy, 0, 2);
-   e_border_button_bindings_grab_all();
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_POLICY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-policy-get", 0, "Get focus policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->focus_policy, E_IPC_OP_FOCUS_POLICY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_POLICY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == E_FOCUS_MOUSE)
-     printf("REPLY: MOUSE\n");
-   else if (policy == E_FOCUS_CLICK)
-     printf("REPLY: CLICK\n");
-   else if (policy == E_FOCUS_SLOPPY)
-     printf("REPLY: SLOPPY\n");
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDGE_FLIP_DRAGGING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edge-flip-dragging-set", 1, "Set the edge flip while dragging policy flag (0/1)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->edge_flip_dragging = value;
-   E_CONFIG_LIMIT(e_config->edge_flip_dragging, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDGE_FLIP_DRAGGING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edge-flip-dragging-get", 0, "Get the edge flip while dragging policy flag", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->edge_flip_dragging, E_IPC_OP_EDGE_FLIP_DRAGGING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDGE_FLIP_DRAGGING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_CACHE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-cache-set", 1, "Set the font cache size (Kb)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL)
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->font_cache = val;
-   E_CONFIG_LIMIT(e_config->font_cache, 0, 32 * 1024);
-   e_canvas_recache();
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_CACHE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-cache-get", 0, "Get the speculative font cache size (Kb)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->font_cache, E_IPC_OP_FONT_CACHE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_CACHE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_IMAGE_CACHE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-image-cache-set", 1, "Set the image cache size (Kb)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL)
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->image_cache = val;
-   E_CONFIG_LIMIT(e_config->image_cache, 0, 256 * 1024);
-   e_canvas_recache();
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_IMAGE_CACHE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-image-cache-get", 0, "Get the speculative image cache size (Kb)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->image_cache, E_IPC_OP_IMAGE_CACHE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_IMAGE_CACHE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_CACHE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edje-cache-set", 1, "Set the edje cache size (items)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL)
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->edje_cache = val;
-   E_CONFIG_LIMIT(e_config->edje_cache, 0, 256);
-   e_canvas_recache();
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_CACHE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edje-cache-get", 0, "Get the speculative edje cache size (items)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->edje_cache, E_IPC_OP_EDJE_CACHE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_CACHE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_COLLECTION_CACHE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edje-collection-cache-set", 1, "Set the edje collection cache size (items)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL)
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->edje_collection_cache = val;
-   E_CONFIG_LIMIT(e_config->edje_collection_cache, 0, 512);
-   e_canvas_recache();
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_COLLECTION_CACHE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-edje-collection-cache-get", 0, "Get the speculative edje collection cache size (items)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->edje_collection_cache, E_IPC_OP_EDJE_COLLECTION_CACHE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EDJE_COLLECTION_CACHE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-fast-move-threshold-set", 1, "Set the mouse speed (pixels/second) that is considered a 'fast move'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->menus_fast_mouse_move_threshhold = val;
-   E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-fast-move-threshold-get", 0, "Get the mouse speed (pixels/second) that is considered a 'fast move'", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->menus_fast_mouse_move_threshhold, E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL)
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-click-drag-timeout-set", 1, "Set the time (in sec) between a mouse press and release that will keep the menu up anyway", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->menus_click_drag_timeout = val;
-   E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menus-click-drag-timeout-get", 0, "Get the time (in sec) between a mouse press and release that will keep the menu up anyway", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->menus_click_drag_timeout, E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL)
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-animate-set", 1, "Set the shading animation flag (0/1)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->border_shade_animate = val;
-   E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-animate-get", 0, "Get the shading animation flag (0/1)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->border_shade_animate, E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-transition-set", 1, "Set the shading animation algorithm (0, 1, 2 or 3)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-      REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->border_shade_transition = val;
-   E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-transition-get", 0, "Get the shading animation algorithm (0, 1, 2 or 3)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->border_shade_transition, E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-   printf("REPLY: %i\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_SPEED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-speed-set", 1, "Set the shading speed (pixels/sec)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-      REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->border_shade_speed = val;
-   E_CONFIG_LIMIT(e_config->border_shade_speed, 1.0, 20000.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_SPEED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-border-shade-speed-get", 0, "Get the shading speed (pixels/sec)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->border_shade_speed, E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL)
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desks-set", 2, "Set the number of virtual desktops (X x Y desks OPT1 = X, OPT2 = Y)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2INT(atoi(params[0]), atoi(params[1]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_2INT(val1, val2, HDL);
-   e_config->zone_desks_x_count = val1;
-   e_config->zone_desks_y_count = val2;
-   E_CONFIG_LIMIT(e_config->zone_desks_x_count, 1, 64)
-   E_CONFIG_LIMIT(e_config->zone_desks_y_count, 1, 64)
-   {
-      Eina_List *l;
-      for (l = e_manager_list(); l; l = l->next)
-	{
-	   E_Manager *man;
-	   Eina_List *l2;
-	   man = l->data;
-	   for (l2 = man->containers; l2; l2 = l2->next)
-	     {
-		E_Container *con;
-		Eina_List *l3;
-		con = l2->data;
-		for (l3 = con->zones; l3; l3 = l3->next)
-		  {
-		     E_Zone *zone;
-		     zone = l3->data;
-		     e_zone_desk_count_set(zone, 
-					   e_config->zone_desks_x_count, 
-					   e_config->zone_desks_y_count);
-		  }
-	     }
-	}
-   }
-   SAVE;
-   END_2INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desks-get", 0, "Get the number of virtual desktops", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_2INT(e_config->zone_desks_x_count, e_config->zone_desks_y_count, E_IPC_OP_DESKS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_2INT(val1, val2, HDL)
-   printf("REPLY: %i %i\n", val1, val2);
-   END_2INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_POLICY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-maximize-policy-set", 1, "Set the maximize policy. OPT1 = FULLSCREEN, SMART, EXPAND or FILL", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "FULLSCREEN")) value = E_MAXIMIZE_FULLSCREEN;
-   else if (!strcmp(params[0], "SMART")) value = E_MAXIMIZE_SMART;
-   else if (!strcmp(params[0], "EXPAND")) value = E_MAXIMIZE_EXPAND;
-   else if (!strcmp(params[0], "FILL")) value = E_MAXIMIZE_FILL;
-   else
-     {
-	 printf("maximize must be FULLSCREEN, SMART, EXPAND or FILL\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->maximize_policy = value;
-   E_CONFIG_LIMIT(e_config->maximize_policy, E_MAXIMIZE_FULLSCREEN, E_MAXIMIZE_FILL);
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_POLICY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-maximize-policy-get", 0, "Get maximize policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->maximize_policy, E_IPC_OP_MAXIMIZE_POLICY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_POLICY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == E_MAXIMIZE_FULLSCREEN)
-     printf("REPLY: FULLSCREEN\n");
-   else if (policy == E_MAXIMIZE_SMART)
-     printf("REPLY: SMART\n");
-   else if (policy == E_MAXIMIZE_EXPAND)
-     printf("REPLY: EXPAND\n");
-   else if (policy == E_MAXIMIZE_FILL)
-     printf("REPLY: FILL\n");
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_MANIPULATION_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-maximize-manipulation-set", 1, "Allow manipulation, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->allow_manip = policy;
-   E_CONFIG_LIMIT(e_config->allow_manip, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_MANIPULATION_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-maximize-manipulation-get", 0, "Get manipulation, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->allow_manip, E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_MOUSE_LIST 
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-mouse-list", 0, "List all mouse bindings", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action or send reply */
-   SEND_INT4_STRING2_LIST(e_config->mouse_bindings, E_Config_Binding_Mouse, emb, v, HDL);
-   v->val1 = emb->context;
-   v->val2 = emb->modifiers;
-   v->str1 = (char *) emb->action;
-   v->str2 = (char *) emb->params;
-   v->val3 = emb->button;
-   v->val4 = emb->any_mod;
-   END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_BINDING_MOUSE_LIST_REPLY);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_MOUSE_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   /* e_remote decode the response from e_ipc and print it to the console */
-   INT4_STRING2_LIST(v, HDL);
-   {
-      char *context;
-      char modifier[256];
-      char *s1, *s2;
-      
-      if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
-      else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
-      else if (v->val1 == E_BINDING_CONTEXT_BORDER) context = "BORDER";
-      else if (v->val1 == E_BINDING_CONTEXT_ZONE) context = "ZONE";
-      else if (v->val1 == E_BINDING_CONTEXT_CONTAINER) context = "CONTAINER";
-      else if (v->val1 == E_BINDING_CONTEXT_MANAGER) context = "MANAGER";
-      else if (v->val1 == E_BINDING_CONTEXT_MENU) context = "MENU";
-      else if (v->val1 == E_BINDING_CONTEXT_WINLIST) context = "WINLIST";
-      else if (v->val1 == E_BINDING_CONTEXT_POPUP) context = "POPUP";
-      else if (v->val1 == E_BINDING_CONTEXT_ANY) context = "ANY";
-      else context = "";
- 
-      modifier[0] = 0;
-      if (v->val2 & E_BINDING_MODIFIER_SHIFT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "SHIFT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_CTRL)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "CTRL");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_ALT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "ALT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_WIN)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "WIN");
-      }
-      if (v->val2 == E_BINDING_MODIFIER_NONE)
-         strcpy(modifier, "NONE");
-
-      s1 = v->str1;
-      s2 = v->str2;
-      if (!s1) s1 = "";
-      if (!s2) s2 = "";
-      printf("REPLY: BINDING CONTEXT=%s BUTTON=%i MODIFIERS=%s ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
-		context,
-                v->val3,
-		modifier,
-                v->val4,
-                s1,
-                s2
-        );
-   }
-   END_INT4_STRING2_LIST(v);
-#elif E_LIB_IN
-   INT4_STRING2_LIST_START(v, HDL);
-   {
-      int count;
-      RESPONSE(r, E_Response_Binding_Mouse_List);
-      count = eina_list_count(dat);
-      r->bindings = malloc(sizeof(E_Response_Binding_Mouse_Data *) * count);
-      r->count = count;
-
-      count = 0;
-      INT4_STRING2_LIST_ITERATE(v);
-      {
-	 E_Response_Binding_Mouse_Data *d;
-
-	 d = malloc(sizeof(E_Response_Binding_Mouse_Data));
-	 d->ctx = v->val1;
-	 d->button = v->val3;
-	 d->mod = v->val2;
-	 d->any_mod = v->val4;
-	 d->action = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
-	 d->params = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
-
-	 r->bindings[count] = d;
-	 count++;
-      }
-      END_INT4_STRING2_LIST_ITERATE(v);
-      /* this will leak, need to free the event data */
-      END_RESPONSE(r, E_RESPONSE_BINDING_MOUSE_LIST);
-   }
-   END_INT4_STRING2_LIST_START();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_MOUSE_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-mouse-add", 6, "Add an existing mouse binding. OPT1 = Context, OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_4INT_2STRING_START(HDL);
-   E_Config_Binding_Mouse eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.button = atoi(params[1]);
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[2];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[3]);
-   eb.action = params[4];
-   eb.params = params[5];
-   REQ_4INT_2STRING_END(eb.context, eb.modifiers, eb.button, eb.any_mod, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT4_STRING2(v, HDL)
-   E_Config_Binding_Mouse bind, *eb;
-
-   bind.context = v->val1; 
-   bind.modifiers = v->val2;
-   bind.button = v->val3;
-   bind.any_mod = v->val4;
-   bind.action = v->str1; 
-   bind.params = v->str2;
-
-   eb = e_config_binding_mouse_match(&bind);
-   if (!eb)
-     {
-        eb = E_NEW(E_Config_Binding_Mouse, 1);
-        e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb);
-        eb->context = bind.context;
-        eb->button = bind.button;
-        eb->modifiers = bind.modifiers;
-        eb->any_mod = bind.any_mod;
-        if (bind.action) eb->action = eina_stringshare_add(bind.action);
-        if (bind.params) eb->params = eina_stringshare_add(bind.params);
-        e_border_button_bindings_ungrab_all();
-        e_bindings_mouse_add(bind.context, bind.button, bind.modifiers,
-                        bind.any_mod, bind.action, bind.params);
-	e_border_button_bindings_grab_all();
-        e_config_save_queue();  
-     }
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_MOUSE_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-mouse-del", 6, "Delete an existing mouse binding. OPT1 = Context, OPT2 = button, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_4INT_2STRING_START(HDL);
-   E_Config_Binding_Mouse eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.button = atoi(params[1]);
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[2];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[3]);
-   eb.action = params[4];
-   eb.params = params[5];
- 
-   REQ_4INT_2STRING_END(eb.context, eb.modifiers, eb.button, eb.any_mod, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT4_STRING2(v, HDL)
-   E_Config_Binding_Mouse bind, *eb;
-
-   bind.context = v->val1;
-   bind.modifiers = v->val2;
-   bind.button = v->val3;
-   bind.any_mod = v->val4;
-   bind.action = v->str1;
-   bind.params = v->str2;
-   
-   eb = e_config_binding_mouse_match(&bind);
-   if (eb)
-     {
-	e_config->mouse_bindings = eina_list_remove(e_config->mouse_bindings, eb);
-        if (eb->action) eina_stringshare_del(eb->action);
-        if (eb->params) eina_stringshare_del(eb->params);
-        E_FREE(eb);
-        e_border_button_bindings_ungrab_all();
-        e_bindings_mouse_del(bind.context, bind.button, bind.modifiers,
-                bind.any_mod, bind.action, bind.params);
-        e_border_button_bindings_grab_all();
-        e_config_save_queue();
-     }
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_KEY_LIST 
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-key-list", 0, "List all key bindings", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action or send reply */
-   SEND_INT3_STRING3_LIST(e_config->key_bindings, E_Config_Binding_Key, ekb, v, HDL);
-   v->val1 = ekb->context;
-   v->val2 = ekb->modifiers;
-   v->val3 = ekb->any_mod;
-   v->str1 = (char *) ekb->key;
-   v->str2 = (char *) ekb->action;
-   v->str3 = (char *) ekb->params;
-   END_SEND_INT3_STRING3_LIST(v, E_IPC_OP_BINDING_KEY_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_KEY_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   /* e_remote decode the response from e_ipc and print it to the console */
-   INT3_STRING3_LIST(v, HDL);
-   {
-      char *context;
-      char modifier[256];
-      char *s1, *s2, *s3;
-      
-      if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
-      else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
-      else if (v->val1 == E_BINDING_CONTEXT_BORDER) context = "BORDER";
-      else if (v->val1 == E_BINDING_CONTEXT_ZONE) context = "ZONE";
-      else if (v->val1 == E_BINDING_CONTEXT_CONTAINER) context = "CONTAINER";
-      else if (v->val1 == E_BINDING_CONTEXT_MANAGER) context = "MANAGER";
-      else if (v->val1 == E_BINDING_CONTEXT_MENU) context = "MENU";
-      else if (v->val1 == E_BINDING_CONTEXT_WINLIST) context = "WINLIST";
-      else if (v->val1 == E_BINDING_CONTEXT_POPUP) context = "POPUP";
-      else if (v->val1 == E_BINDING_CONTEXT_ANY) context = "ANY";
-      else context = "";
- 
-      modifier[0] = 0;
-      if (v->val2 & E_BINDING_MODIFIER_SHIFT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "SHIFT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_CTRL)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "CTRL");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_ALT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "ALT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_WIN)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "WIN");
-      }
-      if (v->val2 == E_BINDING_MODIFIER_NONE)
-         strcpy(modifier, "NONE");
-
-      s1 = v->str1;
-      s2 = v->str2;
-      s3 = v->str3;
-      if (!s1) s1 = "";
-      if (!s2) s2 = "";
-      if (!s3) s3 = "";
-      printf("REPLY: BINDING CONTEXT=%s KEY=\"%s\" MODIFIERS=%s ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
-		context,
-                s1,
-		modifier,
-                v->val3,
-                s2,
-                s3
-        );
-   }
-   END_INT3_STRING3_LIST(v);
-#elif E_LIB_IN
-   INT3_STRING3_LIST_START(v, HDL);
-   {
-      int count = 0;
-      RESPONSE(r, E_Response_Binding_Key_List);
-      count = eina_list_count(dat);
-      r->bindings = malloc(sizeof(E_Response_Binding_Key_Data *) * count);
-      r->count = count;
-
-      count = 0;
-      INT3_STRING3_LIST_ITERATE(v);
-      {
-	 E_Response_Binding_Key_Data *d;
-
-	 d = malloc(sizeof(E_Response_Binding_Key_Data));
-	 d->ctx = v->val1;
-	 d->key = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
-	 d->mod = v->val2;
-	 d->any_mod = v->val3;
-	 d->action = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
-	 d->params = ((v->str3) ? eina_stringshare_add(v->str3) : NULL);
-
-	 r->bindings[count] = d;
-	 count++;
-      }
-      END_INT3_STRING3_LIST_ITERATE(v);
-      /* this will leak, need to free the event data */
-      END_RESPONSE(r, E_RESPONSE_BINDING_KEY_LIST);
-   }
-   END_INT3_STRING3_LIST_START();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_KEY_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-key-add", 6, "Add an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_3INT_3STRING_START(HDL);
-   E_Config_Binding_Key eb;
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.key = params[1];
-   /* M1[|M2...] */
-     {
-	char *p, *pp;
-	
-	eb.modifiers = 0;
-	pp = params[2];
-	for (;;)
-	  {
-	     p = strchr(pp, '|');
-	     if (p)
-	       {
-		  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-		    {
-		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-			      "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-		       exit(-1);
-		    }
-		  pp = p + 1;
-	       }
-	     else
-	       {
-		  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-		  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-		    {
-		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-			      "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-		       exit(-1);
-		    }
-		  break;
-	       }
-	  }
-     }
-   eb.any_mod = atoi(params[3]);
-   eb.action = params[4];
-   eb.params = params[5];
-   REQ_3INT_3STRING_END(eb.context, eb.modifiers, eb.any_mod, eb.key, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT3_STRING3(v, HDL)
-   E_Config_Binding_Key bind, *eb;
-
-   bind.context = v->val1; 
-   bind.modifiers = v->val2;
-   bind.any_mod = v->val3;
-   bind.key = v->str1; 
-   bind.action = v->str2;
-   bind.params = v->str3;
-
-   eb = e_config_binding_key_match(&bind);
-   if (!eb)
-     {
-        eb = E_NEW(E_Config_Binding_Key, 1);
-        e_config->key_bindings = eina_list_append(e_config->key_bindings, eb);
-        eb->context = bind.context;
-        eb->modifiers = bind.modifiers;
-        eb->any_mod = bind.any_mod;
-        if (bind.key) eb->key = eina_stringshare_add(bind.key);
-        if (bind.action) eb->action = eina_stringshare_add(bind.action);
-        if (bind.params) eb->params = eina_stringshare_add(bind.params);
-        e_managers_keys_ungrab();
-        e_bindings_key_add(bind.context, bind.key, bind.modifiers,
-                bind.any_mod, bind.action, bind.params);
-        e_managers_keys_grab();
-        e_config_save_queue();
-     }
-   END_INT3_STRING3(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_KEY_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-key-del", 6, "Delete an existing key binding. OPT1 = Context, OPT2 = key, OPT3 = modifiers, OPT4 = any modifier ok, OPT5 = action, OPT6 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_3INT_3STRING_START(HDL);
-   E_Config_Binding_Key eb;
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST ANY POPUP\n");
-        exit(-1);
-     }
-   eb.key = params[1];
-   /* M1[|M2...] */
-     {
-	char *p, *pp;
-	
-	eb.modifiers = 0;
-	pp = params[2];
-	for (;;)
-	  {
-	     p = strchr(pp, '|');
-	     if (p)
-	       {
-		  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-		    {
-		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-			      "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-		       exit(-1);
-		    }
-		  pp = p + 1;
-	       }
-	     else
-	       {
-		  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-		  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-		    {
-		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-			      "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-		       exit(-1);
-		    }
-		  break;
-	       }
-	  }
-     }
-   eb.any_mod = atoi(params[3]);
-   eb.action = params[4];
-   eb.params = params[5];
-   REQ_3INT_3STRING_END(eb.context, eb.modifiers, eb.any_mod, eb.key, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT3_STRING3(v, HDL)
-   E_Config_Binding_Key bind, *eb;
-
-   bind.context = v->val1; 
-   bind.modifiers = v->val2;
-   bind.any_mod = v->val3;
-   bind.key = v->str1; 
-   bind.action = v->str2;
-   bind.params = v->str3;
-
-   eb = e_config_binding_key_match(&bind);
-   if (eb)
-     {
-       e_config->key_bindings = eina_list_remove(e_config->key_bindings, eb);
-       if (eb->key) eina_stringshare_del(eb->key);
-       if (eb->action) eina_stringshare_del(eb->action);
-       if (eb->params) eina_stringshare_del(eb->params);
-       E_FREE(eb);
-       e_managers_keys_ungrab();
-       e_bindings_key_del(bind.context, bind.key, bind.modifiers,
-			  bind.any_mod, bind.action, bind.params);
-       e_managers_keys_grab();
-       e_config_save_queue();
-    }
-
-   END_INT3_STRING3(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_RAISE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-always-click-to-raise-set", 1, "Set the always click to raise policy, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->always_click_to_raise = policy;
-   E_CONFIG_LIMIT(e_config->always_click_to_raise, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_RAISE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-always-click-to-raise-get", 0, "Get the always click to raise policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->always_click_to_raise, E_IPC_OP_ALWAYS_CLICK_TO_RAISE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_RAISE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-always-click-to-focus-set", 1, "Set the always click to focus policy, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->always_click_to_focus = policy;
-   E_CONFIG_LIMIT(e_config->always_click_to_focus, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-always-click-to-focus-get", 0, "Get the always click to focus policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->always_click_to_focus, E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_AUTO_RAISE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-auto-raise-set", 1, "Set use auto raise policy, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->use_auto_raise = policy;
-   E_CONFIG_LIMIT(e_config->use_auto_raise, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_AUTO_RAISE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-auto-raise-get", 0, "Get use auto raise policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->use_auto_raise, E_IPC_OP_USE_AUTO_RAISE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_AUTO_RAISE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PASS_CLICK_ON_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-pass-click-on-set", 1, "Set pass click on policy, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->pass_click_on = policy;
-   E_CONFIG_LIMIT(e_config->pass_click_on, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PASS_CLICK_ON_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-pass-click-on-get", 0, "Get pass click on policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->pass_click_on, E_IPC_OP_PASS_CLICK_ON_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PASS_CLICK_ON_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_AUTO_RAISE_DELAY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-auto-raise-delay-set", 1, "Set the auto raise delay (Seconds)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(dbl, HDL);
-   e_config->auto_raise_delay = dbl;
-   E_CONFIG_LIMIT(e_config->auto_raise_delay, 0.0, 5.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_AUTO_RAISE_DELAY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-auto-raise-delay-get", 0, "Get the auto raise delay  (Seconds)", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->auto_raise_delay, E_IPC_OP_AUTO_RAISE_DELAY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_AUTO_RAISE_DELAY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(dbl, HDL);
-   printf("REPLY: DELAY=%3.3f\n", dbl);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_RESIST_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-resist-set", 1, "Set resist policy, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->use_resist = policy;
-   E_CONFIG_LIMIT(e_config->use_resist, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_RESIST_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-resist-get", 0, "Get use resist policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->use_resist, E_IPC_OP_USE_RESIST_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_RESIST_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DRAG_RESIST_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-drag-resist-set", 1, "Set drag resist threshold (0-100)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->drag_resist = val;
-   E_CONFIG_LIMIT(e_config->drag_resist, 0, 100);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DRAG_RESIST_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-drag-resist-get", 0, "Get drag resist threshold", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->drag_resist, E_IPC_OP_DRAG_RESIST_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DRAG_RESIST_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: THRESHOLD=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESK_RESIST_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desk-resist-set", 1, "Set desktop resist threshold (0-100)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->desk_resist = val;
-   E_CONFIG_LIMIT(e_config->desk_resist, 0, 100);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESK_RESIST_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desk-resist-get", 0, "Get desktop resist threshold", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->desk_resist, E_IPC_OP_DESK_RESIST_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESK_RESIST_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: THRESHOLD=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_RESIST_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-window-resist-set", 1, "Set window resist threshold (0-100)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->window_resist = val;
-   E_CONFIG_LIMIT(e_config->window_resist, 0, 100);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_RESIST_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-window-resist-get", 0, "Get window resist threshold", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->window_resist, E_IPC_OP_WINDOW_RESIST_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_RESIST_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: THRESHOLD=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_GADGET_RESIST_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-gadget-resist-set", 1, "Set gadget resist threshold (0-100)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->gadget_resist = val;
-   E_CONFIG_LIMIT(e_config->gadget_resist, 0, 100);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_GADGET_RESIST_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-gadget-resist-get", 0, "Get gadget resist threshold", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->gadget_resist, E_IPC_OP_GADGET_RESIST_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_GADGET_RESIST_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: THRESHOLD=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_BG_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-bg-add", 5, "Add a desktop bg definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y. OPT5 = bg file path", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_4INT_2STRING_START(HDL);
-   REQ_4INT_2STRING_END(atoi(params[0]), atoi(params[1]), atoi(params[2]), atoi(params[3]), params[4], "", HDL);
-#elif (TYPE == E_WM_IN)
-   INT4_STRING2(v, HDL);
-   e_bg_add(v->val1, v->val2, v->val3, v->val4, v->str1);
-   e_bg_update();
-   SAVE;
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_BG_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-bg-del", 4, "Delete a desktop bg definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y.", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_4INT_2STRING_START(HDL);
-   REQ_4INT_2STRING_END(atoi(params[0]), atoi(params[1]), atoi(params[2]), atoi(params[3]), "", "", HDL);
-#elif (TYPE == E_WM_IN)
-   INT4_STRING2(v, HDL);
-   e_bg_del(v->val1, v->val2, v->val3, v->val4);
-   e_bg_update();
-   SAVE;
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_BG_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-bg-list", 0, "List all current desktop bg definitions", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT4_STRING2_LIST(e_config->desktop_backgrounds, E_Config_Desktop_Background, cfbg, v, HDL);
-   v->val1 = cfbg->container;
-   v->val2 = cfbg->zone;
-   v->val3 = cfbg->desk_x;
-   v->val4 = cfbg->desk_y;
-   v->str1 = (char *) cfbg->file;
-   v->str2 = "";
-   END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_DESKTOP_BG_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_BG_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   INT4_STRING2_LIST(v, HDL);
-   printf("REPLY: BG CONTAINER=%i ZONE=%i DESK_X=%i DESK_Y=%i FILE=\"%s\"\n",
-	  v->val1, v->val2, v->val3, v->val4, v->str1);
-   END_INT4_STRING2_LIST(v);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-while-selecting-set", 1, "Set winlist (alt+tab) warp while selecting policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_warp_while_selecting = policy;
-   E_CONFIG_LIMIT(e_config->winlist_warp_while_selecting, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-while-selecting-get", 0, "Get winlist (alt+tab) warp while selecting policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_warp_while_selecting, E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_AT_END_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-at-end-set", 1, "Set winlist (alt+tab) warp at end policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_warp_at_end = policy;
-   E_CONFIG_LIMIT(e_config->winlist_warp_at_end, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_AT_END_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-at-end-get", 0, "Get winlist (alt+tab) warp at end policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_warp_at_end, E_IPC_OP_WINLIST_WARP_AT_END_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_AT_END_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_SPEED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-speed-set", 1, "Set winlist warp speed (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_warp_speed = val;
-   E_CONFIG_LIMIT(e_config->winlist_warp_speed, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_SPEED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-warp-speed-get", 0, "Get winlist warp speed", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_warp_speed, E_IPC_OP_WINLIST_WARP_SPEED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_WARP_SPEED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: SPEED=%3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_ANIMATE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-scroll-animate-set", 1, "Set winlist (alt+tab) scroll animate policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_scroll_animate = policy;
-   E_CONFIG_LIMIT(e_config->winlist_scroll_animate, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_ANIMATE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-scroll-animate-get", 0, "Get winlist (alt+tab) scroll animate policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_scroll_animate, E_IPC_OP_WINLIST_SCROLL_ANIMATE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_ANIMATE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_SPEED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-scroll-speed-set", 1, "Set winlist scroll speed (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_scroll_speed = val;
-   E_CONFIG_LIMIT(e_config->winlist_scroll_speed, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_SPEED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-scroll-speed-get", 0, "Get winlist scroll speed", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_scroll_speed, E_IPC_OP_WINLIST_SCROLL_SPEED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_SCROLL_SPEED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: SPEED=%3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-iconified-set", 1, "Set whether winlist (alt+tab) will show iconfied windows", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_show_iconified = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_show_iconified, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-iconified-get", 0, "Get whether winlist (alt+tab) will show iconfied windows", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_show_iconified, E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-desk-iconified-set", 1, "Set whether winlist (alt+tab) will show iconfied windows from other desks", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_show_other_desk_iconified = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_show_other_desk_iconified, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-desk-iconified-get", 0, "Get whether winlist (alt+tab) will show iconfied windows from other desks", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_show_other_desk_iconified, E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-screen-iconified-set", 1, "Set whether winlist (alt+tab) will show iconfied windows from other screens", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_show_other_screen_iconified = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_show_other_screen_iconified, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-screen-iconified-get", 0, "Get whether winlist (alt+tab) will show iconfied windows from other screens", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_show_other_screen_iconified, E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-desk-windows-set", 1, "Set whether winlist (alt+tab) will show other desk windows", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_show_other_desk_windows = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_show_other_desk_windows, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-desk-windows-get", 0, "Get winlist (alt+tab) show other desk windows", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_show_other_desk_windows, E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-screen-windows-set", 1, "Set winlist (alt+tab) show other screen windows policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_show_other_screen_windows = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_show_other_screen_windows, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-show-other-screen-windows-get", 0, "Get winlist (alt+tab) show other screen windows policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_show_other_screen_windows, E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-uncover-while-selecting-set", 1, "Set whether winlist (alt+tab) will show iconified windows while selecting", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_uncover_while_selecting = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_uncover_while_selecting, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-uncover-while-selecting-get", 0, "Get whether winlist (alt+tab) will show iconified windows while selecting", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_uncover_while_selecting, E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-jump-desk-while-selecting-set", 1, "Set winlist (alt+tab) jump desk while selecting policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_jump_desk_while_selecting = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_jump_desk_while_selecting, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-jump-desk-while-selecting-get", 0, "Get winlist (alt+tab) jump desk while selecting policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_jump_desk_while_selecting, E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_X_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-align-x-set", 1, "Set winlist position align for x axis (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_pos_align_x = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_align_x, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_X_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-align-x-get", 0, "Get winlist position align for x axis", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_pos_align_x, E_IPC_OP_WINLIST_POS_ALIGN_X_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_X_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_Y_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-align-y-set", 1, "Set winlist position align for y axis (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_pos_align_y = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_align_y, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_Y_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-align-y-get", 0, "Get winlist position align for y axis", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_pos_align_y, E_IPC_OP_WINLIST_POS_ALIGN_Y_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_ALIGN_Y_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_W_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-size-w-set", 1, "Set winlist position size width (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_pos_size_w = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_size_w, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_W_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-size-w-get", 0, "Get winlist position size width", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_pos_size_w, E_IPC_OP_WINLIST_POS_SIZE_W_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_W_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_H_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-size-h-set", 1, "Set winlist position size height (0.0-1.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->winlist_pos_size_h = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_size_h, 0.0, 1.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_H_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-size-h-get", 0, "Get winlist position size height", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->winlist_pos_size_h, E_IPC_OP_WINLIST_POS_SIZE_H_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_SIZE_H_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_W_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-min-w-set", 1, "Set winlist (alt+tab) minimum width", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->winlist_pos_min_w = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_min_w, 0, 4000);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_W_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-min-w-get", 0, "Get winlist (alt+tab) minimum width", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_pos_min_w, E_IPC_OP_WINLIST_POS_MIN_W_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_W_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_H_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-min-h-set", 1, "Set winlist (alt+tab) minimum height", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->winlist_pos_min_h = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_min_h, 0, 4000);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_H_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-min-h-get", 0, "Get winlist (alt+tab) minimum height", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_pos_min_h, E_IPC_OP_WINLIST_POS_MIN_H_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MIN_H_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_W_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-max-w-set", 1, "Set winlist (alt+tab) maximum width", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->winlist_pos_max_w = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_max_w, 8, 4000);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_W_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-max-w-get", 0, "Get winlist (alt+tab) maximum width", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_pos_max_w, E_IPC_OP_WINLIST_POS_MAX_W_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_W_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_H_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-max-h-set", 1, "Set winlist (alt+tab) maximum height", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->winlist_pos_max_h = val;
-   E_CONFIG_LIMIT(e_config->winlist_pos_max_h, 8, 4000);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_H_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-pos-max-h-get", 0, "Get winlist (alt+tab) maximum height", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_pos_max_h, E_IPC_OP_WINLIST_POS_MAX_H_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_POS_MAX_H_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-if-close-not-possible-set", 1, "Set whether E should kill an application if it can not close", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->kill_if_close_not_possible = val;
-   E_CONFIG_LIMIT(e_config->kill_if_close_not_possible, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-if-close-not-possible-get", 0, "Get whether E should kill an application if it can not close", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->kill_if_close_not_possible, E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: KILL=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_PROCESS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-process-set", 1, "Set whether E should kill the process directly or through x", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->kill_process = val;
-   E_CONFIG_LIMIT(e_config->kill_process, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_PROCESS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-process-get", 0, "Get whether E should kill the process directly or through x", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->kill_process, E_IPC_OP_KILL_PROCESS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_PROCESS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: KILL=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_TIMER_WAIT_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-timer-wait-set", 1, "Set interval to wait before killing client (0.0-120.0)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_DOUBLE(atof(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_DOUBLE(val, HDL);
-   e_config->kill_timer_wait = val;
-   E_CONFIG_LIMIT(e_config->kill_timer_wait, 0.0, 120.0);
-   SAVE;
-   END_DOUBLE;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_TIMER_WAIT_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-kill-timer-wait-get", 0, "Get interval to wait before killing client", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_DOUBLE(e_config->kill_timer_wait, E_IPC_OP_KILL_TIMER_WAIT_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_KILL_TIMER_WAIT_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_DOUBLE(val, HDL);
-   printf("REPLY: %3.3f\n", val);
-   END_DOUBLE;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PING_CLIENTS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-ping-clients-set", 1, "Set whether E should ping clients", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->ping_clients = val;
-   E_CONFIG_LIMIT(e_config->ping_clients, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PING_CLIENTS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-ping-clients-get", 0, "Get whether E should ping clients", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->ping_clients, E_IPC_OP_PING_CLIENTS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PING_CLIENTS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_START_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-start-set", 1, "Get the background transition used when E starts", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (!s)
-     {
-	if (e_config->transition_start) eina_stringshare_del(e_config->transition_start);
-	e_config->transition_start = NULL;
-     }
-   if ((s) && (e_theme_transition_find(s)))
-     {
-	if (e_config->transition_start) eina_stringshare_del(e_config->transition_start);
-	e_config->transition_start = NULL;
-	if (s) e_config->transition_start = eina_stringshare_add(s);
-	SAVE;
-     }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_START_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-start-get", 0, "Get the background transition used when E starts", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->transition_start, E_IPC_OP_TRANSITION_START_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_START_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
- 
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_DESK_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-desk-set", 1, "Set the transition used when switching desktops", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (!s)
-     {
-	if (e_config->transition_desk) eina_stringshare_del(e_config->transition_desk);
-	e_config->transition_desk = NULL;
-     }
-   if ((s) && (e_theme_transition_find(s)))
-     {
-	if (e_config->transition_desk) eina_stringshare_del(e_config->transition_desk);
-	e_config->transition_desk = NULL;
-	if (s) e_config->transition_desk = eina_stringshare_add(s);
-     }
-   SAVE;
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_DESK_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-desk-get", 0, "Get the transition used when switching desktops", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->transition_desk, E_IPC_OP_TRANSITION_DESK_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_DESK_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
- 
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_CHANGE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-change-set", 1, "Set the transition used when changing backgrounds", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (!s)
-     {
-	if (e_config->transition_change) eina_stringshare_del(e_config->transition_change);
-	e_config->transition_change = NULL;
-     }
-   if ((s) && (e_theme_transition_find(s)))
-     {
-	if (e_config->transition_change) eina_stringshare_del(e_config->transition_change);
-	e_config->transition_change = NULL;
-	if (s) e_config->transition_change = eina_stringshare_add(s);
-       	SAVE;
-     }
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_CHANGE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-change-get", 0, "Get the transition used when changing backgrounds", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->transition_change, E_IPC_OP_TRANSITION_CHANGE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_CHANGE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_SETTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-setting-set", 1, "Set the focus setting policy (\"NONE\", \"NEW_WINDOW\", \"NEW_DIALOG\", \"NEW_DIALOG_IF_OWNER_FOCUSED\")", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "NONE")) value = E_FOCUS_NONE;
-   else if (!strcmp(params[0], "NEW_WINDOW")) value = E_FOCUS_NEW_WINDOW;
-   else if (!strcmp(params[0], "NEW_DIALOG")) value = E_FOCUS_NEW_DIALOG;
-   else if (!strcmp(params[0], "NEW_DIALOG_IF_OWNER_FOCUSED")) value = E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED;
-   else
-     {
-	 printf("focus setting must be \"NONE\", \"NEW_WINDOW\", \"NEW_DIALOG\", \"NEW_DIALOG_IF_OWNER_FOCUSED\"\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_border_button_bindings_ungrab_all();
-   e_config->focus_setting = value;
-   E_CONFIG_LIMIT(e_config->focus_setting, 0, 3);
-   e_border_button_bindings_grab_all();
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_SETTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-setting-get", 0, "Get the focus setting policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->focus_setting, E_IPC_OP_FOCUS_SETTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_SETTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(setting, HDL);
-   if (setting == E_FOCUS_NONE)
-     printf("REPLY: NONE\n");
-   else if (setting == E_FOCUS_NEW_WINDOW)
-     printf("REPLY: NEW_WINDOW\n");
-   else if (setting == E_FOCUS_NEW_DIALOG)
-     printf("REPLY: NEW_DIALOG\n");
-   else if (setting == E_FOCUS_NEW_DIALOG_IF_OWNER_FOCUSED)
-     printf("REPLY: NEW_DIALOG_IF_OWNER_FOCUSED\n");
-   END_INT
-#endif
-#undef HDL
- 
-/****************************************************************************/
-#define HDL E_IPC_OP_EXEC_ACTION
-#if (TYPE == E_REMOTE_OPTIONS)
-	OP("-exec-action", 2, "Executes an action given the name (OPT1) and a string of parameters (OPT2).", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-	REQ_2STRING(params[0], params[1], HDL);
-#elif (TYPE == E_WM_IN)
-	STRING2(actionName, paramList, e_2str, HDL);
-	{
-		Eina_List *m = e_manager_list();
-		int ok = 0;
-		if (m) {
-			E_Manager *man = m->data;
-
-			if (man) {
-				E_Action *act = e_action_find(actionName);
-
-				if (act && act->func.go) {
-					act->func.go(E_OBJECT(man), paramList);
-					ok = 1;
-				}
-			}
-		}
-
-		void *d;
-		int len;
-		d = e_ipc_codec_int_enc(ok, &len);
-		if (d) {
-		   ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, E_IPC_OP_EXEC_ACTION_REPLY, 0, 0, 0, d, len);
-		   free(d);
-		}
-	}
-	END_STRING2(e_2str)
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_EXEC_ACTION_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-theme-list", 0, "List themes and associated categories", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING2_LIST(e_config->themes, E_Config_Theme, theme, v, HDL);
-   v->str1 = (char *) theme->category;
-   v->str2 = (char *) theme->file;
-   END_SEND_STRING2_LIST(v, E_IPC_OP_THEME_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-    
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING2_LIST(v, HDL);
-   printf("REPLY: CATEGORY=\"%s\" FILE=\"%s\"\n", v->str1, v->str2);
-   END_STRING2_LIST(v);
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-theme-set", 2, "Set theme category (OPT1) and edje file (OPT2)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2STRING(params[0], params[1], HDL) 
-#elif (TYPE == E_WM_IN)
-   STRING2(category, file, e_2str, HDL);
-   /* TODO: Check if category is sane and file exists */
-   e_theme_config_set(category, file);
-   SAVE;   
-   END_STRING2(e_2str);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-theme-get", 1, "List the theme associated with the category OPT1", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(category, HDL);
-   E_Config_Theme *ect;
-   void *data;
-   int bytes;
-   
-   ect = e_theme_config_get(category);
-   if (ect == NULL)
-     data = NULL;
-   else
-     data = e_ipc_codec_2str_enc(ect->category, ect->file, &bytes);
-  	
-   SEND_DATA(E_IPC_OP_THEME_GET_REPLY);
-
-   END_STRING(category);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING2(category, file, e_2str, HDL);
-   printf("REPLY: DEFAULT CATEGORY=\"%s\" FILE=\"%s\"\n",
-                    category, file); 
-   END_STRING2(e_2str);
-#elif (TYPE == E_LIB_IN)
-   STRING2(category, file, e_2str, HDL);
-   RESPONSE(r, E_Response_Theme_Get);
-   if (file) r->file = strdup(file);
-   r->category = strdup(category);
-   END_RESPONSE(r, E_RESPONSE_THEME_GET);
-   END_STRING2(e_2str);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_REMOVE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-theme-remove", 1, "Remove the theme category OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(category, HDL);
-   e_theme_config_remove(category);
-   SAVE;
-   END_STRING(category);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_FOLLOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-move-info-follows-set", 1, "Set whether the move dialog should follow the client window", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->move_info_follows = val;
-   E_CONFIG_LIMIT(e_config->move_info_follows, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_FOLLOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-move-info-follows-get", 0, "Get whether the move dialog should follow the client window", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->move_info_follows, E_IPC_OP_MOVE_INFO_FOLLOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_FOLLOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_FOLLOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-resize-info-follows-set", 1, "Set whether the resize dialog should follow the client window", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->resize_info_follows = val;
-   E_CONFIG_LIMIT(e_config->resize_info_follows, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_FOLLOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-resize-info-follows-get", 0, "Set whether the resize dialog should follow the client window", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->resize_info_follows, E_IPC_OP_RESIZE_INFO_FOLLOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_FOLLOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_VISIBLE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-move-info-visible-set", 1, "Set whether the move dialog should be visible", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->move_info_visible = val;
-   E_CONFIG_LIMIT(e_config->move_info_visible, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_VISIBLE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-move-info-visible-get", 0, "Get whether the move dialog should be visible", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->move_info_visible, E_IPC_OP_MOVE_INFO_VISIBLE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MOVE_INFO_VISIBLE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_VISIBLE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-resize-info-visible-set", 1, "Set whether the resize dialog should be visible", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->resize_info_visible = val;
-   E_CONFIG_LIMIT(e_config->resize_info_visible, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_VISIBLE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-resize-info-visible-get", 0, "Set whether the resize dialog should be visible", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->resize_info_visible, E_IPC_OP_RESIZE_INFO_VISIBLE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_RESIZE_INFO_VISIBLE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/   
-#define HDL E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-last-focused-per-desktop-set", 1, "Set whether E should remember focused windows when switching desks", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->focus_last_focused_per_desktop = val;
-   E_CONFIG_LIMIT(e_config->focus_last_focused_per_desktop, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-last-focused-per-desktop-get", 0, "Get whether E should remember focused windows when switching desks", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->focus_last_focused_per_desktop, E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-revert-on-hide-or-close-set", 1, "Set whether E will focus the last focused window when you hide or close a focused window", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->focus_revert_on_hide_or_close = val;
-   E_CONFIG_LIMIT(e_config->focus_revert_on_hide_or_close, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-focus-revert-on-hide-or-close-get", 0, "Get whether E will focus the last focused window when you hide or close a focused window", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->focus_revert_on_hide_or_close, E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-profile-set", 1, "Set the default configuration profile to OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   /* TODO: Check if profile exists (or create profile?) */
-   e_config_save_flush();
-   e_config_profile_set(s);
-   e_config_profile_save();
-   e_config_save_block_set(1);
-   e_sys_action_do(E_SYS_RESTART, NULL);
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-profile-get", 0, "Get the default configuration profile", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config_profile_get(), E_IPC_OP_PROFILE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-profile-list", 0, "List all existing profiles", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   Eina_List *profiles;
-   profiles = e_config_profile_list();
-   ENCODE(profiles, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_PROFILE_LIST_REPLY);
-   FREE_LIST(profiles);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_NAME_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-name-add", 5, "Add a desktop name definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y. OPT5 = desktop name", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_4INT_2STRING_START(HDL);
-   REQ_4INT_2STRING_END(atoi(params[0]), atoi(params[1]), atoi(params[2]), atoi(params[3]), params[4], "", HDL);
-#elif (TYPE == E_WM_IN)
-   INT4_STRING2(v, HDL);
-   e_desk_name_add(v->val1, v->val2, v->val3, v->val4, v->str1);
-   e_desk_name_update();
-   SAVE;
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_NAME_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-name-del", 4, "Delete a desktop name definition. OPT1 = container no. OPT2 = zone no. OPT3 = desk_x. OPT4 = desk_y.", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_4INT_2STRING_START(HDL);
-   REQ_4INT_2STRING_END(atoi(params[0]), atoi(params[1]), atoi(params[2]), atoi(params[3]), "", "", HDL);
-#elif (TYPE == E_WM_IN)
-   INT4_STRING2(v, HDL);
-   e_desk_name_del(v->val1, v->val2, v->val3, v->val4);
-   e_desk_name_update();
-   SAVE;
-   END_INT4_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_NAME_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desktop-name-list", 0, "List all current desktop name definitions", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT4_STRING2_LIST(e_config->desktop_names, E_Config_Desktop_Name, cfname, v, HDL);
-   v->val1 = cfname->container;
-   v->val2 = cfname->zone;
-   v->val3 = cfname->desk_x;
-   v->val4 = cfname->desk_y;
-   v->str1 = (char *) cfname->name;
-   v->str2 = "";
-   END_SEND_INT4_STRING2_LIST(v, E_IPC_OP_DESKTOP_NAME_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_NAME_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   INT4_STRING2_LIST(v, HDL);
-   printf("REPLY: BG CONTAINER=%i ZONE=%i DESK_X=%i DESK_Y=%i NAME=\"%s\"\n",
-	  v->val1, v->val2, v->val3, v->val4, v->str1);
-   END_INT4_STRING2_LIST(v);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CURSOR_SIZE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cursor-size-set", 1, "Set the E cursor size", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->cursor_size = val;
-   E_CONFIG_LIMIT(e_config->cursor_size, 0, 1024);
-   e_pointers_size_set(e_config->cursor_size);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CURSOR_SIZE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cursor-size-get", 0, "Get the E cursor size", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->cursor_size, E_IPC_OP_CURSOR_SIZE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CURSOR_SIZE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_E_CURSOR_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-e-cursor-set", 1, "Set whether E's cursor should be used", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   Eina_List *ml;
-   e_config->use_e_cursor = val;
-   E_CONFIG_LIMIT(e_config->use_e_cursor, 0, 1);
-   for (ml = e_manager_list(); ml; ml = ml->next)
-     {
-	E_Manager *man;
-	man = ml->data;
-	if (man->pointer) e_object_del(E_OBJECT(man->pointer));
-	man->pointer = e_pointer_window_new(man->root, 1);
-     }
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_E_CURSOR_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-e-cursor-get", 0, "Get whether E's cursor should be used", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->use_e_cursor, E_IPC_OP_USE_E_CURSOR_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_E_CURSOR_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-autoscroll-margin-set", 1, "Set the distance from the edge of the screen the menu will autoscroll to", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->menu_autoscroll_margin = value;
-   E_CONFIG_LIMIT(e_config->menu_autoscroll_margin, 0, 50);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-autoscroll-margin-get", 0, "Get the distance from the edge of the screen the menu will autoscroll to", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->menu_autoscroll_margin, E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-		 printf("REPLY: %i\n", val);
-		 END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-autoscroll-cursor-margin-set", 1, "Set the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->menu_autoscroll_cursor_margin = value;
-   E_CONFIG_LIMIT(e_config->menu_autoscroll_cursor_margin, 0, 50);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-autoscroll-cursor-margin-get", 0, "Get the distance from the edge of the screen the cursor needs to be to start menu autoscrolling", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL)
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->menu_autoscroll_cursor_margin, E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL)
-		 printf("REPLY: %i\n", val);
-		 END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_MOVE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-move-set", 1, "Set if transients should move with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.move = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_MOVE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-move-get", 0, "Get if transients should move with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.move, E_IPC_OP_TRANSIENT_MOVE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_MOVE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RESIZE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-resize-set", 1, "Set if transients should move when it's parent resizes", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.resize = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RESIZE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-resize-get", 0, "Get if transients should move when it's parent resizes", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.resize, E_IPC_OP_TRANSIENT_RESIZE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RESIZE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RAISE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-raise-set", 1, "Set if transients should raise with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.raise = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RAISE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-raise-get", 0, "Get if transients should raise with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.raise, E_IPC_OP_TRANSIENT_RAISE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_RAISE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LOWER_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-lower-set", 1, "Set if transients should lower with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.lower = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LOWER_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-lower-get", 0, "Get if transients should lower with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.lower, E_IPC_OP_TRANSIENT_LOWER_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LOWER_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LAYER_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-layer-set", 1, "Set if transients should change layer with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.layer = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LAYER_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-layer-get", 0, "Get if transients should change layer with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.layer, E_IPC_OP_TRANSIENT_LAYER_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_LAYER_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_DESKTOP_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-desktop-set", 1, "Set if transients should change desktop with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.desktop = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_DESKTOP_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-desktop-get", 0, "Get if transients should change desktop with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.desktop, E_IPC_OP_TRANSIENT_DESKTOP_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_DESKTOP_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_ICONIFY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-iconify-set", 1, "Set if transients should iconify with it's parent", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->transient.iconify = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_ICONIFY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transient-iconify-get", 0, "Get if transients should iconify with it's parent", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->transient.iconify, E_IPC_OP_TRANSIENT_ICONIFY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSIENT_ICONIFY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MODAL_WINDOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-modal-windows-set", 1, "Set if enlightenment should honour modal windows", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->modal_windows = val;
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MODAL_WINDOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-modal-windows-get", 0, "Get if enlightenment should honour modal windows", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->modal_windows, E_IPC_OP_MODAL_WINDOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MODAL_WINDOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-   
-/****************************************************************************/
-#define HDL E_IPC_OP_IM_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-input-method-list", 0, "List all available input methods", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   Eina_List *iml;
-   iml = e_intl_input_method_list();
-   ENCODE(iml, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_IM_LIST_REPLY);
-   FREE_LIST(iml);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_IM_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_IM_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-input-method-set", 1, "Set the current input method to 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (e_config->input_method) eina_stringshare_del(e_config->input_method);
-   e_config->input_method = NULL;
-   if (s) e_config->input_method = eina_stringshare_add(s);
-   if ((e_config->input_method) && (e_config->input_method[0] != 0))
-     e_intl_input_method_set(e_config->input_method);
-   else
-     e_intl_input_method_set(NULL);
-   SAVE;
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_IM_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-input-method-get", 0, "Get the current input method", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->input_method, E_IPC_OP_IM_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_IM_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_PLACEMENT_POLICY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-window-placement-policy-set", 1, "Set the window placement policy. OPT1 = SMART, ANTIGADGET, CURSOR or MANUAL", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "SMART")) value = E_WINDOW_PLACEMENT_SMART;
-   else if (!strcmp(params[0], "CURSOR")) value = E_WINDOW_PLACEMENT_CURSOR;
-   else if (!strcmp(params[0], "MANUAL")) value = E_WINDOW_PLACEMENT_MANUAL;
-   else if (!strcmp(params[0], "ANTIGADGET")) value = E_WINDOW_PLACEMENT_ANTIGADGET;
-   else
-     {
-	 printf("window placement policy must be SMART, ANTIGADGET, CURSOR or MANUAL\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->window_placement_policy = value;
-   E_CONFIG_LIMIT(e_config->window_placement_policy, E_WINDOW_PLACEMENT_SMART, E_WINDOW_PLACEMENT_MANUAL);
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_PLACEMENT_POLICY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-window-placement-policy-get", 0, "Get window placement policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->window_placement_policy, E_IPC_OP_WINDOW_PLACEMENT_POLICY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINDOW_PLACEMENT_POLICY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == E_WINDOW_PLACEMENT_SMART)
-     printf("REPLY: SMART\n");
-   else if (policy == E_WINDOW_PLACEMENT_CURSOR)
-     printf("REPLY: CURSOR\n");
-   else if (policy == E_WINDOW_PLACEMENT_MANUAL)
-     printf("REPLY: MANUAL\n");
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_SIGNAL_LIST 
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-signal-list", 0, "List all signal bindings", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action or send reply */
-   SEND_INT3_STRING4_LIST(e_config->signal_bindings, E_Config_Binding_Signal, emb, v, HDL);
-   v->val1 = emb->context;
-   v->str1 = (char *) emb->signal;
-   v->str2 = (char *) emb->source;
-   v->val2 = emb->modifiers;
-   v->val3 = emb->any_mod;
-   v->str3 = (char *) emb->action;
-   v->str4 = (char *) emb->params;
-   END_SEND_INT3_STRING4_LIST(v, E_IPC_OP_BINDING_SIGNAL_LIST_REPLY);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_SIGNAL_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   /* e_remote decode the response from e_ipc and print it to the console */
-   INT3_STRING4_LIST(v, HDL);
-   {
-      char *context;
-      char modifier[256];
-      char *s1, *s2, *s3, *s4;
-      
-      if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
-      else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
-      else if (v->val1 == E_BINDING_CONTEXT_BORDER) context = "BORDER";
-      else if (v->val1 == E_BINDING_CONTEXT_ZONE) context = "ZONE";
-      else if (v->val1 == E_BINDING_CONTEXT_CONTAINER) context = "CONTAINER";
-      else if (v->val1 == E_BINDING_CONTEXT_MANAGER) context = "MANAGER";
-      else if (v->val1 == E_BINDING_CONTEXT_MENU) context = "MENU";
-      else if (v->val1 == E_BINDING_CONTEXT_WINLIST) context = "WINLIST";
-      else if (v->val1 == E_BINDING_CONTEXT_POPUP) context = "POPUP";
-      else if (v->val1 == E_BINDING_CONTEXT_ANY) context = "ANY";
-      else context = "";
- 
-      modifier[0] = 0;
-      if (v->val2 & E_BINDING_MODIFIER_SHIFT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "SHIFT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_CTRL)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "CTRL");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_ALT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "ALT");
-      }
-      if (v->val2 & E_BINDING_MODIFIER_WIN)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "WIN");
-      }
-      if (v->val2 == E_BINDING_MODIFIER_NONE)
-         strcpy(modifier, "NONE");
-
-      s1 = v->str1;
-      s2 = v->str2;
-      s3 = v->str3;
-      s4 = v->str4;
-      if (!s1) s1 = "";
-      if (!s2) s2 = "";
-      if (!s3) s3 = "";
-      if (!s4) s4 = "";
-      printf("REPLY: BINDING CONTEXT=%s SIGNAL=%s SOURCE=%s MODIFIERS=%s ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
-		context,
-		s1,
-		s2,
-		modifier,
-                v->val3,
-                s3,
-                s4
-        );
-   }
-   END_INT3_STRING4_LIST(v);
-#elif E_LIB_IN
-   INT3_STRING4_LIST_START(v, HDL);
-   {
-      int count;
-      RESPONSE(r, E_Response_Binding_Signal_List);
-      count = eina_list_count(dat);
-      r->bindings = malloc(sizeof(E_Response_Binding_Signal_Data *) * count);
-      r->count = count;
-
-      count = 0;
-      INT3_STRING4_LIST_ITERATE(v);
-      {
-	 E_Response_Binding_Signal_Data *d;
-
-	 d = malloc(sizeof(E_Response_Binding_Signal_Data));
-	 d->ctx = v->val1;
-	 d->signal = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
-	 d->source = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
-	 d->mod = v->val2;
-	 d->any_mod = v->val3;
-	 d->action = ((v->str3) ? eina_stringshare_add(v->str3) : NULL);
-	 d->params = ((v->str4) ? eina_stringshare_add(v->str4) : NULL);
-
-	 r->bindings[count] = d;
-	 count++;
-      }
-      END_INT3_STRING4_LIST_ITERATE(v);
-      /* this will leak, need to free the event data */
-      END_RESPONSE(r, E_RESPONSE_BINDING_SIGNAL_LIST);
-   }
-   END_INT3_STRING4_LIST_START();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_SIGNAL_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-signal-add", 7, "Add an existing signal binding. OPT1 = Context, OPT2 = signal, OPT3 = source, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_3INT_4STRING_START(HDL);
-   E_Config_Binding_Signal eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.signal = params[1];
-   eb.source = params[2];
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[3];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT4 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT4 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[4]);
-   eb.action = params[5];
-   eb.params = params[6];
-   REQ_3INT_4STRING_END(eb.context, eb.modifiers, eb.any_mod, eb.signal, eb.source, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT3_STRING4(v, HDL)
-   E_Config_Binding_Signal bind, *eb;
-
-   bind.context = v->val1; 
-   bind.signal = v->str1; 
-   bind.source = v->str2; 
-   bind.modifiers = v->val2;
-   bind.any_mod = v->val3;
-   bind.action = v->str3; 
-   bind.params = v->str4;
-
-   eb = e_config_binding_signal_match(&bind);
-   if (!eb)
-     {
-        eb = E_NEW(E_Config_Binding_Signal, 1);
-        e_config->signal_bindings = eina_list_append(e_config->signal_bindings, eb);
-        eb->context = bind.context;
-        if (bind.signal) eb->signal = eina_stringshare_add(bind.signal);
-        if (bind.source) eb->source = eina_stringshare_add(bind.source);
-        eb->modifiers = bind.modifiers;
-        eb->any_mod = bind.any_mod;
-        if (bind.action) eb->action = eina_stringshare_add(bind.action);
-        if (bind.params) eb->params = eina_stringshare_add(bind.params);
-        e_bindings_signal_add(bind.context, bind.signal, bind.source, bind.modifiers,
-			      bind.any_mod, bind.action, bind.params);
-        e_config_save_queue();  
-     }
-   END_INT3_STRING4(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_SIGNAL_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-signal-del", 7, "Delete an existing signal binding. OPT1 = Context, OPT2 = signal, OPT3 = source, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_3INT_4STRING_START(HDL);
-   E_Config_Binding_Signal eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.signal = params[1];
-   eb.source = params[2];
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[3];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[4]);
-   eb.action = params[5];
-   eb.params = params[6];
- 
-   REQ_3INT_4STRING_END(eb.context, eb.modifiers, eb.any_mod, eb.signal, eb.source, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT3_STRING4(v, HDL)
-   E_Config_Binding_Signal bind, *eb;
-
-   bind.context = v->val1;
-   bind.signal = v->str1;
-   bind.source = v->str2;
-   bind.modifiers = v->val2;
-   bind.any_mod = v->val3;
-   bind.action = v->str3;
-   bind.params = v->str4;
-   
-   eb = e_config_binding_signal_match(&bind);
-   if (eb)
-     {
-	e_config->signal_bindings = eina_list_remove(e_config->signal_bindings, eb);
-        if (eb->signal) eina_stringshare_del(eb->signal);
-        if (eb->source) eina_stringshare_del(eb->source);
-        if (eb->action) eina_stringshare_del(eb->action);
-        if (eb->params) eina_stringshare_del(eb->params);
-        E_FREE(eb);
-        e_bindings_signal_del(bind.context, bind.signal, bind.source, bind.modifiers,
-			      bind.any_mod, bind.action, bind.params);
-        e_config_save_queue();
-     }
-   END_INT3_STRING4(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_WHEEL_LIST 
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-wheel-list", 0, "List all wheel bindings", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action or send reply */
-   SEND_INT5_STRING2_LIST(e_config->wheel_bindings, E_Config_Binding_Wheel, emb, v, HDL);
-   v->val1 = emb->context;
-   v->val2 = emb->direction;
-   v->val3 = emb->z;
-   v->val4 = emb->modifiers;
-   v->val5 = emb->any_mod;
-   v->str1 = (char *) emb->action;
-   v->str2 = (char *) emb->params;
-   END_SEND_INT5_STRING2_LIST(v, E_IPC_OP_BINDING_WHEEL_LIST_REPLY);
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_WHEEL_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   /* e_remote decode the response from e_ipc and print it to the console */
-   INT5_STRING2_LIST(v, HDL);
-   {
-      char *context;
-      char modifier[256];
-      char *s1, *s2;
-      
-      if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
-      else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
-      else if (v->val1 == E_BINDING_CONTEXT_BORDER) context = "BORDER";
-      else if (v->val1 == E_BINDING_CONTEXT_ZONE) context = "ZONE";
-      else if (v->val1 == E_BINDING_CONTEXT_CONTAINER) context = "CONTAINER";
-      else if (v->val1 == E_BINDING_CONTEXT_MANAGER) context = "MANAGER";
-      else if (v->val1 == E_BINDING_CONTEXT_MENU) context = "MENU";
-      else if (v->val1 == E_BINDING_CONTEXT_WINLIST) context = "WINLIST";
-      else if (v->val1 == E_BINDING_CONTEXT_POPUP) context = "POPUP";
-      else if (v->val1 == E_BINDING_CONTEXT_ANY) context = "ANY";
-      else context = "";
- 
-      modifier[0] = 0;
-      if (v->val4 & E_BINDING_MODIFIER_SHIFT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "SHIFT");
-      }
-      if (v->val4 & E_BINDING_MODIFIER_CTRL)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "CTRL");
-      }
-      if (v->val4 & E_BINDING_MODIFIER_ALT)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "ALT");
-      }
-      if (v->val4 & E_BINDING_MODIFIER_WIN)
-      {
-        if (modifier[0] != 0) strcat(modifier, "|");
-        strcat(modifier, "WIN");
-      }
-      if (v->val4 == E_BINDING_MODIFIER_NONE)
-         strcpy(modifier, "NONE");
-
-      s1 = v->str1;
-      s2 = v->str2;
-      if (!s1) s1 = "";
-      if (!s2) s2 = "";
-      printf("REPLY: BINDING CONTEXT=%s DIRECTION=%i Z=%i MODIFIERS=%s ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
-		context,
-                v->val2,
-                v->val3,
-		modifier,
-                v->val5,
-                s1,
-                s2
-        );
-   }
-   END_INT5_STRING2_LIST(v);
-#elif E_LIB_IN
-   INT5_STRING2_LIST_START(v, HDL);
-   {
-      int count;
-      RESPONSE(r, E_Response_Binding_Wheel_List);
-      count = eina_list_count(dat);
-      r->bindings = malloc(sizeof(E_Response_Binding_Wheel_Data *) * count);
-      r->count = count;
-
-      count = 0;
-      INT5_STRING2_LIST_ITERATE(v);
-      {
-	 E_Response_Binding_Wheel_Data *d;
-
-	 d = malloc(sizeof(E_Response_Binding_Wheel_Data));
-	 d->ctx = v->val1;
-	 d->direction = v->val2;
-	 d->z = v->val3;
-	 d->mod = v->val4;
-	 d->any_mod = v->val5;
-	 d->action = ((v->str1) ? eina_stringshare_add(v->str1) : NULL);
-	 d->params = ((v->str2) ? eina_stringshare_add(v->str2) : NULL);
-
-	 r->bindings[count] = d;
-	 count++;
-      }
-      END_INT5_STRING2_LIST_ITERATE(v);
-      /* this will leak, need to free the event data */
-      END_RESPONSE(r, E_RESPONSE_BINDING_WHEEL_LIST);
-   }
-   END_INT5_STRING2_LIST_START();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_WHEEL_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-wheel-add", 7, "Add an existing wheel binding. OPT1 = Context, OPT2 = direction, OPT3 = z, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_5INT_2STRING_START(HDL);
-   E_Config_Binding_Wheel eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.direction = atoi(params[1]);
-   eb.z = atoi(params[2]);
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[3];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT4 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT4 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[4]);
-   eb.action = params[5];
-   eb.params = params[6];
-   REQ_5INT_2STRING_END(eb.context, eb.direction, eb.z, eb.modifiers, eb.any_mod, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT5_STRING2(v, HDL)
-   E_Config_Binding_Wheel bind, *eb;
-
-   bind.context = v->val1; 
-   bind.direction = v->val2;
-   bind.z = v->val3;
-   bind.modifiers = v->val4;
-   bind.any_mod = v->val5;
-   bind.action = v->str1; 
-   bind.params = v->str2;
-
-   eb = e_config_binding_wheel_match(&bind);
-   if (!eb)
-     {
-        eb = E_NEW(E_Config_Binding_Wheel, 1);
-        e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, eb);
-        eb->context = bind.context;
-        eb->direction = bind.direction;
-        eb->z = bind.z;
-        eb->modifiers = bind.modifiers;
-        eb->any_mod = bind.any_mod;
-        if (bind.action) eb->action = eina_stringshare_add(bind.action);
-        if (bind.params) eb->params = eina_stringshare_add(bind.params);
-        e_bindings_wheel_add(bind.context, bind.direction, bind.z, bind.modifiers,
-			     bind.any_mod, bind.action, bind.params);
-        e_config_save_queue();  
-     }
-   END_INT5_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_BINDING_WHEEL_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   /* e_remote define command line args */
-   OP("-binding-wheel-del", 7, "Delete an existing wheel binding. OPT1 = Context, OPT2 = direction, OPT3 = z, OPT4 = modifiers, OPT5 = any modifier ok, OPT6 = action, OPT7 = action parameters", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   /* e_remote parse command line args encode and send request */
-   REQ_5INT_2STRING_START(HDL);
-   E_Config_Binding_Wheel eb;
-
-   if (!strcmp(params[0], "NONE")) eb.context = E_BINDING_CONTEXT_NONE;
-   else if (!strcmp(params[0], "UNKNOWN")) eb.context = E_BINDING_CONTEXT_UNKNOWN;
-   else if (!strcmp(params[0], "BORDER")) eb.context = E_BINDING_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "ZONE")) eb.context = E_BINDING_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "CONTAINER")) eb.context = E_BINDING_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "MANAGER")) eb.context = E_BINDING_CONTEXT_MANAGER;
-   else if (!strcmp(params[0], "MENU")) eb.context = E_BINDING_CONTEXT_MENU;
-   else if (!strcmp(params[0], "WINLIST")) eb.context = E_BINDING_CONTEXT_WINLIST;
-   else if (!strcmp(params[0], "POPUP")) eb.context = E_BINDING_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "ANY")) eb.context = E_BINDING_CONTEXT_ANY;
-   else
-     {
-        printf("OPT1 (CONTEXT) is not a valid context. Must be:\n"
-               "  NONE UNKNOWN BORDER ZONE CONTAINER MANAGER MENU WINLIST POPUP ANY\n");
-        exit(-1);
-     }
-   eb.direction = atoi(params[1]);
-   eb.z = atoi(params[2]);
-   /* M1[|M2...] */
-     {
-        char *p, *pp;
-
-        eb.modifiers = 0;
-        pp = params[3];
-        for (;;)
-          {
-             p = strchr(pp, '|');
-             if (p)
-               {
-                  if (!strncmp(pp, "SHIFT|", 6)) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strncmp(pp, "CTRL|", 5)) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strncmp(pp, "ALT|", 4)) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strncmp(pp, "WIN|", 4)) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  pp = p + 1;
-               }
-             else
-               {
-                  if (!strcmp(pp, "SHIFT")) eb.modifiers |= E_BINDING_MODIFIER_SHIFT;
-                  else if (!strcmp(pp, "CTRL")) eb.modifiers |= E_BINDING_MODIFIER_CTRL;
-                  else if (!strcmp(pp, "ALT")) eb.modifiers |= E_BINDING_MODIFIER_ALT;
-                  else if (!strcmp(pp, "WIN")) eb.modifiers |= E_BINDING_MODIFIER_WIN;
-                  else if (!strcmp(pp, "NONE")) eb.modifiers = E_BINDING_MODIFIER_NONE;
-                  else if (pp[0] != 0)
-                    {
-                       printf("OPT3 moidifier unknown. Must be or mask of:\n"
-                              "  SHIFT CTRL ALT WIN (eg SHIFT|CTRL or ALT|SHIFT|CTRL or ALT or just NONE)\n");
-                       exit(-1);
-                    }
-                  break;
-               }
-          }
-     }
-   eb.any_mod = atoi(params[4]);
-   eb.action = params[5];
-   eb.params = params[6];
- 
-   REQ_5INT_2STRING_END(eb.context, eb.direction, eb.z, eb.modifiers, eb.any_mod, eb.action, eb.params, HDL);
-#elif (TYPE == E_WM_IN)
-   /* e_ipc decode request and do action */
-   INT5_STRING2(v, HDL)
-   E_Config_Binding_Wheel bind, *eb;
-
-   bind.context = v->val1;
-   bind.direction = v->val2;
-   bind.z = v->val3;
-   bind.modifiers = v->val4;
-   bind.any_mod = v->val5;
-   bind.action = v->str1;
-   bind.params = v->str2;
-   
-   eb = e_config_binding_wheel_match(&bind);
-   if (eb)
-     {
-	e_config->wheel_bindings = eina_list_remove(e_config->wheel_bindings, eb);
-        if (eb->action) eina_stringshare_del(eb->action);
-        if (eb->params) eina_stringshare_del(eb->params);
-        E_FREE(eb);
-        e_bindings_wheel_del(bind.context, bind.direction, bind.z, bind.modifiers,
-			     bind.any_mod, bind.action, bind.params);
-        e_config_save_queue();
-     }
-   END_INT5_STRING2(v);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-focus-while-selecting-set", 1, "Set winlist (alt+tab) focus while selecting policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_focus_while_selecting = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_focus_while_selecting, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-focus-while-selecting-get", 0, "Get winlist (alt+tab) focus while selecting policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_focus_while_selecting, E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-raise-while-selecting-set", 1, "Set winlist (alt+tab) raise while selecting policy", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->winlist_list_raise_while_selecting = policy;
-   E_CONFIG_LIMIT(e_config->winlist_list_raise_while_selecting, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-winlist-list-raise-while-selecting-get", 0, "Get winlist (alt+tab) raise while selecting policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->winlist_list_raise_while_selecting, E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   printf("REPLY: POLICY=%d\n", policy);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_CATEGORY_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-theme-category-list", 0, "List all available theme categories", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   ENCODE(e_theme_category_list(), e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_THEME_CATEGORY_LIST_REPLY);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_THEME_CATEGORY_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-transition-list", 0, "List all available transitions", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   ENCODE(e_theme_transition_list(), e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_TRANSITION_LIST_REPLY);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_TRANSITION_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ACTION_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-action-list", 0, "List all available actions", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   ENCODE(e_action_name_list(), e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_ACTION_LIST_REPLY);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_ACTION_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_ADD
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-profile-add", 1, "Add profile named OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   e_config_profile_add(s);
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_PROFILE_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-profile-del", 1, "Delete profile named OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (!strcmp(e_config_profile_get(), s))
-     {
-	printf("Can't delete active profile\n");
-	exit(-1);
-     }
-   e_config_profile_del(s);
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DEFAULT_ENGINE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-engine-set", 1, "Set the default rendering engine to OPT1 (SOFTWARE, SOFTWARE_16 or XRENDER)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "SOFTWARE")) value = E_EVAS_ENGINE_SOFTWARE_X11;
-   else if (!strcmp(params[0], "GL"))
-     {
-	value = E_EVAS_ENGINE_GL_X11;
-	printf("GL engine is disabled as default engine.\n");
-	exit(-1);
-     }
-   else if (!strcmp(params[0], "XRENDER")) value = E_EVAS_ENGINE_XRENDER_X11;
-   else if (!strcmp(params[0], "SOFTWARE_16")) value = E_EVAS_ENGINE_SOFTWARE_X11_16;
-   else
-     {
-	printf("engine must be SOFTWARE or XRENDER\n");
-	exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->evas_engine_default = value;
-   E_CONFIG_LIMIT(e_config->evas_engine_default, E_EVAS_ENGINE_SOFTWARE_X11, E_EVAS_ENGINE_XRENDER_X11);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DEFAULT_ENGINE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-default-engine-get", 0, "Get the default rendering engine", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->evas_engine_default, E_IPC_OP_DEFAULT_ENGINE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_DEFAULT_ENGINE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(engine, HDL);
-   if (engine == E_EVAS_ENGINE_SOFTWARE_X11)
-     printf("REPLY: SOFTWARE\n");
-   else if (engine == E_EVAS_ENGINE_GL_X11)
-     printf("REPLY: GL\n");
-   else if (engine == E_EVAS_ENGINE_XRENDER_X11)
-     printf("REPLY: XRENDER\n");
-   else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
-     printf("REPLY: SOFTWARE_16\n");
-   else
-     printf("REPLY: UNKNOWN ENGINE: %d\n", engine);
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ENGINE_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-engine-list", 0, "List all existing rendering engines", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   Eina_List *engines;
-   engines = e_config_engine_list();
-   ENCODE(engines, e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_ENGINE_LIST_REPLY);
-   FREE_LIST(engines);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ENGINE_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ENGINE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-engine-set", 2, "Set the rendering engine for OPT1 to OPT2 (SOFTWARE or XRENDER)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_2INT_START(HDL)
-   int context = 0, engine = 0;
-   if (!strcmp(params[0], "INIT")) context = E_ENGINE_CONTEXT_INIT;
-   else if (!strcmp(params[0], "CONTAINER")) context = E_ENGINE_CONTEXT_CONTAINER;
-   else if (!strcmp(params[0], "ZONE")) context = E_ENGINE_CONTEXT_ZONE;
-   else if (!strcmp(params[0], "BORDER")) context = E_ENGINE_CONTEXT_BORDER;
-   else if (!strcmp(params[0], "MENU")) context = E_ENGINE_CONTEXT_MENU;
-   else if (!strcmp(params[0], "ERROR")) context = E_ENGINE_CONTEXT_ERROR;
-   else if (!strcmp(params[0], "WIN")) context = E_ENGINE_CONTEXT_WIN;
-   else if (!strcmp(params[0], "POPUP")) context = E_ENGINE_CONTEXT_POPUP;
-   else if (!strcmp(params[0], "DRAG")) context = E_ENGINE_CONTEXT_DRAG;
-   else
-     {
-	 printf("context must be INIT, CONTAINER, ZONE, BORDER, MENU, ERROR, WIN, POPUP or DRAG\n");
-	 exit(-1);
-     }
-   if (!strcmp(params[1], "DEFAULT")) engine = E_EVAS_ENGINE_DEFAULT;
-   else if (!strcmp(params[1], "SOFTWARE")) engine = E_EVAS_ENGINE_SOFTWARE_X11;
-   else if (!strcmp(params[1], "GL"))
-     {
-	engine = E_EVAS_ENGINE_GL_X11;
-	printf("GL engine is disabled as default engine.\n");
-	exit(-1);
-     }
-   else if (!strcmp(params[1], "XRENDER")) engine = E_EVAS_ENGINE_XRENDER_X11;
-   else if (!strcmp(params[1], "SOFTWARE_16")) engine = E_EVAS_ENGINE_SOFTWARE_X11_16;
-   else
-     {
-	 printf("engine must be DEFAULT, SOFTWARE or XRENDER\n");
-	 exit(-1);
-     }
-   REQ_2INT_END(context, engine, HDL);
-#elif (TYPE == E_WM_IN)
-   START_2INT(context, engine, HDL);
-   switch (context)
-     {
-      case E_ENGINE_CONTEXT_INIT:
-	 e_config->evas_engine_init = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_init, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_CONTAINER:
-	 e_config->evas_engine_container = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_container, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_ZONE:
-	 e_config->evas_engine_zone = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_zone, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_BORDER:
-	 e_config->evas_engine_borders = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_borders, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_MENU:
-	 e_config->evas_engine_menus = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_menus, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_ERROR:
-	 e_config->evas_engine_errors = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_errors, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_WIN:
-	 e_config->evas_engine_win = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_win, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_POPUP:
-	 e_config->evas_engine_popups = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_popups, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      case E_ENGINE_CONTEXT_DRAG:
-	 e_config->evas_engine_drag = engine;
-	 E_CONFIG_LIMIT(e_config->evas_engine_drag, E_EVAS_ENGINE_DEFAULT, E_EVAS_ENGINE_XRENDER_X11);
-	 break;
-      default:
-	 printf("Unknown context: %d\n", context);
-	 break;
-     }
-   SAVE;
-   END_2INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_ENGINE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-engine-get", 1, "Get the rendering engine for OPT1", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(context, HDL);
-   int engine = 0;
-   /* TODO, this should come from a define */
-   int bytes = 0;
-   switch (context)
-     {
-      case E_ENGINE_CONTEXT_INIT:
-	 engine = e_config->evas_engine_init;
-	 break;
-      case E_ENGINE_CONTEXT_CONTAINER:
-	 engine = e_config->evas_engine_container;
-	 break;
-      case E_ENGINE_CONTEXT_ZONE:
-	 engine = e_config->evas_engine_zone;
-	 break;
-      case E_ENGINE_CONTEXT_BORDER:
-	 engine = e_config->evas_engine_borders;
-	 break;
-      case E_ENGINE_CONTEXT_MENU:
-	 engine = e_config->evas_engine_menus;
-	 break;
-      case E_ENGINE_CONTEXT_ERROR:
-	 engine = e_config->evas_engine_errors;
-	 break;
-      case E_ENGINE_CONTEXT_WIN:
-	 engine = e_config->evas_engine_win;
-	 break;
-      case E_ENGINE_CONTEXT_POPUP:
-	 engine = e_config->evas_engine_popups;
-	 break;
-      case E_ENGINE_CONTEXT_DRAG:
-	 engine = e_config->evas_engine_drag;
-	 break;
-      default:
-	 printf("Unknown context: %d\n", context);
-	 break;
-     }
-   ENCODE(engine, e_ipc_codec_int_enc);
-   SEND_DATA(E_IPC_OP_ENGINE_GET_REPLY);
-
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_ENGINE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(engine, HDL);
-   if (engine == E_EVAS_ENGINE_DEFAULT)
-     printf("REPLY: DEFAULT\n");
-   else if (engine == E_EVAS_ENGINE_SOFTWARE_X11)
-     printf("REPLY: SOFTWARE\n");
-   else if (engine == E_EVAS_ENGINE_GL_X11)
-     printf("REPLY: GL\n");
-   else if (engine == E_EVAS_ENGINE_XRENDER_X11)
-     printf("REPLY: XRENDER\n");
-   else if (engine == E_EVAS_ENGINE_SOFTWARE_X11_16)
-     printf("REPLY: SOFTWARE_16\n");
-   else
-     printf("REPLY: UNKNOWN ENGINE: %d\n", engine);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_NAME_SHOW_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-name-show-set", 1, "Set whether to show eapps' name field in menus", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->menu_eap_name_show = val;
-   E_CONFIG_LIMIT(e_config->menu_eap_name_show, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_NAME_SHOW_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-name-show-get", 0, "Get whether eapps' name field is shown in menus", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->menu_eap_name_show, E_IPC_OP_MENU_EAP_NAME_SHOW_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_NAME_SHOW_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_GENERIC_SHOW_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-generic-show-set", 1, "Set whether to show eapps' generic field in menus", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->menu_eap_generic_show = val;
-   E_CONFIG_LIMIT(e_config->menu_eap_generic_show, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_GENERIC_SHOW_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-generic-show-get", 0, "Get whether eapps' generic field is shown in menus", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->menu_eap_generic_show, E_IPC_OP_MENU_EAP_GENERIC_SHOW_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_GENERIC_SHOW_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_COMMENT_SHOW_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-comment-show-set", 1, "Set whether to show eapps' comment field in menus", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->menu_eap_comment_show = val;
-   E_CONFIG_LIMIT(e_config->menu_eap_comment_show, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_COMMENT_SHOW_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-menu-eap-comment-show-get", 0, "Get whether eapps' comment field is shown in menus", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->menu_eap_comment_show, E_IPC_OP_MENU_EAP_COMMENT_SHOW_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_MENU_EAP_COMMENT_SHOW_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FULLSCREEN_POLICY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-fullscreen-policy-set", 1, "Set the fullscreen policy. OPT1 = RESIZE or ZOOM", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "RESIZE")) value = E_FULLSCREEN_RESIZE;
-   else if (!strcmp(params[0], "ZOOM")) value = E_FULLSCREEN_ZOOM;
-   else
-     {
-	 printf("fullscreen must be RESIZE or ZOOM\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->fullscreen_policy = value;
-   E_CONFIG_LIMIT(e_config->fullscreen_policy, E_FULLSCREEN_RESIZE, E_FULLSCREEN_ZOOM);
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FULLSCREEN_POLICY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-fullscreen-policy-get", 0, "Get fullscreen policy", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->fullscreen_policy, E_IPC_OP_FULLSCREEN_POLICY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FULLSCREEN_POLICY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == E_FULLSCREEN_RESIZE)
-     printf("REPLY: RESIZE\n");
-   else if (policy == E_FULLSCREEN_ZOOM)
-     printf("REPLY: ZOOM\n");
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color-set", 5, "Set color_class (OPT1) r, g, b, a (OPT2-5)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING_4INT(params[0], atoi(params[1]), atoi(params[2]), atoi(params[3]), atoi(params[4]), HDL) 
-#elif (TYPE == E_WM_IN)
-   STRING_4INT(color_class, r, g, b, a, e_str_4int, HDL);
-   e_color_class_set(color_class, r, g, b, a, -1, -1, -1, -1, -1, -1, -1, -1);
-   SAVE;   
-   END_STRING_4INT(e_str_4int);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR2_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color2-set", 5, "Set color_class (OPT1) color2 r, g, b, a (OPT2-5)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING_4INT(params[0], atoi(params[1]), atoi(params[2]), atoi(params[3]), atoi(params[4]), HDL) 
-#elif (TYPE == E_WM_IN)
-   STRING_4INT(color_class, r, g, b, a, e_str_4int, HDL);
-   e_color_class_set(color_class, -1, -1, -1, -1, r, g, b, a, -1, -1, -1, -1);
-   SAVE;   
-   END_STRING_4INT(e_str_4int);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR3_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color3-set", 5, "Set color_class (OPT1) color3 r, g, b, a (OPT2-5)", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING_4INT(params[0], atoi(params[1]), atoi(params[2]), atoi(params[3]), atoi(params[4]), HDL) 
-#elif (TYPE == E_WM_IN)
-   STRING_4INT(color_class, r, g, b, a, e_str_4int, HDL);
-   e_color_class_set(color_class, -1, -1, -1, -1, -1, -1, -1, -1, r, g, b, a);
-   SAVE;   
-   END_STRING_4INT(e_str_4int);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color-list", 0, "List color values for all set color classes", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = (char *) cc->name;
-   v->val1 = cc->r;
-   v->val2 = cc->g;
-   v->val3 = cc->b;
-   v->val4 = cc->a;
-   END_SEND_STRING_INT4_LIST(v, E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR2_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color2-list", 0, "List color2 values for all set color classes", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = (char *) cc->name;
-   v->val1 = cc->r2;
-   v->val2 = cc->g2;
-   v->val3 = cc->b2;
-   v->val4 = cc->a2;
-   END_SEND_STRING_INT4_LIST(v, E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR3_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-color3-list", 0, "List color3 values for all set color classes", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING_INT4_LIST(e_color_class_list(), E_Color_Class, cc, v, HDL);
-   v->str = (char *) cc->name;
-   v->val1 = cc->r3;
-   v->val2 = cc->g3;
-   v->val3 = cc->b3;
-   v->val4 = cc->a3;
-   END_SEND_STRING_INT4_LIST(v, E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_DEL
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-del", 1, "Delete color class named OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   e_color_class_del(s);
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING_INT4_LIST(v, HDL);
-   if (v->str) printf("REPLY: \"%s\" (RGBA) %i %i %i %i\n", v->str, v->val1, v->val2, v->val3, v->val4);
-   else printf("REPLY: \"\" (RGBA) %i %i %i %i\n", v->val1, v->val2, v->val3, v->val4);
-   END_STRING_INT4_LIST(v);
-#elif (TYPE == E_LIB_IN)
-   /* FIXME implement */
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_LIST
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-color-class-list", 0, "List all color classes used by currently loaded edje objects", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   ENCODE_START();
-   ENCODE(edje_color_class_list(), e_ipc_codec_str_list_enc);
-   SEND_DATA(E_IPC_OP_COLOR_CLASS_LIST_REPLY);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_COLOR_CLASS_LIST_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   GENERIC(HDL);
-   LIST();
-   DECODE(e_ipc_codec_str_list_dec) {
-      FOR(dat) {
-	 printf("REPLY: \"%s\"\n", (char *)(l->data));
-      }
-      FREE_LIST(dat);
-   }
-   END_GENERIC();
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cfgdlg-auto-apply-set", 1, "Set config dialogs to use auto apply, 1 for enabled 0 for disabled", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->cfgdlg_auto_apply = policy;
-   E_CONFIG_LIMIT(e_config->cfgdlg_auto_apply, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cfgdlg-auto-apply-get", 0, "Get config dialogs use auto apply policy, 1 for enabled 0 for disabled", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->cfgdlg_auto_apply, E_IPC_OP_CFGDLG_AUTO_APPLY_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == 0) 
-     printf("REPLY: Disabled\n");
-   if (policy == 1) 
-     printf("REPLY: Enabled\n");
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cfgdlg-default-mode-set", 1, "Set default mode for config dialogs. OPT1 = BASIC or ADVANCED", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT_START(HDL)
-   int value = 0;
-   if (!strcmp(params[0], "BASIC")) value = E_CONFIG_DIALOG_CFDATA_TYPE_BASIC;
-   else if (!strcmp(params[0], "ADVANCED")) value = E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED;
-   else
-     {
-	 printf("default mode must be BASIC or ADVANCED\n");
-	 exit(-1);
-     }
-   REQ_INT_END(value, HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(value, HDL);
-   e_config->cfgdlg_default_mode = value;
-   E_CONFIG_LIMIT(e_config->cfgdlg_default_mode, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
-   SAVE;
-   END_INT
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-cfgdlg-default-mode-get", 0, "Get default mode for config dialogs", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->cfgdlg_default_mode, E_IPC_OP_CFGDLG_DEFAULT_MODE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
-     printf("REPLY: BASIC\n");
-   else if (policy == E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED)
-     printf("REPLY: ADVANCED\n");
-   END_INT
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKTOP_LOCK
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-lock-desktop", 0, "Locks the desktop", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   e_desklock_show();
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_INIT_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-init-set", 1, "Set edje file (OPT1) to use for init screen", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (e_config->init_default_theme) eina_stringshare_del(e_config->init_default_theme);
-   e_config->init_default_theme = NULL;
-   if (s) 
-     {
-	const char *i;
-	const char *f;
-	f = ecore_file_file_get(s);
-	i = e_path_find(path_themes, f);
-	if (!e_util_edje_collection_exists(i, "init/splash")) 
-	  {
-	     printf("The edje file you selected does not contain any init information.\n");
-	     exit(-1);
-	  }
-	if (f) e_config->init_default_theme = eina_stringshare_add(f);
-     }
-  SAVE;
-  END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_INIT_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-init-get", 0, "Get the current edje file for init screen", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->init_default_theme, E_IPC_OP_INIT_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_INIT_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   if (s) printf("REPLY: \"%s\"\n", s);
-   else printf("REPLY: \"\"\n");
-   END_STRING(s);
-#elif (TYPE == E_LIB_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_HINTING_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-hinting-set", 1, "Set font hinting method to use, 0 = Bytecode, 1 = Auto, 2 = None", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->font_hinting = policy;
-   E_CONFIG_LIMIT(e_config->font_hinting, 0, 2);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_HINTING_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-font-hinting-get", 0, "Get font hinting method", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->font_hinting, E_IPC_OP_FONT_HINTING_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_FONT_HINTING_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(policy, HDL);
-   if (policy == 0) 
-     printf("REPLY: Bytecode\n");
-   else if (policy == 1) 
-     printf("REPLY: Auto\n");
-   else if (policy == 2) 
-     printf("REPLY: None\n"); 
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_COMPOSITE_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-composite-set", 1, "Set whether composite should be used", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->use_composite = val;
-   E_CONFIG_LIMIT(e_config->use_composite, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_COMPOSITE_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-use-composite-get", 0, "Get whether composite should be used", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->use_composite, E_IPC_OP_USE_COMPOSITE_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_USE_COMPOSITE_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-remember-internal-windows-set", 1, "Set whether internal windows should be remembered", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(val, HDL);
-   e_config->remember_internal_windows = val;
-   E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-remember-internal-windows-get", 0, "Get whether internal windows are remembered", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->remember_internal_windows, E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: %d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_LOGOUT
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-logout", 0, "Logout your user", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   E_Action  *act;
-   act = e_action_find("logout");
-   if (act && act->func.go)
-      act->func.go(NULL, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_HIBERNATE
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-hibernate", 0, "Hibernate the computer", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   E_Action  *act;
-   act = e_action_find("hibernate");
-   if (act && act->func.go)
-      act->func.go(NULL, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_REBOOT
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-reboot", 0, "Reboot the computer", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   E_Action  *act;
-   act = e_action_find("reboot");
-   if (act && act->func.go)
-      act->func.go(NULL, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_SUSPEND
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-suspend", 0, "Suspend the computer", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   E_Action  *act;
-   act = e_action_find("suspend");
-   if (act && act->func.go)
-      act->func.go(NULL, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_HALT
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-shutdown", 0, "Halt (shutdown) the computer", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   GENERIC(HDL);
-   E_Action  *act;
-   act = e_action_find("halt");
-   if (act && act->func.go)
-      act->func.go(NULL, NULL);
-   END_GENERIC();
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desklock-use-custom-desklock-set", 1, "Set whether a custom desklock will be utilized", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_INT(atoi(params[0]), HDL);
-#elif (TYPE == E_WM_IN)
-   START_INT(policy, HDL);
-   e_config->desklock_use_custom_desklock = policy;
-   E_CONFIG_LIMIT(e_config->desklock_use_custom_desklock, 0, 1);
-   SAVE;
-   END_INT;
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desklock-use-custom-desklock-get", 0, "Get whether a custom desklock is being used", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_INT(e_config->desklock_use_custom_desklock, E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   START_INT(val, HDL);
-   printf("REPLY: POLICY=%d\n", val);
-   END_INT;
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_SET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desklock-custom-desklock-cmd-set", 1, "Set the current custom desklock command to OPT1", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
-   STRING(s, HDL);
-   if (e_config->desklock_custom_desklock_cmd)
-	   eina_stringshare_del(e_config->desklock_custom_desklock_cmd);
-   e_config->desklock_custom_desklock_cmd = eina_stringshare_add(s);   
-   END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET
-#if (TYPE == E_REMOTE_OPTIONS)
-   OP("-desklock-custom-desklock-cmd-get", 0, "Get the current custom desklock command", 1, HDL)
-#elif (TYPE == E_REMOTE_OUT)
-   REQ_NULL(HDL);
-#elif (TYPE == E_WM_IN)
-   SEND_STRING(e_config->desklock_custom_desklock_cmd, E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET_REPLY, HDL);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-     
-/****************************************************************************/
-#define HDL E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET_REPLY
-#if (TYPE == E_REMOTE_OPTIONS)
-#elif (TYPE == E_REMOTE_OUT)
-#elif (TYPE == E_WM_IN)
-#elif (TYPE == E_REMOTE_IN)
-   STRING(s, HDL);
-   printf("REPLY: \"%s\"\n", s);
-   END_STRING(s);
-#endif
-#undef HDL
diff --git a/src/bin/e_ipc_handlers_list.h b/src/bin/e_ipc_handlers_list.h
deleted file mode 100644
index de752da..0000000
--- a/src/bin/e_ipc_handlers_list.h
+++ /dev/null
@@ -1,424 +0,0 @@
-#define E_IPC_OP_MODULE_LOAD 1
-#define E_IPC_OP_MODULE_UNLOAD 2
-#define E_IPC_OP_MODULE_ENABLE 3
-#define E_IPC_OP_MODULE_DISABLE 4
-#define E_IPC_OP_MODULE_LIST 5
-#define E_IPC_OP_MODULE_LIST_REPLY 6
-#define E_IPC_OP_BG_SET 7
-#define E_IPC_OP_BG_GET 8
-#define E_IPC_OP_BG_GET_REPLY 9
-#define E_IPC_OP_FONT_AVAILABLE_LIST 10
-#define E_IPC_OP_FONT_AVAILABLE_LIST_REPLY 11
-#define E_IPC_OP_FONT_APPLY 12
-#define E_IPC_OP_FONT_FALLBACK_CLEAR 13
-#define E_IPC_OP_FONT_FALLBACK_APPEND 14
-#define E_IPC_OP_FONT_FALLBACK_PREPEND 15
-#define E_IPC_OP_FONT_FALLBACK_LIST 16
-#define E_IPC_OP_FONT_FALLBACK_LIST_REPLY 17
-#define E_IPC_OP_FONT_FALLBACK_REMOVE 18
-#define E_IPC_OP_FONT_DEFAULT_SET 19
-#define E_IPC_OP_FONT_DEFAULT_GET 20
-#define E_IPC_OP_FONT_DEFAULT_GET_REPLY 21
-#define E_IPC_OP_FONT_DEFAULT_REMOVE 22
-#define E_IPC_OP_FONT_DEFAULT_LIST 23
-#define E_IPC_OP_FONT_DEFAULT_LIST_REPLY 24
-#define E_IPC_OP_RESTART 25
-#define E_IPC_OP_SHUTDOWN 26
-#define E_IPC_OP_LANG_LIST 27
-#define E_IPC_OP_LANG_LIST_REPLY 28
-#define E_IPC_OP_LANG_SET 29
-#define E_IPC_OP_LANG_GET 30
-#define E_IPC_OP_LANG_GET_REPLY 31
-#define E_IPC_OP_BINDING_MOUSE_LIST 32
-#define E_IPC_OP_BINDING_MOUSE_LIST_REPLY 33
-#define E_IPC_OP_BINDING_MOUSE_ADD 34
-#define E_IPC_OP_BINDING_MOUSE_DEL 35
-#define E_IPC_OP_BINDING_KEY_LIST 36
-#define E_IPC_OP_BINDING_KEY_LIST_REPLY 37
-#define E_IPC_OP_BINDING_KEY_ADD 38
-#define E_IPC_OP_BINDING_KEY_DEL 39
-#define E_IPC_OP_MENUS_SCROLL_SPEED_SET 40
-#define E_IPC_OP_MENUS_SCROLL_SPEED_GET 41
-#define E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY 42
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_SET 43
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET 44
-#define E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY 45
-#define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET 46
-#define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET 47
-#define E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY 48
-#define E_IPC_OP_BORDER_SHADE_ANIMATE_SET 49
-#define E_IPC_OP_BORDER_SHADE_ANIMATE_GET 50
-#define E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY 51
-#define E_IPC_OP_BORDER_SHADE_TRANSITION_SET 52
-#define E_IPC_OP_BORDER_SHADE_TRANSITION_GET 53
-#define E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY 54
-#define E_IPC_OP_BORDER_SHADE_SPEED_SET 55
-#define E_IPC_OP_BORDER_SHADE_SPEED_GET 56
-#define E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY 57
-#define E_IPC_OP_FRAMERATE_SET 58
-#define E_IPC_OP_FRAMERATE_GET 59
-#define E_IPC_OP_FRAMERATE_GET_REPLY 60
-#define E_IPC_OP_IMAGE_CACHE_SET 61
-#define E_IPC_OP_IMAGE_CACHE_GET 62
-#define E_IPC_OP_IMAGE_CACHE_GET_REPLY 63
-#define E_IPC_OP_FONT_CACHE_SET 64
-#define E_IPC_OP_FONT_CACHE_GET 65
-#define E_IPC_OP_FONT_CACHE_GET_REPLY 66
-#define E_IPC_OP_EDGE_FLIP_MOVING_SET 67
-#define E_IPC_OP_EDGE_FLIP_MOVING_GET 68
-#define E_IPC_OP_EDGE_FLIP_MOVING_GET_REPLY 69
-#define E_IPC_OP_EDGE_FLIP_TIMEOUT_SET 70
-#define E_IPC_OP_EDGE_FLIP_TIMEOUT_GET 71
-#define E_IPC_OP_EDGE_FLIP_TIMEOUT_GET_REPLY 72
-#define E_IPC_OP_DIRS_LIST 73
-#define E_IPC_OP_DIRS_LIST_REPLY 74
-#define E_IPC_OP_DIRS_APPEND 75
-#define E_IPC_OP_DIRS_PREPEND 76
-#define E_IPC_OP_DIRS_REMOVE 77
-#define E_IPC_OP_DESKS_SET 78
-#define E_IPC_OP_DESKS_GET 79
-#define E_IPC_OP_DESKS_GET_REPLY 80
-#define E_IPC_OP_FOCUS_POLICY_SET 81
-#define E_IPC_OP_FOCUS_POLICY_GET 82
-#define E_IPC_OP_FOCUS_POLICY_GET_REPLY 83
-#define E_IPC_OP_MAXIMIZE_POLICY_SET 84
-#define E_IPC_OP_MAXIMIZE_POLICY_GET 85
-#define E_IPC_OP_MAXIMIZE_POLICY_GET_REPLY 86
-#define E_IPC_OP_ALWAYS_CLICK_TO_RAISE_SET 87
-#define E_IPC_OP_ALWAYS_CLICK_TO_RAISE_GET 88
-#define E_IPC_OP_ALWAYS_CLICK_TO_RAISE_GET_REPLY 89
-#define E_IPC_OP_USE_AUTO_RAISE_SET 90 
-#define E_IPC_OP_USE_AUTO_RAISE_GET 91
-#define E_IPC_OP_USE_AUTO_RAISE_GET_REPLY 92
-#define E_IPC_OP_PASS_CLICK_ON_SET 93
-#define E_IPC_OP_PASS_CLICK_ON_GET 94
-#define E_IPC_OP_PASS_CLICK_ON_GET_REPLY 95
-#define E_IPC_OP_AUTO_RAISE_DELAY_SET 96
-#define E_IPC_OP_AUTO_RAISE_DELAY_GET 97
-#define E_IPC_OP_AUTO_RAISE_DELAY_GET_REPLY 98
-#define E_IPC_OP_USE_RESIST_SET 99
-#define E_IPC_OP_USE_RESIST_GET 100
-#define E_IPC_OP_USE_RESIST_GET_REPLY 101
-#define E_IPC_OP_DRAG_RESIST_SET 102
-#define E_IPC_OP_DRAG_RESIST_GET 103
-#define E_IPC_OP_DRAG_RESIST_GET_REPLY 104
-#define E_IPC_OP_DESK_RESIST_SET 105
-#define E_IPC_OP_DESK_RESIST_GET 106
-#define E_IPC_OP_DESK_RESIST_GET_REPLY 107
-#define E_IPC_OP_WINDOW_RESIST_SET 108
-#define E_IPC_OP_WINDOW_RESIST_GET 109
-#define E_IPC_OP_WINDOW_RESIST_GET_REPLY 110
-#define E_IPC_OP_GADGET_RESIST_SET 111
-#define E_IPC_OP_GADGET_RESIST_GET 112
-#define E_IPC_OP_GADGET_RESIST_GET_REPLY 113
-#define E_IPC_OP_DESKTOP_BG_ADD 114
-#define E_IPC_OP_DESKTOP_BG_DEL 115
-#define E_IPC_OP_DESKTOP_BG_LIST 116
-#define E_IPC_OP_DESKTOP_BG_LIST_REPLY 117
-#define E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_SET 118
-#define E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_GET 119
-#define E_IPC_OP_WINLIST_WARP_WHILE_SELECTING_GET_REPLY 120
-#define E_IPC_OP_WINLIST_WARP_AT_END_SET 121
-#define E_IPC_OP_WINLIST_WARP_AT_END_GET 122
-#define E_IPC_OP_WINLIST_WARP_AT_END_GET_REPLY 123
-#define E_IPC_OP_WINLIST_WARP_SPEED_SET 124
-#define E_IPC_OP_WINLIST_WARP_SPEED_GET 125
-#define E_IPC_OP_WINLIST_WARP_SPEED_GET_REPLY 126
-#define E_IPC_OP_WINLIST_SCROLL_ANIMATE_SET 127
-#define E_IPC_OP_WINLIST_SCROLL_ANIMATE_GET 128
-#define E_IPC_OP_WINLIST_SCROLL_ANIMATE_GET_REPLY 129
-#define E_IPC_OP_WINLIST_SCROLL_SPEED_SET 130
-#define E_IPC_OP_WINLIST_SCROLL_SPEED_GET 131
-#define E_IPC_OP_WINLIST_SCROLL_SPEED_GET_REPLY 132
-#define E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_SET 133
-#define E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_GET 134
-#define E_IPC_OP_WINLIST_LIST_SHOW_ICONIFIED_GET_REPLY 135
-/* 
- * WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED and WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED
- * can be found below, starting at 366.
- */
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_SET 136
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_GET 137
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_WINDOWS_GET_REPLY 138
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_SET 139
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_GET 140
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_WINDOWS_GET_REPLY 141
-#define E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_SET 142
-#define E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_GET 143
-#define E_IPC_OP_WINLIST_LIST_UNCOVER_WHILE_SELECTING_GET_REPLY 144
-#define E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_SET 145
-#define E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_GET 146
-#define E_IPC_OP_WINLIST_LIST_JUMP_DESK_WHILE_SELECTING_GET_REPLY 147
-#define E_IPC_OP_WINLIST_POS_ALIGN_X_SET 148
-#define E_IPC_OP_WINLIST_POS_ALIGN_X_GET 149
-#define E_IPC_OP_WINLIST_POS_ALIGN_X_GET_REPLY 150
-#define E_IPC_OP_WINLIST_POS_ALIGN_Y_SET 151
-#define E_IPC_OP_WINLIST_POS_ALIGN_Y_GET 152
-#define E_IPC_OP_WINLIST_POS_ALIGN_Y_GET_REPLY 153
-#define E_IPC_OP_WINLIST_POS_SIZE_W_SET 154
-#define E_IPC_OP_WINLIST_POS_SIZE_W_GET 155
-#define E_IPC_OP_WINLIST_POS_SIZE_W_GET_REPLY 156
-#define E_IPC_OP_WINLIST_POS_SIZE_H_SET 157
-#define E_IPC_OP_WINLIST_POS_SIZE_H_GET 158
-#define E_IPC_OP_WINLIST_POS_SIZE_H_GET_REPLY 159
-#define E_IPC_OP_WINLIST_POS_MIN_W_SET 160
-#define E_IPC_OP_WINLIST_POS_MIN_W_GET 161
-#define E_IPC_OP_WINLIST_POS_MIN_W_GET_REPLY 162
-#define E_IPC_OP_WINLIST_POS_MIN_H_SET 163
-#define E_IPC_OP_WINLIST_POS_MIN_H_GET 164
-#define E_IPC_OP_WINLIST_POS_MIN_H_GET_REPLY 165
-#define E_IPC_OP_WINLIST_POS_MAX_W_SET 166
-#define E_IPC_OP_WINLIST_POS_MAX_W_GET 167
-#define E_IPC_OP_WINLIST_POS_MAX_W_GET_REPLY 168
-#define E_IPC_OP_WINLIST_POS_MAX_H_SET 169
-#define E_IPC_OP_WINLIST_POS_MAX_H_GET 170
-#define E_IPC_OP_WINLIST_POS_MAX_H_GET_REPLY 171
-#define E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_SET 172
-#define E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_GET 173
-#define E_IPC_OP_KILL_IF_CLOSE_NOT_POSSIBLE_GET_REPLY 174
-#define E_IPC_OP_KILL_PROCESS_SET 175
-#define E_IPC_OP_KILL_PROCESS_GET 176
-#define E_IPC_OP_KILL_PROCESS_GET_REPLY 177
-#define E_IPC_OP_KILL_TIMER_WAIT_SET 178
-#define E_IPC_OP_KILL_TIMER_WAIT_GET 179
-#define E_IPC_OP_KILL_TIMER_WAIT_GET_REPLY 180
-#define E_IPC_OP_PING_CLIENTS_SET 181
-#define E_IPC_OP_PING_CLIENTS_GET 182
-#define E_IPC_OP_PING_CLIENTS_GET_REPLY 183
-#define E_IPC_OP_PING_CLIENTS_WAIT_SET 184
-#define E_IPC_OP_PING_CLIENTS_WAIT_GET 185
-#define E_IPC_OP_PING_CLIENTS_WAIT_GET_REPLY 186
-#define E_IPC_OP_TRANSITION_START_SET 187
-#define E_IPC_OP_TRANSITION_START_GET 188
-#define E_IPC_OP_TRANSITION_START_GET_REPLY 189
-#define E_IPC_OP_TRANSITION_DESK_SET 190
-#define E_IPC_OP_TRANSITION_DESK_GET 191
-#define E_IPC_OP_TRANSITION_DESK_GET_REPLY 192
-#define E_IPC_OP_TRANSITION_CHANGE_SET 193
-#define E_IPC_OP_TRANSITION_CHANGE_GET 194
-#define E_IPC_OP_TRANSITION_CHANGE_GET_REPLY 195
-#define E_IPC_OP_FOCUS_SETTING_SET 196
-#define E_IPC_OP_FOCUS_SETTING_GET 197
-#define E_IPC_OP_FOCUS_SETTING_GET_REPLY 198
-// 199 is vacant
-#define E_IPC_OP_THEME_LIST 200
-#define E_IPC_OP_THEME_LIST_REPLY 201
-#define E_IPC_OP_THEME_GET 202
-#define E_IPC_OP_THEME_GET_REPLY 203
-#define E_IPC_OP_THEME_REMOVE 204
-#define E_IPC_OP_THEME_SET 205
-#define E_IPC_OP_MOVE_INFO_FOLLOWS_SET 206
-#define E_IPC_OP_MOVE_INFO_FOLLOWS_GET 207
-#define E_IPC_OP_MOVE_INFO_FOLLOWS_GET_REPLY 208
-#define E_IPC_OP_RESIZE_INFO_FOLLOWS_SET 209
-#define E_IPC_OP_RESIZE_INFO_FOLLOWS_GET 210
-#define E_IPC_OP_RESIZE_INFO_FOLLOWS_GET_REPLY 211
-#define E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_SET 212
-#define E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_GET 213
-#define E_IPC_OP_FOCUS_LAST_FOCUSED_PER_DESKTOP_GET_REPLY 214
-#define E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_SET 215
-#define E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_GET 216
-#define E_IPC_OP_FOCUS_REVERT_ON_HIDE_OR_CLOSE_GET_REPLY 217
-#define E_IPC_OP_PROFILE_SET 218
-#define E_IPC_OP_PROFILE_GET 219
-#define E_IPC_OP_PROFILE_GET_REPLY 220
-#define E_IPC_OP_DESKTOP_NAME_ADD 221
-#define E_IPC_OP_DESKTOP_NAME_DEL 222
-#define E_IPC_OP_DESKTOP_NAME_LIST 223
-#define E_IPC_OP_DESKTOP_NAME_LIST_REPLY 224
-#define E_IPC_OP_CURSOR_SIZE_SET 225
-#define E_IPC_OP_CURSOR_SIZE_GET 226
-#define E_IPC_OP_CURSOR_SIZE_GET_REPLY 227
-#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_SET 228
-#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET 229
-#define E_IPC_OP_MENU_AUTOSCROLL_MARGIN_GET_REPLY 230
-#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_SET 231
-#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET 232
-#define E_IPC_OP_MENU_AUTOSCROLL_CURSOR_MARGIN_GET_REPLY 233
-
-#define E_IPC_OP_TRANSIENT_MOVE_SET 234
-#define E_IPC_OP_TRANSIENT_MOVE_GET 235
-#define E_IPC_OP_TRANSIENT_MOVE_GET_REPLY 236
-#define E_IPC_OP_TRANSIENT_RESIZE_SET 237
-#define E_IPC_OP_TRANSIENT_RESIZE_GET 238
-#define E_IPC_OP_TRANSIENT_RESIZE_GET_REPLY 239
-#define E_IPC_OP_TRANSIENT_RAISE_SET 240
-#define E_IPC_OP_TRANSIENT_RAISE_GET 241
-#define E_IPC_OP_TRANSIENT_RAISE_GET_REPLY 242
-#define E_IPC_OP_TRANSIENT_LOWER_SET 243
-#define E_IPC_OP_TRANSIENT_LOWER_GET 244
-#define E_IPC_OP_TRANSIENT_LOWER_GET_REPLY 245
-#define E_IPC_OP_TRANSIENT_LAYER_SET 246
-#define E_IPC_OP_TRANSIENT_LAYER_GET 247
-#define E_IPC_OP_TRANSIENT_LAYER_GET_REPLY 248
-#define E_IPC_OP_TRANSIENT_DESKTOP_SET 249
-#define E_IPC_OP_TRANSIENT_DESKTOP_GET 250
-#define E_IPC_OP_TRANSIENT_DESKTOP_GET_REPLY 251
-#define E_IPC_OP_TRANSIENT_ICONIFY_SET 252
-#define E_IPC_OP_TRANSIENT_ICONIFY_GET 253
-#define E_IPC_OP_TRANSIENT_ICONIFY_GET_REPLY 254
-
-#define E_IPC_OP_MODAL_WINDOWS_SET 255
-#define E_IPC_OP_MODAL_WINDOWS_GET 256
-#define E_IPC_OP_MODAL_WINDOWS_GET_REPLY 257
-
-#define E_IPC_OP_WINDOW_PLACEMENT_POLICY_SET 258
-#define E_IPC_OP_WINDOW_PLACEMENT_POLICY_GET 259
-#define E_IPC_OP_WINDOW_PLACEMENT_POLICY_GET_REPLY 260
-
-#define E_IPC_OP_CONFIG_PANEL_SHOW 261
-
-#define E_IPC_OP_BINDING_SIGNAL_LIST 262
-#define E_IPC_OP_BINDING_SIGNAL_LIST_REPLY 263
-#define E_IPC_OP_BINDING_SIGNAL_ADD 264
-#define E_IPC_OP_BINDING_SIGNAL_DEL 265
-#define E_IPC_OP_BINDING_WHEEL_LIST 266
-#define E_IPC_OP_BINDING_WHEEL_LIST_REPLY 267
-#define E_IPC_OP_BINDING_WHEEL_ADD 268
-#define E_IPC_OP_BINDING_WHEEL_DEL 269
-
-#define E_IPC_OP_USE_E_CURSOR_SET 270
-#define E_IPC_OP_USE_E_CURSOR_GET 271
-#define E_IPC_OP_USE_E_CURSOR_GET_REPLY 272
-
-#define E_IPC_OP_MOVE_INFO_VISIBLE_SET 273
-#define E_IPC_OP_MOVE_INFO_VISIBLE_GET 274
-#define E_IPC_OP_MOVE_INFO_VISIBLE_GET_REPLY 275
-#define E_IPC_OP_RESIZE_INFO_VISIBLE_SET 276
-#define E_IPC_OP_RESIZE_INFO_VISIBLE_GET 277
-#define E_IPC_OP_RESIZE_INFO_VISIBLE_GET_REPLY 278
-
-#define E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_SET 279
-#define E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_GET 280
-#define E_IPC_OP_ALWAYS_CLICK_TO_FOCUS_GET_REPLY 281
-
-#define E_IPC_OP_PROFILE_LIST 282
-#define E_IPC_OP_PROFILE_LIST_REPLY 283
- 
-#define E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_SET 284
-#define E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_GET 285
-#define E_IPC_OP_WINLIST_LIST_FOCUS_WHILE_SELECTING_GET_REPLY 286
-#define E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_SET 287
-#define E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_GET 288
-#define E_IPC_OP_WINLIST_LIST_RAISE_WHILE_SELECTING_GET_REPLY 289
-
-#define E_IPC_OP_THEME_CATEGORY_LIST 290
-#define E_IPC_OP_THEME_CATEGORY_LIST_REPLY 291
-
-#define E_IPC_OP_TRANSITION_LIST 292
-#define E_IPC_OP_TRANSITION_LIST_REPLY 293
-
-#define E_IPC_OP_ACTION_LIST 294
-#define E_IPC_OP_ACTION_LIST_REPLY 295
-
-#define E_IPC_OP_PROFILE_ADD 296
-#define E_IPC_OP_PROFILE_DEL 297
-
-#define E_IPC_OP_DEFAULT_ENGINE_SET 298
-#define E_IPC_OP_DEFAULT_ENGINE_GET 299
-#define E_IPC_OP_DEFAULT_ENGINE_GET_REPLY 300
-#define E_IPC_OP_ENGINE_LIST 301
-#define E_IPC_OP_ENGINE_LIST_REPLY 302
-#define E_IPC_OP_ENGINE_SET 303
-#define E_IPC_OP_ENGINE_GET 304
-#define E_IPC_OP_ENGINE_GET_REPLY 305
-
-#define E_IPC_OP_MENU_EAP_NAME_SHOW_SET 306
-#define E_IPC_OP_MENU_EAP_NAME_SHOW_GET 307
-#define E_IPC_OP_MENU_EAP_NAME_SHOW_GET_REPLY 308
-#define E_IPC_OP_MENU_EAP_GENERIC_SHOW_SET 309
-#define E_IPC_OP_MENU_EAP_GENERIC_SHOW_GET 310
-#define E_IPC_OP_MENU_EAP_GENERIC_SHOW_GET_REPLY 311
-#define E_IPC_OP_MENU_EAP_COMMENT_SHOW_SET 312
-#define E_IPC_OP_MENU_EAP_COMMENT_SHOW_GET 313
-#define E_IPC_OP_MENU_EAP_COMMENT_SHOW_GET_REPLY 314
-  
-#define E_IPC_OP_IM_LIST 315
-#define E_IPC_OP_IM_LIST_REPLY 316
-#define E_IPC_OP_IM_SET 317
-#define E_IPC_OP_IM_GET 318
-#define E_IPC_OP_IM_GET_REPLY 319
-
-#define E_IPC_OP_FULLSCREEN_POLICY_SET 320
-#define E_IPC_OP_FULLSCREEN_POLICY_GET 321
-#define E_IPC_OP_FULLSCREEN_POLICY_GET_REPLY 322
-
-#define E_IPC_OP_EDJE_CACHE_SET 324
-#define E_IPC_OP_EDJE_CACHE_GET 325
-#define E_IPC_OP_EDJE_CACHE_GET_REPLY 326
-
-#define E_IPC_OP_EDJE_COLLECTION_CACHE_SET 327
-#define E_IPC_OP_EDJE_COLLECTION_CACHE_GET 328
-#define E_IPC_OP_EDJE_COLLECTION_CACHE_GET_REPLY 329
-
-#define E_IPC_OP_CACHE_FLUSH_INTERVAL_SET 330
-#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET 331
-#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET_REPLY 332
-
-#define E_IPC_OP_COLOR_CLASS_COLOR_SET 334
-#define E_IPC_OP_COLOR_CLASS_COLOR2_SET 335
-#define E_IPC_OP_COLOR_CLASS_COLOR3_SET 336
-#define E_IPC_OP_COLOR_CLASS_COLOR_LIST 337
-#define E_IPC_OP_COLOR_CLASS_COLOR2_LIST 338
-#define E_IPC_OP_COLOR_CLASS_COLOR3_LIST 339
-#define E_IPC_OP_COLOR_CLASS_COLOR_LIST_REPLY 340
-#define E_IPC_OP_COLOR_CLASS_DEL 341
-#define E_IPC_OP_COLOR_CLASS_LIST 342
-#define E_IPC_OP_COLOR_CLASS_LIST_REPLY 343
-
-#define E_IPC_OP_CFGDLG_AUTO_APPLY_SET 344 
-#define E_IPC_OP_CFGDLG_AUTO_APPLY_GET 345
-#define E_IPC_OP_CFGDLG_AUTO_APPLY_GET_REPLY 346
-
-#define E_IPC_OP_CFGDLG_DEFAULT_MODE_SET 347
-#define E_IPC_OP_CFGDLG_DEFAULT_MODE_GET 348
-#define E_IPC_OP_CFGDLG_DEFAULT_MODE_GET_REPLY 349
-
-#define E_IPC_OP_MAXIMIZE_MANIPULATION_SET 350
-#define E_IPC_OP_MAXIMIZE_MANIPULATION_GET 351
-#define E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY 352
-
-#define E_IPC_OP_DESKTOP_LOCK 353
-
-#define E_IPC_OP_INIT_SET 354
-#define E_IPC_OP_INIT_GET 355
-#define E_IPC_OP_INIT_GET_REPLY 356
-
-#define E_IPC_OP_FONT_HINTING_SET 357
-#define E_IPC_OP_FONT_HINTING_GET 358
-#define E_IPC_OP_FONT_HINTING_GET_REPLY 359
-
-#define E_IPC_OP_EDGE_FLIP_DRAGGING_SET 360
-#define E_IPC_OP_EDGE_FLIP_DRAGGING_GET 361
-#define E_IPC_OP_EDGE_FLIP_DRAGGING_GET_REPLY 362
-
-#define E_IPC_OP_USE_COMPOSITE_SET 363
-#define E_IPC_OP_USE_COMPOSITE_GET 364
-#define E_IPC_OP_USE_COMPOSITE_GET_REPLY 365
-
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_SET 366            
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_GET 367
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_DESK_ICONIFIED_GET_REPLY 368
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_SET 369
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_GET 370
-#define E_IPC_OP_WINLIST_LIST_SHOW_OTHER_SCREEN_ICONIFIED_GET_REPLY 371
-
-#define E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_SET 372
-#define E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_GET 373
-#define E_IPC_OP_REMEMBER_INTERNAL_WINDOWS_GET_REPLY 374
-
-#define E_IPC_OP_LOGOUT 375
-#define E_IPC_OP_HIBERNATE 376
-#define E_IPC_OP_REBOOT 377
-#define E_IPC_OP_SUSPEND 378
-#define E_IPC_OP_HALT 379
-
-#define E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_SET 380
-#define E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_GET 381
-#define E_IPC_OP_DESKLOCK_USE_CUSTOM_DESKLOCK_GET_REPLY 382
-#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_SET 383
-#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET 384
-#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET_REPLY 385
-
-#define E_IPC_OP_EXEC_ACTION 386
-#define E_IPC_OP_EXEC_ACTION_REPLY 387
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 052a725..3a1e928 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -173,7 +173,7 @@ e_layout_child_lower(Evas_Object *obj)
    li = evas_object_data_get(obj, "e_layout_data");
    if (!li) return;
    if (!eina_list_data_find(li->sd->items, obj)) return;
-   if ((li->sd->items) && (li->sd->items->next))
+   if ((li->sd->items) && eina_list_next(li->sd->items))
      {
 	li->sd->items = eina_list_remove(li->sd->items, obj);
 	evas_object_lower(obj);
@@ -189,7 +189,7 @@ e_layout_child_raise(Evas_Object *obj)
    li = evas_object_data_get(obj, "e_layout_data");
    if (!li) return;
    if (!eina_list_data_find(li->sd->items, obj)) return;
-   if ((li->sd->items) && (li->sd->items->next))
+   if ((li->sd->items) && eina_list_next(li->sd->items))
      {
 	li->sd->items = eina_list_remove(li->sd->items, obj);
 	evas_object_raise(obj);
@@ -206,7 +206,7 @@ e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below)
    if (!li) return;
    if (!eina_list_data_find(li->sd->items, below)) return;
    if (!eina_list_data_find(li->sd->items, obj)) return;
-   if ((li->sd->items) && (li->sd->items->next))
+   if ((li->sd->items) && eina_list_next(li->sd->items))
      {
 	li->sd->items = eina_list_remove(li->sd->items, obj);
 	evas_object_stack_below(obj, below);
@@ -223,7 +223,7 @@ e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
    if (!li) return;
    if (!eina_list_data_find(li->sd->items, above)) return;
    if (!eina_list_data_find(li->sd->items, obj)) return;
-   if ((li->sd->items) && (li->sd->items->next))
+   if ((li->sd->items) && eina_list_next(li->sd->items))
      {
 	li->sd->items = eina_list_remove(li->sd->items, obj);
 	evas_object_stack_above(obj, above);
@@ -315,6 +315,7 @@ _e_layout_smart_reconfigure(E_Smart_Data *sd)
 {
    Evas_Coord x, y, w, h;
    Eina_List *l;
+   Evas_Object *obj;
 
    if (!sd->changed) return;
    
@@ -323,12 +324,9 @@ _e_layout_smart_reconfigure(E_Smart_Data *sd)
    w = sd->w;
    h = sd->h;
 
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Layout_Item *li;
-	Evas_Object *obj;
-	
-	obj = l->data;
 	li = evas_object_data_get(obj, "e_layout_data");
 	_e_layout_smart_move_resize_item(li);
      }
@@ -406,7 +404,7 @@ _e_layout_smart_del(Evas_Object *obj)
      {
 	Evas_Object *child;
 	
-	child = sd->items->data;
+	child = eina_list_data_get(sd->items);
 	e_layout_unpack(child);
      }
    evas_object_del(sd->clip);
@@ -417,6 +415,7 @@ static void
 _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
    E_Smart_Data *sd;
+   Evas_Object *item;
    
    sd = evas_object_smart_data_get(obj);
    if (!sd) return;
@@ -428,12 +427,12 @@ _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 	
 	dx = x - sd->x;
 	dy = y - sd->y;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
 	     
-	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-	     evas_object_move(l->data, ox + dx, oy + dy);
+	     evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
+	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
    sd->x = x;
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 69b1644..30b628d 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -650,6 +650,11 @@ main(int argc, char **argv)
      }
    _e_main_shutdown_push(e_intl_post_shutdown);
 
+   TS("move/resize info");
+   /* init move resize popup */
+   e_moveresize_init();
+   _e_main_shutdown_push(e_moveresize_shutdown);
+   
    TS("splash");
    if (!((!e_config->show_splash) || (after_restart)))
      {
@@ -813,16 +818,6 @@ main(int argc, char **argv)
      }
    _e_main_shutdown_push(e_exec_shutdown);
 
-   e_init_status_set(_("Setup Remembers"));
-   TS("remember");
-   /* do remember stuff */
-   if (!e_remember_init(after_restart ? E_STARTUP_RESTART: E_STARTUP_START))
-     {
-	e_error_message_show(_("Enlightenment cannot setup remember settings."));
-	_e_main_shutdown(-1);
-     }
-   _e_main_shutdown_push(e_remember_shutdown);
-
    TS("container freeze");
    e_container_all_freeze();
 
@@ -886,6 +881,16 @@ main(int argc, char **argv)
      }
    _e_main_shutdown_push(e_module_shutdown);
 
+   e_init_status_set(_("Setup Remembers"));
+   TS("remember");
+   /* do remember stuff */
+   if (!e_remember_init(after_restart ? E_STARTUP_RESTART: E_STARTUP_START))
+     {
+       e_error_message_show(_("Enlightenment cannot setup remember settings."));
+       _e_main_shutdown(-1);
+     }
+   _e_main_shutdown_push(e_remember_shutdown);
+
    e_init_status_set(_("Setup Color Classes"));
    TS("colorclasses");
    /* setup color_class */
@@ -1079,6 +1084,8 @@ main(int argc, char **argv)
    /* Store current selected desktops */
    _e_main_desk_save();
 
+   e_remember_internal_save();
+   
    /* unroll our stack of shutdown functions with exit code of 0 */
    _e_main_shutdown(0);
 
@@ -1307,9 +1314,10 @@ static void
 _e_main_manage_all(void)
 {
    Eina_List *l;
+   E_Manager *man;
 
-   for (l = e_manager_list(); l; l = l->next)
-     e_manager_manage_windows(l->data);
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     e_manager_manage_windows(man);
 }
 
 static int
@@ -1499,6 +1507,7 @@ static int
 _e_main_cb_idler_before(void *data __UNUSED__)
 {
    Eina_List *l, *pl;
+   E_Before_Idler *eb;
 
    e_menu_idler_before();
    e_focus_idler_before();
@@ -1506,23 +1515,15 @@ _e_main_cb_idler_before(void *data __UNUSED__)
    e_popup_idler_before();
    e_drag_idler_before();
    e_pointer_idler_before();
-   for (l = _e_main_idler_before_list; l; l = l->next)
+   EINA_LIST_FOREACH(_e_main_idler_before_list, l, eb)
      {
-	E_Before_Idler *eb;
-
-	eb = l->data;
 	if (!eb->delete_me)
 	  {
 	     if (!eb->func(eb->data)) eb->delete_me = 1;
 	  }
      }
-   for (l = _e_main_idler_before_list; l;)
+   EINA_LIST_FOREACH_SAFE(_e_main_idler_before_list, pl, l, eb)
      {
-	E_Before_Idler *eb;
-
-	eb = l->data;
-	pl = l;
-	l = l->next;
 	if ((eb->once) || (eb->delete_me))
 	  {
 	     _e_main_idler_before_list =
@@ -1574,25 +1575,21 @@ static void
 _e_main_desk_save(void)
 {
    Eina_List *ml;
+   E_Manager *man;
    char env[1024], name[1024];
 
-   for (ml = e_manager_list(); ml; ml = ml->next)
+   EINA_LIST_FOREACH(e_manager_list(), ml, man)
      {
-	E_Manager *man;
 	Eina_List *cl;
+	E_Container *con;
 
-	man = ml->data;
-	for (cl = man->containers; cl; cl = cl->next)
+	EINA_LIST_FOREACH(man->containers, cl, con)
 	  {
-	     E_Container *con;
 	     Eina_List *zl;
+	     E_Zone *zone;
 
-	     con = cl->data;
-	     for (zl = con->zones; zl; zl = zl->next)
+	     EINA_LIST_FOREACH(con->zones, zl, zone)
 	       {
-		  E_Zone *zone;
-
-		  zone = zl->data;
 		  snprintf(name, sizeof(name), "DESK_%d_%d_%d", man->num, con->num, zone->num);
 		  snprintf(env, sizeof(env), "%d,%d", zone->desk_x_current, zone->desk_y_current);
 		  e_util_env_set(name, env);
@@ -1605,16 +1602,15 @@ static void
 _e_main_desk_restore(E_Manager *man, E_Container *con)
 {
    Eina_List *zl;
+   E_Zone *zone;
    char *env;
    char name[1024];
 
-   for (zl = con->zones; zl; zl = zl->next)
+   EINA_LIST_FOREACH(con->zones, zl, zone)
      {
-	E_Zone *zone;
 	E_Desk *desk;
 	int desk_x, desk_y;
 
-	zone = zl->data;
 	snprintf(name, sizeof(name), "DESK_%d_%d_%d", man->num, con->num, zone->num);
 	env = getenv(name);
 	if (!env) continue;
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index ce8de39..04fabff 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -59,10 +59,7 @@ e_manager_init(void)
 EAPI int
 e_manager_shutdown(void)
 {
-   E_Manager *man;
-
-   EINA_LIST_FREE(managers, man)
-     e_object_del(E_OBJECT(man));
+   E_FREE_LIST(managers, e_object_del);
 
    if (frame_extents)
      {
@@ -259,6 +256,8 @@ e_manager_manage_windows(E_Manager *man)
 		  E_Desk       *desk = NULL;
 		  E_Border     *bd = NULL;
 		  unsigned int  id;
+		  char *path;
+		  Efreet_Desktop *desktop = NULL;
 
 		  /* get all information from window before it is 
 		   * reset by e_border_new */
@@ -285,6 +284,14 @@ e_manager_manage_windows(E_Manager *man)
 					    deskxy[0],
 					    deskxy[1]);
 
+		  path = ecore_x_window_prop_string_get(windows[i],
+							E_ATOM_DESKTOP_FILE);
+		  if (path)
+		    {
+		       desktop = efreet_desktop_get(path);
+		       free(path);
+		    }
+
 		    {
 		       bd = e_border_new(con, windows[i], 1, 0);
 		       if (bd)
@@ -295,6 +302,7 @@ e_manager_manage_windows(E_Manager *man)
 			     * be set according to the desk */
 //			    if (zone) e_border_zone_set(bd, zone);
 			    if (desk) e_border_desk_set(bd, desk);
+			    bd->desktop = desktop;
 			 }
 		    }
 	       }
@@ -323,15 +331,13 @@ EAPI void
 e_manager_show(E_Manager *man)
 {
    Eina_List *l;
+   E_Container *con;
    
    E_OBJECT_CHECK(man);
    E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
    if (man->visible) return;
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-	
-	con = l->data;
 	e_container_show(con);
      }
    if (man->root != man->win)
@@ -357,15 +363,13 @@ EAPI void
 e_manager_hide(E_Manager *man)
 {
    Eina_List *l;
+   E_Container *con;
    
    E_OBJECT_CHECK(man);
    E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
    if (!man->visible) return;
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-	
-	con = l->data;
 	e_container_hide(con);
      }
    if (man->root != man->win)
@@ -391,6 +395,7 @@ EAPI void
 e_manager_resize(E_Manager *man, int w, int h)
 {
    Eina_List *l;
+   E_Container *con;
    
    E_OBJECT_CHECK(man);
    E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@@ -400,11 +405,8 @@ e_manager_resize(E_Manager *man, int w, int h)
    if (man->root != man->win)
      ecore_x_window_resize(man->win, man->w, man->h);
 	
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-	
-	con = l->data;
 	e_container_resize(con, man->w, man->h);
      }
 
@@ -415,6 +417,7 @@ EAPI void
 e_manager_move_resize(E_Manager *man, int x, int y, int w, int h)
 {
    Eina_List *l;
+   E_Container *con;
    
    E_OBJECT_CHECK(man);
    E_OBJECT_TYPE_CHECK(man, E_MANAGER_TYPE);
@@ -428,11 +431,8 @@ e_manager_move_resize(E_Manager *man, int x, int y, int w, int h)
    man->h = h;
    ecore_x_window_move_resize(man->win, man->x, man->y, man->w, man->h);
 
-   for (l = man->containers; l; l = l->next)
+   EINA_LIST_FOREACH(man->containers, l, con)
      {
-	E_Container *con;
-	
-	con = l->data;
 	e_container_resize(con, man->w, man->h);
      }
 }
@@ -476,16 +476,15 @@ e_manager_current_get(void)
    int x, y;
    
    if (!managers) return NULL;
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	man = l->data;
 	ecore_x_pointer_xy_get(man->win, &x, &y);
 	if (x == -1 && y == -1)
 	  continue;
 	if (E_INSIDE(x, y, man->x, man->y, man->w, man->h))
 	  return man;
      }
-   return managers->data;
+   return eina_list_data_get(managers);
 }
 
 EAPI E_Manager *
@@ -495,9 +494,8 @@ e_manager_number_get(int num)
    E_Manager *man;
    
    if (!managers) return NULL;
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	man = l->data;
 	if (man->num == num)
 	  return man;
      }
@@ -508,12 +506,10 @@ EAPI void
 e_managers_keys_grab(void)
 {
    Eina_List *l;
+   E_Manager *man;
 
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
 	e_bindings_key_grab(E_BINDING_CONTEXT_ANY, man->root);
      }
 }
@@ -522,12 +518,10 @@ EAPI void
 e_managers_keys_ungrab(void)
 {
    Eina_List *l;
+   E_Manager *man;
    
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
 	e_bindings_key_ungrab(E_BINDING_CONTEXT_ANY, man->root);
      }
 }
@@ -538,21 +532,10 @@ _e_manager_free(E_Manager *man)
 {
    Eina_List *l;
 
-   while (man->handlers)
-     {
-	Ecore_Event_Handler *h;
-   
-	h = man->handlers->data;
-	man->handlers = eina_list_remove_list(man->handlers, man->handlers);
-	ecore_event_handler_del(h);
-     }
+   E_FREE_LIST(man->handlers, ecore_event_handler_del);
    l = man->containers;
    man->containers = NULL;
-   while (l)
-     {
-	e_object_del(E_OBJECT(l->data));
-	l = eina_list_remove_list(l, l);
-     }
+   E_FREE_LIST(l, e_object_del);
    if (man->root != man->win)
      {
 	ecore_x_window_free(man->win);
@@ -903,13 +886,12 @@ _e_manager_get_for_root(Ecore_X_Window root)
    E_Manager *man;
 
    if (!managers) return NULL;
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	man = l->data;
 	if (man->root == root)
 	  return man;
      }
-   return managers->data;
+   return eina_list_data_get(managers);
 }
 
 
diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c
index 24ff1e7..5442d2d 100644
--- a/src/bin/e_maximize.c
+++ b/src/bin/e_maximize.c
@@ -25,7 +25,7 @@ static void _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, i
 EAPI void
 e_maximize_border_shelf_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
 {
-   return e_maximize_border_shelf_fill(bd, x1, y1, x2, y2, dir);
+   e_maximize_border_shelf_fill(bd, x1, y1, x2, y2, dir);
 }
 
 EAPI void
@@ -128,23 +128,20 @@ EAPI void
 e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
 {
    Eina_List *l, *rects = NULL;
+   E_Shelf *es;
    E_Maximize_Rect *r;
 
-   for (l = e_shelf_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	E_Shelf *es;
 	Eina_List *ll;
+	E_Config_Shelf_Desk *sd;
 
-	es = l->data;
 	if (es->cfg->overlap) continue;
 	if (es->zone != bd->zone) continue;
 	if (es->cfg->desk_show_mode)
 	  {
-	     for (ll = es->cfg->desk_list; ll; ll = ll->next)
+	     EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
 	       {
-		  E_Config_Shelf_Desk *sd;
-
-		  sd = ll->data;
 		  if (!sd) continue;
 		  if ((sd->x == bd->desk->x) && (sd->y == bd->desk->y))
 		    {
@@ -163,16 +160,14 @@ e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E
    if (rects)
      {
 	_e_maximize_border_rects_fill(bd, rects, x1, y1, x2, y2, dir);
-	for (l = rects; l; l = l->next)
-	  free(l->data);
-	eina_list_free(rects);
+	E_FREE_LIST(rects, free);
      }
 }
 
 EAPI void
 e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2, E_Maximize dir)
 {
-   Eina_List *l, *rects = NULL;
+   Eina_List *rects = NULL;
    E_Border_List *bl;
    E_Maximize_Rect *r;
    E_Border *bd2;
@@ -188,9 +183,7 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2,
    if (rects)
      {
 	_e_maximize_border_rects_fill(bd, rects, x1, y1, x2, y2, dir);
-	for (l = rects; l; l = l->next)
-	  free(l->data);
-	eina_list_free(rects);
+	E_FREE_LIST(rects, free);
      }
 }
 
@@ -273,6 +266,7 @@ static void
 _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh)
 {
    Eina_List *l;
+   E_Maximize_Rect *rect;
    int cx1, cx2;
 
    cx1 = bd->zone->x;
@@ -282,11 +276,8 @@ _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int
    if (x2) cx2 = *x2;
 
    /* Expand left */
-   for (l = rects; l; l = l->next)
+   EINA_LIST_FOREACH(rects, l, rect)
      {
-	E_Maximize_Rect *rect;
-
-	rect = l->data;
 	if ((rect->x2 > cx1) && (rect->x2 <= *bx) &&
 	    E_INTERSECTS(0, rect->y1, bd->zone->w, (rect->y2 - rect->y1), 0, *by, bd->zone->w, *bh))
 	  {
@@ -297,11 +288,8 @@ _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int
    *bx = cx1;
 
    /* Expand right */
-   for (l = rects; l; l = l->next)
+   EINA_LIST_FOREACH(rects, l, rect)
      {
-	E_Maximize_Rect *rect;
-
-	rect = l->data;
 	if ((rect->x1 < cx2) && (rect->x1 >= (*bx + *bw)) &&
 	    E_INTERSECTS(0, rect->y1, bd->zone->w, (rect->y2 - rect->y1), 0, *by, bd->zone->w, *bh))
 	  {
@@ -318,6 +306,7 @@ static void
 _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *y1, int *y2, int *bx, int *by, int *bw, int *bh)
 {
    Eina_List *l;
+   E_Maximize_Rect *rect;
    int cy1, cy2;
 
    cy1 = bd->zone->y;
@@ -327,11 +316,8 @@ _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *y1, int
    if (y2) cy2 = *y2;
 
    /* Expand up */
-   for (l = rects; l; l = l->next)
+   EINA_LIST_FOREACH(rects, l, rect)
      {
-	E_Maximize_Rect *rect;
-
-	rect = l->data;
 	if ((rect->y2 > cy1) && (rect->y2 <= *by) &&
 	    E_INTERSECTS(rect->x1, 0, (rect->x2 - rect->x1), bd->zone->h, *bx, 0, *bw, bd->zone->h))
 	  {
@@ -342,11 +328,8 @@ _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *y1, int
    *by = cy1;
 
    /* Expand down */
-   for (l = rects; l; l = l->next)
+   EINA_LIST_FOREACH(rects, l, rect)
      {
-	E_Maximize_Rect *rect;
-
-	rect = l->data;
 	if ((rect->y1 < cy2) && (rect->y1 >= (*by + *bh)) &&
 	    E_INTERSECTS(rect->x1, 0, (rect->x2 - rect->x1), bd->zone->h, *bx, 0, *bw, bd->zone->h))
 	  {
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index b355521..5cd1fdf 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -33,84 +33,83 @@ struct _E_Menu_Category
 };
 
 /* local subsystem functions */
-static void _e_menu_free                          (E_Menu *m);
-static void _e_menu_item_free                     (E_Menu_Item *mi);
-static void _e_menu_item_realize                  (E_Menu_Item *mi);
-static void _e_menu_realize                       (E_Menu *m);
-static void _e_menu_items_layout_update           (E_Menu *m);
-static void _e_menu_item_unrealize                (E_Menu_Item *mi);
-static void _e_menu_unrealize                     (E_Menu *m);
-static void _e_menu_activate_internal             (E_Menu *m, E_Zone *zone);
-static void _e_menu_deactivate_all                (void);
-static void _e_menu_deactivate_above              (E_Menu *m);
-static void _e_menu_submenu_activate              (E_Menu_Item *mi);
-static void _e_menu_submenu_deactivate            (E_Menu_Item *mi);
-static void _e_menu_reposition                    (E_Menu *m);
-static int  _e_menu_active_call                   (void);
-static int _e_menu_realize_call                   (E_Menu_Item *mi);
-static void _e_menu_item_activate_next            (void);
-static void _e_menu_item_activate_previous        (void);
-static void _e_menu_item_activate_first           (void);
-static void _e_menu_item_activate_last            (void);
-static void _e_menu_item_activate_nth             (int n);
-static void _e_menu_item_activate_char            (const char * key_compose);
-static void _e_menu_activate_next                 (void);
-static void _e_menu_activate_previous             (void);
-static void _e_menu_activate_first                (void);
-static void _e_menu_activate_last                 (void);
+static void _e_menu_free(E_Menu *m);
+static void _e_menu_item_free(E_Menu_Item *mi);
+static void _e_menu_item_realize(E_Menu_Item *mi);
+static void _e_menu_realize(E_Menu *m);
+static void _e_menu_items_layout_update(E_Menu *m);
+static void _e_menu_item_unrealize(E_Menu_Item *mi);
+static void _e_menu_unrealize(E_Menu *m);
+static void _e_menu_activate_internal(E_Menu *m, E_Zone *zone);
+static void _e_menu_deactivate_all(void);
+static void _e_menu_deactivate_above(E_Menu *m);
+static void _e_menu_submenu_activate(E_Menu_Item *mi);
+static void _e_menu_submenu_deactivate(E_Menu_Item *mi);
+static void _e_menu_reposition(E_Menu *m);
+static int _e_menu_active_call(void);
+static int _e_menu_realize_call(E_Menu_Item *mi);
+static void _e_menu_item_activate_next(void);
+static void _e_menu_item_activate_previous(void);
+static void _e_menu_item_activate_first(void);
+static void _e_menu_item_activate_last(void);
+static void _e_menu_item_activate_nth(int n);
+static void _e_menu_item_activate_char(const char * key_compose);
+static void _e_menu_activate_next(void);
+static void _e_menu_activate_previous(void);
+static void _e_menu_activate_first(void);
+static void _e_menu_activate_last(void);
 #if 0
-static void _e_menu_activate_nth                  (int n);
+static void _e_menu_activate_nth(int n);
 #endif
-static E_Menu *_e_menu_active_get                 (void);
-static E_Menu_Item *_e_menu_item_active_get       (void);
-static Eina_List * _e_menu_list_item_active_get   (void);
-static int  _e_menu_outside_bounds_get            (int xdir, int ydir);
-static void _e_menu_scroll_by                     (int dx, int dy);
-static void _e_menu_mouse_autoscroll_check        (void);
-static void _e_menu_item_ensure_onscreen          (E_Menu_Item *mi);
-static int  _e_menu_auto_place                    (E_Menu *m, int x, int y, int w, int h);
-static void _e_menu_cb_intercept_item_move        (void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
-static void _e_menu_cb_intercept_item_resize      (void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
-static void _e_menu_cb_intercept_container_move   (void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
-static void _e_menu_cb_intercept_container_resize (void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
-static void _e_menu_cb_ecore_evas_resize          (Ecore_Evas *ee);
-static void _e_menu_cb_item_in                    (void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static void _e_menu_cb_item_out                   (void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static int  _e_menu_cb_key_down                   (void *data, int type, void *event);
-static int  _e_menu_cb_key_up                     (void *data, int type, void *event);
-static int  _e_menu_cb_mouse_down                 (void *data, int type, void *event);
-static int  _e_menu_cb_mouse_up                   (void *data, int type, void *event);
-static int  _e_menu_cb_mouse_move                 (void *data, int type, void *event);
-static int  _e_menu_cb_mouse_wheel                (void *data, int type, void *event);
-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 Eina_Bool _e_menu_categories_free_cb            (const Eina_Hash *hash, const void *key, void *data, void *fdata);
+static E_Menu *_e_menu_active_get(void);
+static E_Menu_Item *_e_menu_item_active_get(void);
+static Eina_List *_e_menu_list_item_active_get(void);
+static int _e_menu_outside_bounds_get(int xdir, int ydir);
+static void _e_menu_scroll_by(int dx, int dy);
+static void _e_menu_mouse_autoscroll_check(void);
+static void _e_menu_item_ensure_onscreen(E_Menu_Item *mi);
+static int _e_menu_auto_place(E_Menu *m, int x, int y, int w, int h);
+static void _e_menu_cb_intercept_item_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
+static void _e_menu_cb_intercept_item_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
+static void _e_menu_cb_intercept_container_move(void *data, Evas_Object *o, Evas_Coord x, Evas_Coord y);
+static void _e_menu_cb_intercept_container_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h);
+static void _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee);
+static void _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static void _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info);
+static int _e_menu_cb_key_down(void *data, int type, void *event);
+static int _e_menu_cb_key_up(void *data, int type, void *event);
+static int _e_menu_cb_mouse_down(void *data, int type, void *event);
+static int _e_menu_cb_mouse_up(void *data, int type, void *event);
+static int _e_menu_cb_mouse_move(void *data, int type, void *event);
+static int _e_menu_cb_mouse_wheel(void *data, int type, void *event);
+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 Eina_Bool _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
 /* local subsystem globals */
-static Ecore_X_Window       _e_menu_win                 = 0;
-static Eina_List           *_e_active_menus             = NULL;
-static E_Menu_Item         *_e_active_menu_item         = NULL;
+static Ecore_X_Window _e_menu_win = 0;
+static Eina_List *_e_active_menus = NULL;
+static E_Menu_Item *_e_active_menu_item = NULL;
 /*static Eina_Hash	   *_e_menu_category_items	= NULL;*/
-static Eina_Hash	   *_e_menu_categories		= NULL;
-static Ecore_X_Time         _e_menu_activate_time       = 0;
-static int                  _e_menu_activate_floating   = 0;
-static int                  _e_menu_activate_maybe_drag = 0;
-static int                  _e_menu_activate_dragging   = 0;
-static Ecore_Animator      *_e_menu_scroll_animator     = NULL;
-static double               _e_menu_scroll_start        = 0.0;
-static int                  _e_menu_x                   = 0;
-static int                  _e_menu_y                   = 0;
-static Ecore_X_Time         _e_menu_time                = 0;
-static int                  _e_menu_autoscroll_x        = 0;
-static int                  _e_menu_autoscroll_y        = 0;
-static Ecore_Event_Handler *_e_menu_key_down_handler     = NULL;
-static Ecore_Event_Handler *_e_menu_key_up_handler       = NULL;
-static Ecore_Event_Handler *_e_menu_mouse_down_handler   = NULL;
-static Ecore_Event_Handler *_e_menu_mouse_up_handler     = NULL;
-static Ecore_Event_Handler *_e_menu_mouse_move_handler   = NULL;
-static Ecore_Event_Handler *_e_menu_mouse_wheel_handler  = NULL;
+static Eina_Hash *_e_menu_categories = NULL;
+static Ecore_X_Time _e_menu_activate_time = 0;
+static int _e_menu_activate_floating = 0;
+static int _e_menu_activate_maybe_drag = 0;
+static int _e_menu_activate_dragging = 0;
+static Ecore_Animator *_e_menu_scroll_animator = NULL;
+static double _e_menu_scroll_start = 0.0;
+static int _e_menu_x = 0;
+static int _e_menu_y = 0;
+static Ecore_X_Time _e_menu_time = 0;
+static int _e_menu_autoscroll_x = 0;
+static int _e_menu_autoscroll_y = 0;
+static Ecore_Event_Handler *_e_menu_key_down_handler = NULL;
+static Ecore_Event_Handler *_e_menu_key_up_handler = NULL;
+static Ecore_Event_Handler *_e_menu_mouse_down_handler = NULL;
+static Ecore_Event_Handler *_e_menu_mouse_up_handler = NULL;
+static Ecore_Event_Handler *_e_menu_mouse_move_handler = NULL;
+static Ecore_Event_Handler *_e_menu_mouse_wheel_handler = NULL;
 static Ecore_Event_Handler *_e_menu_window_shape_handler = NULL;
 
 static Eina_List *
@@ -141,13 +140,25 @@ _e_menu_list_free_unref(Eina_List *l)
 EAPI int
 e_menu_init(void)
 {
-   _e_menu_key_down_handler     = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,           _e_menu_cb_key_down,    NULL);
-   _e_menu_key_up_handler       = ecore_event_handler_add(ECORE_EVENT_KEY_UP,             _e_menu_cb_key_up,      NULL);
-   _e_menu_mouse_down_handler   = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,  _e_menu_cb_mouse_down,  NULL);
-   _e_menu_mouse_up_handler     = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,    _e_menu_cb_mouse_up,    NULL);
-   _e_menu_mouse_move_handler   = ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,         _e_menu_cb_mouse_move,  NULL);
-   _e_menu_mouse_wheel_handler  = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,        _e_menu_cb_mouse_wheel, NULL);
-   _e_menu_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,     _e_menu_cb_window_shape, NULL);
+   _e_menu_key_down_handler = 
+     ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_menu_cb_key_down, NULL);
+   _e_menu_key_up_handler = 
+     ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_menu_cb_key_up, NULL);
+   _e_menu_mouse_down_handler = 
+     ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, 
+                             _e_menu_cb_mouse_down, NULL);
+   _e_menu_mouse_up_handler = 
+     ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, 
+                             _e_menu_cb_mouse_up, NULL);
+   _e_menu_mouse_move_handler = 
+     ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, 
+                             _e_menu_cb_mouse_move, NULL);
+   _e_menu_mouse_wheel_handler = 
+     ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, 
+                             _e_menu_cb_mouse_wheel, NULL);
+   _e_menu_window_shape_handler = 
+     ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, 
+                             _e_menu_cb_window_shape, NULL);
    _e_menu_categories = eina_hash_string_superfast_new(NULL);
    return 1;
 }
@@ -155,6 +166,8 @@ e_menu_init(void)
 EAPI int
 e_menu_shutdown(void)
 {
+   E_Menu *m;
+
    E_FN_DEL(ecore_event_handler_del, _e_menu_key_down_handler);
    E_FN_DEL(ecore_event_handler_del, _e_menu_key_up_handler);
    E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_down_handler);
@@ -163,16 +176,10 @@ e_menu_shutdown(void)
    E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_wheel_handler);
    E_FN_DEL(ecore_event_handler_del, _e_menu_window_shape_handler);
 
-   while (_e_active_menus)
+   EINA_LIST_FREE(_e_active_menus, m)
      {
-	E_Menu *m;
-
-	m = _e_active_menus->data;
 	m->active = 0;
 	_e_menu_unrealize(m);
-	_e_active_menus = 
-          eina_list_remove_list(_e_active_menus, _e_active_menus);
-
 	m->in_active_list = 0;
 	e_object_unref(E_OBJECT(m));
      }
@@ -295,6 +302,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d
 	  m->cur.y = y + h - m->cur.h;
 	break;
       case E_MENU_POP_DIRECTION_RIGHT:
+	_e_menu_realize(m);
 	m->cur.x = x + w;
 	m->cur.y = y;
 	break;
@@ -1059,9 +1067,7 @@ _e_menu_free(E_Menu *m)
    E_FREE(m->shape_rects);
    m->shape_rects_num = 0;
    EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
-     {
-	e_object_del(E_OBJECT(mi));
-     }
+     e_object_del(E_OBJECT(mi));
    if (m->in_active_list)
      {
 	_e_active_menus = eina_list_remove(_e_active_menus, m);
@@ -1277,8 +1283,9 @@ _e_menu_item_realize(E_Menu_Item *mi)
 		    {
 		       o = e_icon_add(mi->menu->evas);
 		       mi->icon_object = o;
+                       e_icon_preload_set(mi->icon_object, 1);
 		       e_icon_file_set(o, mi->icon);
-		       e_icon_fill_inside_set(o, 1);
+		       e_icon_fill_inside_set(mi->icon_object, 1);
 		       e_icon_size_get(mi->icon_object, &icon_w, &icon_h);
 		    }
 	       }
@@ -1420,11 +1427,12 @@ _e_menu_realize(E_Menu *m)
    evas_event_freeze(m->evas);
    /* move cursor out to avoid event cycles during setup */
    evas_event_feed_mouse_in(m->evas, ecore_x_current_time_get(), NULL);
-   evas_event_feed_mouse_move(m->evas, -1000000, -1000000, ecore_x_current_time_get(), NULL);
+   evas_event_feed_mouse_move(m->evas, -1000000, -1000000, 
+                              ecore_x_current_time_get(), NULL);
    ecore_x_window_shape_events_select(m->evas_win, 1);
    ecore_evas_name_class_set(m->ecore_evas, "E", "_e_menu_window");
    ecore_evas_title_set(m->ecore_evas, "E Menu");
-   
+
    o = edje_object_add(m->evas);
    m->bg_object = o;
    evas_object_name_set(o, "menu/background");
@@ -1436,7 +1444,7 @@ _e_menu_realize(E_Menu *m)
    if (ok)
      {
 	const char *shape_option;
-	
+
 	shape_option = edje_object_data_get(o, "shaped");
 	if (shape_option)
 	  {
@@ -1461,6 +1469,8 @@ _e_menu_realize(E_Menu *m)
 	else
 	  ecore_evas_shaped_set(m->ecore_evas, m->shaped);
      }
+
+   ecore_x_netwm_window_type_set(m->evas_win, ECORE_X_WINDOW_TYPE_MENU);
    
    o = e_box_add(m->evas);
    m->container_object = o;
@@ -1472,9 +1482,7 @@ _e_menu_realize(E_Menu *m)
    edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
    
    EINA_LIST_FOREACH(m->items, l, mi)
-     {
-	_e_menu_item_realize(mi);
-     }
+     _e_menu_item_realize(mi);
 
    _e_menu_items_layout_update(m);
    e_box_thaw(m->container_object);
@@ -1667,7 +1675,7 @@ _e_menu_items_layout_update(E_Menu *m)
 	     e_box_thaw(mi->container_object);
 	  }
      }
-   e_box_min_size_get(m->container_object, &bw, &bh);
+   e_box_size_min_get(m->container_object, &bw, &bh);
    edje_extern_object_min_size_set(m->container_object, bw, bh);
    edje_extern_object_max_size_set(m->container_object, bw, bh);
    edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
@@ -1680,7 +1688,7 @@ _e_menu_items_layout_update(E_Menu *m)
 static void
 _e_menu_item_unrealize(E_Menu_Item *mi)
 {
-   e_box_freeze(mi->container_object);
+   if (mi->container_object) e_box_freeze(mi->container_object);
    if (mi->separator_object) evas_object_del(mi->separator_object);
    mi->separator_object = NULL;
    if (mi->bg_object) evas_object_del(mi->bg_object);
@@ -1714,9 +1722,7 @@ _e_menu_unrealize(E_Menu *m)
    m->shape = NULL;
    e_box_freeze(m->container_object);
    EINA_LIST_FOREACH(m->items, l, mi)
-     {
-	_e_menu_item_unrealize(mi);
-     }
+     _e_menu_item_unrealize(mi);
    if (m->header.icon) evas_object_del(m->header.icon);
    m->header.icon = NULL;
    if (m->bg_object) evas_object_del(m->bg_object);
@@ -1786,9 +1792,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
 	  {
 	     E_Menu_Category_Callback *cb;
 	     EINA_LIST_FOREACH(cat->callbacks, l, cb)
-	       {
-		  if (cb->create) cb->create(m, cat->data, cb->data);
-	       }
+               if (cb->create) cb->create(m, cat->data, cb->data);
 	  }
      }
    m->cur.visible = 1;
@@ -1904,9 +1908,7 @@ _e_menu_reposition(E_Menu *m)
    tmp = _e_active_menus_copy_ref();
 
    EINA_LIST_FOREACH(m->items, l, mi)
-     {
-	if ((mi->active) && (mi->submenu)) _e_menu_reposition(mi->submenu);
-     }
+     if ((mi->active) && (mi->submenu)) _e_menu_reposition(mi->submenu);
 
    _e_menu_list_free_unref(tmp);
 }
@@ -1957,19 +1959,15 @@ _e_menu_item_activate_next(void)
      {
 	/* Look at the next item and then cycle until we're not on
 	 * a separator. */
-	if (!(ll->next)) 
-	  ll = mi->menu->items;
-	else
-	   ll = ll->next;
-	mi = ll->data;
-	while (mi->separator || mi->disable)
+	do
 	  { 
-	     if (!(ll->next)) 
+	     if (!eina_list_next(ll)) 
 	       ll = mi->menu->items;
 	     else
-	       ll = ll->next;
-	     mi = ll->data;
+	       ll = eina_list_next(ll);
+	     mi = eina_list_data_get(ll);
 	  }
+	while (mi->separator || mi->disable);
 
 	e_menu_item_active_set(mi, 1);
 	_e_menu_item_ensure_onscreen(mi);
@@ -1991,19 +1989,15 @@ _e_menu_item_activate_previous(void)
      {
 	/* Look at the prev item and then cycle until we're not on
 	 * a separator. */
-	if (!(ll->prev)) 
-	  ll = eina_list_last(ll);
-	else
-	   ll = ll->prev;
-	mi = ll->data;
-	while (mi->separator || mi->disable)
+	do
 	  { 
-	     if (!(ll->prev)) 
+	     if (!eina_list_prev(ll)) 
 	       ll = eina_list_last(ll);
 	     else
-	       ll = ll->prev;
-	     mi = ll->data;
+	       ll = eina_list_prev(ll);
+	     mi = eina_list_data_get(ll);
 	  }
+	while ((mi->separator) || (mi->disable));
 
 	e_menu_item_active_set(mi, 1);
 	_e_menu_item_ensure_onscreen(mi);
@@ -2024,11 +2018,11 @@ _e_menu_item_activate_first(void)
    if (m)
      {
 	ll = m->items;
-	mi = ll->data;
-	while ((mi->separator) && (ll->next))
+	mi = eina_list_data_get(ll);
+	while ((mi->separator) && eina_list_next(ll))
 	  {
-	     ll = ll->next;
-	     mi = ll->data;
+	     ll = eina_list_next(ll);
+	     mi = eina_list_data_get(ll);
 	  }
 	if (mi->separator) return;
 	e_menu_item_active_set(mi, 1);
@@ -2049,11 +2043,11 @@ _e_menu_item_activate_last(void)
    if (m)
      {
 	ll = eina_list_last(m->items);
-	mi = ll->data;
-	while ((mi->separator) && (ll->prev))
+	mi = eina_list_data_get(ll);
+	while ((mi->separator) && eina_list_prev(ll))
 	  {
-	     ll = ll->prev;
-	     mi = ll->data;
+	     ll = eina_list_prev(ll);
+	     mi = eina_list_data_get(ll);
 	  }
 	if (mi->separator) return;
 	e_menu_item_active_set(mi, 1);
@@ -2103,7 +2097,7 @@ _e_menu_item_activate_char(const char * key_compose)
    if (!m) 
      {
 	if (!_e_active_menus) return;
-	m = _e_active_menus->data;
+	m = eina_list_data_get(_e_active_menus);
 	if (!m) return;
      }
 
@@ -2112,7 +2106,7 @@ _e_menu_item_activate_char(const char * key_compose)
    if (!ll)
      {
 	ll = m->items;
-	mi = ll->data;
+	mi = eina_list_data_get(ll);
 	/* Only check the current item if it wasn't active before. */
 	if (!mi->separator && mi->label && !strncasecmp(key_compose, mi->label, strlen(key_compose))) 
 	  {
@@ -2124,32 +2118,27 @@ _e_menu_item_activate_char(const char * key_compose)
 
    ll_orig = ll;
 
-   mi = ll->data;
-   if (!(ll->next)) 
+   mi = eina_list_data_get(ll);
+   if (!eina_list_next(ll)) 
      ll = mi->menu->items;
    else
-     ll = ll->next;
-   mi = ll->data;
+     ll = eina_list_next(ll);
+   mi = eina_list_data_get(ll);
 
    /* While we don't have a label OR we don't match  AND we haven't
     * wrapped around */
    while ((!mi->label || strncasecmp(key_compose, mi->label, strlen(key_compose))) 
-	 && ll != ll_orig)
+          && ll != ll_orig)
      {
-	if (!(ll->next)) 
-	  ll = mi->menu->items;
-	else
-	  ll = ll->next;
-	mi = ll->data;
-
-	while (mi->separator)
-	  { 
-	     if (!(ll->next)) 
-	       ll = mi->menu->items;
-	     else
-	       ll = ll->next;
-	     mi = ll->data;
+	do
+	  {
+	     if (!eina_list_next(ll)) 
+     	       ll = mi->menu->items;
+     	     else
+     	       ll = eina_list_next(ll);
+     	     mi = eina_list_data_get(ll);
 	  }
+	while (mi->separator);
      }
 
    e_menu_item_active_set(mi, 1);
@@ -2169,7 +2158,7 @@ _e_menu_activate_next(void)
 	  {
 	     if (mi->submenu->items)
 	       {
-		  mi = mi->submenu->items->data;
+		  mi = eina_list_data_get(mi->submenu->items);
 		  e_menu_item_active_set(mi, 1);
 		  _e_menu_item_ensure_onscreen(mi);
 	       }
@@ -2206,14 +2195,14 @@ _e_menu_activate_first(void)
    Eina_List *ll;
    
    if (!_e_active_menus) return;
-   m = _e_active_menus->data;
+   m = eina_list_data_get(_e_active_menus);
    if (!m->items) return;
    ll = m->items;
-   mi = ll->data;
-   while ((mi->separator) && (ll->next))
+   mi = eina_list_data_get(ll);
+   while ((mi->separator) && eina_list_next(ll))
      {
-	ll = ll->next;
-	mi = ll->data;
+	ll = eina_list_next(ll);
+	mi = eina_list_data_get(ll);
      }
    if (mi->separator) return;
    e_menu_item_active_set(mi, 1);   
@@ -2228,14 +2217,14 @@ _e_menu_activate_last(void)
    Eina_List *ll;
    
    if (!_e_active_menus) return;
-   m = _e_active_menus->data;
+   m = eina_list_data_get(_e_active_menus);
    if (!m->items) return;
    ll = eina_list_last(m->items);
-   mi = ll->data;
-   while ((mi->separator) && (ll->prev))
+   mi = eina_list_data_get(ll);
+   while ((mi->separator) && eina_list_prev(ll))
      {
-	ll = ll->prev;
-	mi = ll->data;
+	ll = eina_list_prev(ll);
+	mi = eina_list_data_get(ll);
      }
    if (mi->separator) return;
    e_menu_item_active_set(mi, 1);   
@@ -2380,7 +2369,7 @@ _e_menu_mouse_autoscroll_check(void)
 	  {
 	     E_Menu *m;
 	     
-	     m = _e_active_menus->data;
+	     m = eina_list_data_get(_e_active_menus);
 	     if (_e_menu_x + e_config->menu_autoscroll_cursor_margin >= (m->zone->w - 1))
 	       {
 		  if (_e_menu_outside_bounds_get(1, 0)) autoscroll_x = 1;
@@ -2560,30 +2549,21 @@ _e_menu_cb_key_down(void *data, int type, void *event)
    
    ev = event;
    if (ev->window != _e_menu_win) return 1;
-   if      ((!strcmp(ev->key, "Up")) ||
-	    (!strcmp(ev->key, "KP_Up")))
+   if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
      _e_menu_item_activate_previous();
-   else if ((!strcmp(ev->key, "Down")) ||
-	    (!strcmp(ev->key, "KP_Down")))
+   else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
      _e_menu_item_activate_next();
-   else if ((!strcmp(ev->key, "Left")) ||
-	    (!strcmp(ev->key, "KP_Left")))
+   else if ((!strcmp(ev->key, "Left")) || (!strcmp(ev->key, "KP_Left")))
      _e_menu_activate_previous();
-   else if ((!strcmp(ev->key, "Right")) ||
-	    (!strcmp(ev->key, "KP_Right")))
+   else if ((!strcmp(ev->key, "Right")) || (!strcmp(ev->key, "KP_Right")))
      _e_menu_activate_next();
-   else if ((!strcmp(ev->key, "Home")) ||
-	    (!strcmp(ev->key, "KP_Home")))
+   else if ((!strcmp(ev->key, "Home")) || (!strcmp(ev->key, "KP_Home")))
      _e_menu_item_activate_first();
-   else if ((!strcmp(ev->key, "End")) ||
-	    (!strcmp(ev->key, "KP_End")))
+   else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
      _e_menu_item_activate_last();
    else if (!strcmp(ev->key, "space"))
-     {
-	_e_menu_active_call();
-     }
-   else if ((!strcmp(ev->key, "Return")) ||
-	    (!strcmp(ev->key, "KP_Enter")))
+     _e_menu_active_call();
+   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      {
 	_e_menu_active_call();
 	_e_menu_deactivate_all();
@@ -2735,8 +2715,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
 	     evas_event_feed_mouse_move(m->evas,
 					ev->x - m->cur.x + m->zone->x,
 					ev->y - m->cur.y + m->zone->y,
-					ev->timestamp,
-					NULL);
+					ev->timestamp, NULL);
 	  }
      }
 
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 99dd8b4..1913a6f 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -24,12 +24,14 @@ static Ecore_Idler *_e_module_idler = NULL;
 static Eina_List *_e_modules_delayed = NULL;
 
 EAPI int E_EVENT_MODULE_UPDATE = 0;
+EAPI int E_EVENT_MODULE_INIT_END = 0;
 
 /* externally accessible functions */
 EAPI int
 e_module_init(void)
 {
    E_EVENT_MODULE_UPDATE = ecore_event_type_new();
+   E_EVENT_MODULE_INIT_END = ecore_event_type_new();
    return 1;
 }
 
@@ -37,7 +39,7 @@ EAPI int
 e_module_shutdown(void)
 {
    E_Module *m;
-
+   
 #ifdef HAVE_VALGRIND
    /* do a leak check now before we dlclose() all those plugins, cause
     * that means we won't get a decent backtrace to leaks in there
@@ -45,10 +47,11 @@ e_module_shutdown(void)
    VALGRIND_DO_LEAK_CHECK
 #endif
 
-   _e_modules = eina_list_reverse(_e_modules);
-
-   EINA_LIST_FREE(_e_modules, m)
+   /* do not use EINA_LIST_FREE! e_object_del modifies list */
+   while (_e_modules)
      {
+	m = _e_modules->data;
+	
 	if (m && m->enabled && !m->error)
 	  {
 	     m->func.save(m);
@@ -90,6 +93,11 @@ e_module_all_load(void)
 	     if (m) e_module_enable(m);
 	  }
      }
+   
+   if (!_e_modules_delayed)
+     {
+	ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL);
+     }
 }
 
 EAPI E_Module *
@@ -101,6 +109,7 @@ e_module_new(const char *name)
    const char *modpath;
    char *s;
    Eina_List *l;
+   E_Config_Module *em;
    int in_list = 0;
 
    if (!name) return NULL;
@@ -199,11 +208,9 @@ init_done:
 	       }
 	  }
      }
-   for (l = e_config->modules; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->modules, l, em)
      {
-	E_Config_Module *em;
-
-	if (!(em = l->data)) continue;
+	if (!em) continue;
 	if (!e_util_strcmp(em->name, m->name))
 	  {
 	     in_list = 1;
@@ -408,12 +415,10 @@ EAPI void
 e_module_delayed_set(E_Module *m, int delayed)
 {
    Eina_List *l;
+   E_Config_Module *em;
    
-   for (l = e_config->modules; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->modules, l, em)
      {
-        E_Config_Module *em;
-	
-	em = l->data;
 	if (!em) continue;
 	if (!e_util_strcmp(m->name, em->name))
 	  {
@@ -433,12 +438,11 @@ e_module_priority_set(E_Module *m, int priority)
    /* Set the loading order for a module.
       More priority means load earlier */
    Eina_List *l;
+   E_Config_Module *em;
 
-   for (l = e_config->modules; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->modules, l, em)
      {
-	E_Config_Module *em;
-
-	if (!(em = l->data)) continue;
+	if (!em) continue;
 	if (!e_util_strcmp(m->name, em->name))
 	  {
 	     if (em->priority != priority)
@@ -517,16 +521,6 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
    e_config_save_queue();
 }
 
-static void 
-_e_module_event_update_free(void *data, void *event) 
-{
-   E_Event_Module_Update *ev;
-   
-   if (!(ev = event)) return;
-   E_FREE(ev->name);
-   E_FREE(ev);
-}
-
 static int
 _e_module_cb_idler(void *data)
 {
@@ -535,14 +529,21 @@ _e_module_cb_idler(void *data)
 	const char *name;
 	E_Module *m;
 
-	name = _e_modules_delayed->data;
+	name = eina_list_data_get(_e_modules_delayed);
 	_e_modules_delayed = eina_list_remove_list(_e_modules_delayed, _e_modules_delayed);
 	m = NULL;
 	if (name) m = e_module_new(name);
 	if (m) e_module_enable(m);
 	eina_stringshare_del(name);
      }
-   if (_e_modules_delayed) return 1;
+   if (_e_modules_delayed)
+     {
+       e_util_wakeup();
+       return 1;
+     }
+
+   ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL);
+
    _e_module_idler = NULL;
    return 0;
 }
@@ -556,3 +557,14 @@ _e_module_sort_priority(const void *d1, const void *d2)
    m2 = d2;
    return (m2->priority - m1->priority);
 }
+
+
+static void 
+_e_module_event_update_free(void *data, void *event) 
+{
+   E_Event_Module_Update *ev;
+   
+   if (!(ev = event)) return;
+   E_FREE(ev->name);
+   E_FREE(ev);
+}
diff --git a/src/bin/e_module.h b/src/bin/e_module.h
index 6c5c88e..a809477 100644
--- a/src/bin/e_module.h
+++ b/src/bin/e_module.h
@@ -17,6 +17,7 @@ typedef struct _E_Event_Module_Update E_Event_Module_Update;
 #define E_MODULE_TYPE 0xE0b0100b
 
 extern EAPI int E_EVENT_MODULE_UPDATE;
+extern EAPI int E_EVENT_MODULE_INIT_END;
 
 struct _E_Event_Module_Update
 {
diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c
index 2c1edae..80f0ee4 100644
--- a/src/bin/e_moveresize.c
+++ b/src/bin/e_moveresize.c
@@ -3,60 +3,116 @@
  */
 #include "e.h"
 
+static void _e_resize_begin(void *data, void *bd);
+static void _e_resize_update(void *data, void *bd);
+static void _e_resize_end(void *data, void *bd);
+static void _e_resize_border_extents(E_Border *bd, int *w, int *h);
+static void _e_move_begin(void *data, void *bd);
+static void _e_move_update(void *data, void *bd);
+static void _e_move_end(void *data, void *bd);
+static void _e_move_resize_object_coords_set(int x, int y, int w, int h);
+
 static E_Popup *_disp_pop = NULL;
 static Evas_Object *_obj = NULL;
-
+static Eina_List *hooks = NULL;
 static int visible = 0;
 static int obj_x = 0;
 static int obj_y = 0;
 static int obj_w = 0;
 static int obj_h = 0;
 
-EAPI void
-e_resize_begin(E_Zone *zone, int w, int h)
+EAPI int
+e_moveresize_init(void)
+{
+   E_Border_Hook *h;
+
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_BEGIN, _e_resize_begin, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_UPDATE, _e_resize_update, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_RESIZE_END, _e_resize_end, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_BEGIN, _e_move_begin, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_UPDATE, _e_move_update, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_MOVE_END, _e_move_end, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+
+   return 1;
+}
+
+EAPI int
+e_moveresize_shutdown(void)
 {
+   E_Border_Hook *h;
+
+   EINA_LIST_FREE(hooks, h)
+     e_border_hook_del(h);
+
+   return 1;
+}
+
+static void
+_e_resize_begin(void *data, void *border)
+{
+   E_Border *bd = border;
    Evas_Coord ew, eh;
    char buf[40];
+   int w, h;
 
-   _obj = NULL;
    if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
+   _disp_pop = NULL;
+   _obj = NULL;
 
-   if (e_config->resize_info_visible)
-     {
-	_disp_pop = e_popup_new(zone, 0, 0, 1, 1);
-	if (!_disp_pop) return;
-	e_popup_layer_set(_disp_pop, 255);
-	_obj = edje_object_add(_disp_pop->evas);
-	e_theme_edje_object_set(_obj, "base/theme/borders",
-	      "e/widgets/border/default/resize");
-	snprintf(buf, sizeof(buf), "9999x9999");
-	edje_object_part_text_set(_obj, "e.text.label", buf);
-
-	edje_object_size_min_calc(_obj, &ew, &eh);
-	evas_object_move(_obj, 0, 0);
-	evas_object_resize(_obj, ew, eh);
-	evas_object_show(_obj);
-	e_popup_edje_bg_object_set(_disp_pop, _obj);
-     }
-   
-   e_resize_update(w, h);
+   if (!e_config->resize_info_visible)
+     return;
 
-   if (e_config->resize_info_visible)
+   if (e_config->resize_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
+   _e_resize_border_extents(bd, &w, &h);
+
+   _disp_pop = e_popup_new(bd->zone, 0, 0, 1, 1);
+   if (!_disp_pop) return;
+   e_popup_layer_set(_disp_pop, 255);
+   _obj = edje_object_add(_disp_pop->evas);
+   e_theme_edje_object_set(_obj, "base/theme/borders",
+			   "e/widgets/border/default/resize");
+   snprintf(buf, sizeof(buf), "9999x9999");
+   edje_object_part_text_set(_obj, "e.text.label", buf);
+
+   edje_object_size_min_calc(_obj, &ew, &eh);
+   evas_object_move(_obj, 0, 0);
+   evas_object_resize(_obj, ew, eh);
+   evas_object_show(_obj);
+   e_popup_edje_bg_object_set(_disp_pop, _obj);
+
+   if (!visible)
      {
-	e_popup_move_resize(_disp_pop,
-	      (obj_x - _disp_pop->zone->x) +
-	      ((obj_w - ew) / 2),
-	      (obj_y - _disp_pop->zone->y) +
-	      ((obj_h - eh) / 2),
-	      ew, eh);
+	evas_object_show(_obj);
 	e_popup_show(_disp_pop);
+	visible = 1;
      }
+   snprintf(buf, sizeof(buf), "%ix%i", w, h);
+   edje_object_part_text_set(_obj, "e.text.label", buf);
+
+   e_popup_move_resize(_disp_pop,
+		       (obj_x - _disp_pop->zone->x) +
+		       ((obj_w - ew) / 2),
+		       (obj_y - _disp_pop->zone->y) +
+		       ((obj_h - eh) / 2),
+		       ew, eh);
+
+   e_popup_show(_disp_pop);
 
    visible = 1;
 }
 
-EAPI void
-e_resize_end(void)
+static void
+_e_resize_end(void *data, void *border)
 {
    if (e_config->resize_info_visible)
      {
@@ -75,12 +131,22 @@ e_resize_end(void)
    visible = 0;
 }
 
-EAPI void
-e_resize_update(int w, int h)
+static void
+_e_resize_update(void *data, void *border)
 {
+   E_Border *bd = border;
    char buf[40];
+   int w, h;
 
    if (!_disp_pop) return;
+
+   if (e_config->resize_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
+   _e_resize_border_extents(bd, &w, &h);
+
    if (!visible)
      {
 	evas_object_show(_obj);
@@ -91,44 +157,76 @@ e_resize_update(int w, int h)
    edje_object_part_text_set(_obj, "e.text.label", buf);
 }
 
-EAPI void
-e_move_begin(E_Zone *zone, int x, int y)
+static void
+_e_resize_border_extents(E_Border *bd, int *w, int *h)
 {
+   if ((bd->client.icccm.base_w >= 0) &&
+       (bd->client.icccm.base_h >= 0))
+     {
+	if (bd->client.icccm.step_w > 0)
+	  *w = (bd->client.w - bd->client.icccm.base_w) / bd->client.icccm.step_w;
+	else
+	  *w = bd->client.w;
+	if (bd->client.icccm.step_h > 0)
+	  *h = (bd->client.h - bd->client.icccm.base_h) / bd->client.icccm.step_h;
+	else
+	  *h = bd->client.h;
+     }
+   else
+     {
+	if (bd->client.icccm.step_w > 0)
+	  *w = (bd->client.w - bd->client.icccm.min_w) / bd->client.icccm.step_w;
+	else
+	  *w = bd->client.w;
+	if (bd->client.icccm.step_h > 0)
+	  *h = (bd->client.h - bd->client.icccm.min_h) / bd->client.icccm.step_h;
+	else
+	  *h = bd->client.h;
+     }
+}
+
+static void
+_e_move_begin(void *data, void *border)
+{
+   E_Border *bd = border;
    Evas_Coord ew, eh;
    char buf[40];
 
-   _obj = NULL;
    if (_disp_pop) e_object_del(E_OBJECT(_disp_pop));
+   _disp_pop = NULL;
+   _obj = NULL;
 
-   if (e_config->move_info_visible)
-     {
-	_disp_pop = e_popup_new(zone, 0, 0, 1, 1);
-	_obj = edje_object_add(_disp_pop->evas);
-	e_theme_edje_object_set(_obj, "base/theme/borders",
-	      "e/widgets/border/default/move");
-	snprintf(buf, sizeof(buf), "9999 9999");
-	edje_object_part_text_set(_obj, "e.text.label", buf);
-
-	edje_object_size_min_calc(_obj, &ew, &eh);
-	evas_object_move(_obj, 0, 0);
-	evas_object_resize(_obj, ew, eh);
-	evas_object_show(_obj);
-	e_popup_edje_bg_object_set(_disp_pop, _obj);
-     }
+   if (!e_config->move_info_visible)
+     return;
 
-   if (e_config->move_info_visible)
-     {
-	e_popup_move_resize(_disp_pop,
-	      (obj_x - _disp_pop->zone->x) +
-	      ((obj_w - ew) / 2),
-	      (obj_y - _disp_pop->zone->y) +
-	      ((obj_h - eh) / 2),
-	      ew, eh);
-     }
+   if (e_config->move_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
+   _disp_pop = e_popup_new(bd->zone, 0, 0, 1, 1);
+   _obj = edje_object_add(_disp_pop->evas);
+   e_theme_edje_object_set(_obj, "base/theme/borders",
+			   "e/widgets/border/default/move");
+   snprintf(buf, sizeof(buf), "9999 9999");
+   edje_object_part_text_set(_obj, "e.text.label", buf);
+
+   edje_object_size_min_calc(_obj, &ew, &eh);
+   evas_object_move(_obj, 0, 0);
+   evas_object_resize(_obj, ew, eh);
+   evas_object_show(_obj);
+   e_popup_edje_bg_object_set(_disp_pop, _obj);
+
+   e_popup_move_resize(_disp_pop,
+		       (obj_x - _disp_pop->zone->x) +
+		       ((obj_w - ew) / 2),
+		       (obj_y - _disp_pop->zone->y) +
+		       ((obj_h - eh) / 2),
+		       ew, eh);
 }
 
-EAPI void
-e_move_end(void)
+static void
+_e_move_end(void *data, void *border)
 {
    if (e_config->move_info_visible)
      {
@@ -147,24 +245,32 @@ e_move_end(void)
    visible = 0;
 }
 
-EAPI void
-e_move_update(int x, int y)
+static void
+_e_move_update(void *data, void *border)
 {
+   E_Border *bd = border;
+   
    char buf[40];
 
    if (!_disp_pop) return;
+
+   if (e_config->move_info_follows)
+     _e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h);
+   else
+     _e_move_resize_object_coords_set(bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
+
    if (!visible)
      {
 	evas_object_show(_obj);
 	e_popup_show(_disp_pop);
 	visible = 1;
      }
-   snprintf(buf, sizeof(buf), "%i %i", x, y);
+   snprintf(buf, sizeof(buf), "%i %i", bd->x, bd->y);
    edje_object_part_text_set(_obj, "e.text.label", buf);
 }
 
-EAPI void
-e_move_resize_object_coords_set(int x, int y, int w, int h)
+static void
+_e_move_resize_object_coords_set(int x, int y, int w, int h)
 {
    obj_x = x;
    obj_y = y;
diff --git a/src/bin/e_moveresize.h b/src/bin/e_moveresize.h
index 6bc85fd..9f45d8b 100644
--- a/src/bin/e_moveresize.h
+++ b/src/bin/e_moveresize.h
@@ -7,15 +7,8 @@
 #ifndef E_MOVERESIZE_H
 #define E_MOVERESIZE_H
 
-EAPI void e_resize_begin(E_Zone *zone, int w, int h);
-EAPI void e_resize_end(void);
-EAPI void e_resize_update(int w, int h);
-
-EAPI void e_move_begin(E_Zone *zone, int x, int y);
-EAPI void e_move_end(void);
-EAPI void e_move_update(int x, int y);
-
-EAPI void e_move_resize_object_coords_set(int x, int y, int w, int h);
+EAPI int e_moveresize_init(void);
+EAPI int e_moveresize_shutdown(void);
 
 #endif
 #endif
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index 3ff08e5..d2ec504 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -43,7 +43,7 @@ e_msg_init(void)
 EAPI int
 e_msg_shutdown(void)
 {
-   while (handlers) e_msg_handler_del(handlers->data);
+   while (handlers) e_msg_handler_del(eina_list_data_get(handlers));
    E_EVENT_MSG = 0;
    if (hand) ecore_event_handler_del(hand);
    hand = NULL;
@@ -115,25 +115,19 @@ _e_msg_event_cb(void *data, int ev_type, void *ev)
 {
    E_Msg_Event *e;
    Eina_List *l;
+   E_Msg_Handler *emsgh;
 
    processing_handlers++;
    e = ev;
-   for (l = handlers; l; l = l->next)
+   EINA_LIST_FOREACH(handlers, l, emsgh)
      {
-	E_Msg_Handler *emsgh;
-	
-	emsgh = l->data;
 	if (!emsgh->delete_me)
 	  emsgh->func(emsgh->data, e->name, e->info, e->val, e->obj);
      }
    processing_handlers--;
    if ((processing_handlers == 0) && (del_handlers))
      {
-	while (del_handlers)
-	  {
-	     e_msg_handler_del(del_handlers->data);
-	     del_handlers = eina_list_remove_list(del_handlers, del_handlers);
-	  }
+	E_FREE_LIST(del_handlers, e_msg_handler_del);
      }
    return 1;
 }
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 84591fd..76d7605 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -30,6 +30,7 @@ e_msgbus_init(void)
    _e_msgbus_data = E_NEW(E_Msgbus_Data, 1);
 
    e_dbus_init();
+   e_hal_init();
 
    _e_msgbus_data->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
    if (!_e_msgbus_data->conn)
@@ -96,6 +97,7 @@ e_msgbus_shutdown(void)
      {
         e_dbus_connection_close(_e_msgbus_data->conn);
      }
+   e_hal_shutdown();
    e_dbus_shutdown();
 
    E_FREE(_e_msgbus_data);
@@ -216,8 +218,8 @@ _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
 static DBusMessage* 
 _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
 {
-   Eina_List *mod_list;
-   Eina_List * l;
+   Eina_List *l;
+   E_Module *mod;
    DBusMessage *reply;
    DBusMessageIter iter;
    DBusMessageIter arr;
@@ -226,16 +228,12 @@ _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
    dbus_message_iter_init_append(reply, &iter);
    dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(si)", &arr);
 
-   mod_list = e_module_list();
-
-   for (l = mod_list; l; l = l->next) 
+   EINA_LIST_FOREACH(e_module_list(), l, mod)
      {
 	DBusMessageIter sub;
-	E_Module *mod;
 	const char *name;
 	int enabled;
 
-	mod = l->data;
 	name = mod->name;
 	enabled = mod->enabled;
 	dbus_message_iter_open_container(&arr, DBUS_TYPE_STRUCT, NULL, &sub);
@@ -286,8 +284,8 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
 static DBusMessage* 
 _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
 {
-   Eina_List *profiles;
-   Eina_List * l;
+   Eina_List *l;
+   const char *name;
    DBusMessage *reply;
    DBusMessageIter iter;
    DBusMessageIter arr;
@@ -296,13 +294,8 @@ _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
    dbus_message_iter_init_append(reply, &iter);
    dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &arr);
 
-   profiles = e_config_profile_list();
-
-   for (l = profiles; l; l = l->next) 
+   EINA_LIST_FOREACH(e_config_profile_list(), l, name)
      {
-	const char *name;
-
-	name = l->data;
 	dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, &name);
      }
    dbus_message_iter_close_container(&iter, &arr);
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index 3d7c12b..6457ea6 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -287,13 +287,14 @@ void
 e_object_breadcrumb_del(E_Object *obj, char *crumb)
 {
    Eina_List *l;
+   char *key;
    
    E_OBJECT_CHECK(obj);
-   for (l = obj->crumbs; l; l = l->next)
+   EINA_LIST_FOREACH(obj->crumbs, l, key)
      {
-	if (!strcmp(crumb, l->data))
+	if (!strcmp(crumb, key))
 	  {
-	     free(l->data);
+	     free(key);
 	     obj->crumbs = eina_list_remove_list(obj->crumbs, l);
 	     return;
 	  }
@@ -304,10 +305,11 @@ void
 e_object_breadcrumb_debug(E_Object *obj)
 {
    Eina_List *l;
+   char *key;
    
    E_OBJECT_CHECK(obj);
-   for (l = obj->crumbs; l; l = l->next)
-     printf("CRUMB: %s\n", l->data);
+   EINA_LISt_FOREACH(obj->crumbs, l, key)
+     printf("CRUMB: %s\n", key);
 }
 */
 
diff --git a/src/bin/e_order.c b/src/bin/e_order.c
index 0dd74ee..9ed21ee 100644
--- a/src/bin/e_order.c
+++ b/src/bin/e_order.c
@@ -30,11 +30,7 @@ e_order_shutdown(void)
 {
    orders = eina_list_free(orders);
 
-   while (handlers)
-     {
-	ecore_event_handler_del(handlers->data);
-	handlers = eina_list_remove_list(handlers, handlers);
-     }
+   E_FREE_LIST(handlers, ecore_event_handler_del);
    return 1;
 }
 
@@ -75,7 +71,7 @@ e_order_remove(E_Order *eo, Efreet_Desktop *desktop)
 
    tmp = eina_list_data_find_list(eo->desktops, desktop);
    if (!tmp) return;
-   efreet_desktop_free(tmp->data);
+   efreet_desktop_free(eina_list_data_get(tmp));
    eo->desktops = eina_list_remove_list(eo->desktops, tmp);
    _e_order_save(eo);
 }
@@ -106,16 +102,15 @@ EAPI void
 e_order_files_append(E_Order *eo, Eina_List *files)
 {
    Eina_List *l;
+   const char *file;
 
    E_OBJECT_CHECK(eo);
    E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
 
-   for (l = files; l ; l = l->next)
+   EINA_LIST_FOREACH(files, l, file)
      {
 	Efreet_Desktop *desktop;
-	const char *file;
 
-	file = l->data;
 	desktop = efreet_desktop_get(file);
 	if (!desktop) continue;
 	eo->desktops = eina_list_append(eo->desktops, desktop);
@@ -127,16 +122,15 @@ EAPI void
 e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before)
 {
    Eina_List *l;
+   const char *file;
 
    E_OBJECT_CHECK(eo);
    E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
 
-   for (l = files; l ; l = l->next)
+   EINA_LIST_FOREACH(files, l, file)
      {
 	Efreet_Desktop *desktop;
-	const char *file;
 
-	file = l->data;
 	desktop = efreet_desktop_get(file);
 	if (!desktop) continue;
 	eo->desktops = eina_list_prepend_relative(eo->desktops, desktop, before);
@@ -150,11 +144,7 @@ e_order_clear(E_Order *eo)
    E_OBJECT_CHECK(eo);
    E_OBJECT_TYPE_CHECK(eo, E_ORDER_TYPE);
 
-   while (eo->desktops)
-     {
-	efreet_desktop_free(eo->desktops->data);
-	eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
-     }
+   E_FREE_LIST(eo->desktops, efreet_desktop_free);
    _e_order_save(eo);
 }
 
@@ -162,11 +152,7 @@ e_order_clear(E_Order *eo)
 static void
 _e_order_free(E_Order *eo)
 {
-   while (eo->desktops)
-     {
-	efreet_desktop_free(eo->desktops->data);
-	eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
-     }
+   E_FREE_LIST(eo->desktops, efreet_desktop_free);
    if (eo->path) eina_stringshare_del(eo->path);
    if (eo->monitor) ecore_file_monitor_del(eo->monitor);
    orders = eina_list_remove(orders, eo);
@@ -191,11 +177,7 @@ _e_order_read(E_Order *eo)
    FILE *f;
    char *dir;
 
-   while (eo->desktops)
-     {
-	efreet_desktop_free(eo->desktops->data);
-	eo->desktops = eina_list_remove_list(eo->desktops, eo->desktops);
-     }
+   E_FREE_LIST(eo->desktops, efreet_desktop_free);
    if (!eo->path) return;
 
    dir = ecore_file_dir_get(eo->path);
@@ -245,17 +227,16 @@ _e_order_save(E_Order *eo)
 {
    FILE *f;
    Eina_List *l;
+   Efreet_Desktop *desktop;
 
    if (!eo->path) return;
    f = fopen(eo->path, "wb");
    if (!f) return;
 
-   for (l = eo->desktops; l; l = l->next)
+   EINA_LIST_FOREACH(eo->desktops, l, desktop)
      {
-	Efreet_Desktop *desktop;
 	const char *id;
 
-	desktop = l->data;
 	id = efreet_util_path_to_file_id(desktop->orig_path);
 	if (id)
 	  {
@@ -275,35 +256,32 @@ _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
 {
    Efreet_Event_Desktop_Change *event;
    Eina_List *l;
+   E_Order *eo;
 
    event = ev;
    switch (event->change)
      {
       case EFREET_DESKTOP_CHANGE_ADD:
 	 /* If a desktop is added, reread all .order files */
-	 for (l = orders; l; l = l->next)
+	 EINA_LIST_FOREACH(orders, l, eo)
 	   {
-	      E_Order *eo;
-
-	      eo = l->data;
 	      _e_order_read(eo);
 	      if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
 	   }
 	 break;
       case EFREET_DESKTOP_CHANGE_REMOVE:
 	 /* If a desktop is removed, drop the .desktop pointer */
-	 for (l = orders; l; l = l->next)
+	 EINA_LIST_FOREACH(orders, l, eo)
 	   {
-	      E_Order   *eo;
 	      Eina_List *l2;
+	      Efreet_Desktop *desktop;
 	      int changed = 0;
 
-	      eo = l->data;
-	      for (l2 = eo->desktops; l2; l2 = l2->next)
+	      EINA_LIST_FOREACH(eo->desktops, l2, desktop)
 		{
-		   if (l2->data == event->current)
+		   if (desktop == event->current)
 		     {
-			efreet_desktop_free(l2->data);
+			efreet_desktop_free(desktop);
 			eo->desktops = eina_list_remove_list(eo->desktops, l2);
 			changed = 1;
 		     }
@@ -313,18 +291,17 @@ _e_order_cb_efreet_desktop_change(void *data, int ev_type, void *ev)
 	 break;
       case EFREET_DESKTOP_CHANGE_UPDATE:
 	 /* If a desktop is updated, point to the new desktop and update */
-	 for (l = orders; l; l = l->next)
+	 EINA_LIST_FOREACH(orders, l, eo)
 	   {
-	      E_Order *eo;
 	      Eina_List *l2;
+	      Efreet_Desktop *desktop;
 	      int changed = 0;
 
-	      eo = l->data;
-	      for (l2 = eo->desktops; l2; l2 = l2->next)
+	      EINA_LIST_FOREACH(eo->desktops, l2, desktop)
 		{
-		   if (l2->data == event->previous)
+		   if (desktop == event->previous)
 		     {
-			efreet_desktop_free(l2->data);
+			efreet_desktop_free(desktop);
 			efreet_desktop_ref(event->current);
 			l2->data = event->current;
 			changed = 1;
diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c
index 86a88ed..91ea6cd 100644
--- a/src/bin/e_pan.c
+++ b/src/bin/e_pan.c
@@ -150,6 +150,7 @@ _e_smart_child_resize_hook(void *data, Evas *e, Evas_Object *obj, void *event_in
    Evas_Coord w, h;
 
    sd = data;
+   if (!sd->child_obj) return;
    evas_object_geometry_get(sd->child_obj, NULL, NULL, &w, &h);
    if ((w != sd->child_w) || (h != sd->child_h))
      {
@@ -163,7 +164,8 @@ _e_smart_child_resize_hook(void *data, Evas *e, Evas_Object *obj, void *event_in
 static void
 _e_smart_reconfigure(E_Smart_Data *sd)
 {
-   evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);
+   if (sd->child_obj)
+     evas_object_move(sd->child_obj, sd->x - sd->px, sd->y - sd->py);
 }
 
 static void
@@ -212,35 +214,40 @@ static void
 _e_smart_show(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_show(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_show(sd->child_obj);
 }
 
 static void
 _e_smart_hide(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_hide(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_hide(sd->child_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->child_obj, r, g, b, a);
+   if (sd->child_obj)
+     evas_object_color_set(sd->child_obj, r, g, b, a);
 }
 
 static void
 _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_set(sd->child_obj, clip);
+   if (sd->child_obj)
+     evas_object_clip_set(sd->child_obj, clip);
 }
 
 static void
 _e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_unset(sd->child_obj);
+   if (sd->child_obj)
+     evas_object_clip_unset(sd->child_obj);
 }
 
 /* never need to touch this */
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 801199d..df8a39c 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -161,6 +161,7 @@ EAPI void
 e_path_user_path_remove(E_Path *ep, const char *path)
 {
    Eina_List *l;
+   E_Path_Dir *epd;
 
    E_OBJECT_CHECK(ep);
    E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@@ -178,11 +179,8 @@ e_path_user_path_remove(E_Path *ep, const char *path)
 	if (!new_path) return;
 	strcpy(new_path, home_dir);
 	strcat(new_path, path + 1);
-	for (l = *(ep->user_dir_list); l; l = l->next)
+	EINA_LIST_FOREACH(*(ep->user_dir_list), l, epd)
 	  {
-	     E_Path_Dir *epd;
-	     
-	     epd = l->data;
 	     if (epd->dir)
 	       {
 		  if (!strcmp(epd->dir, new_path))
@@ -201,10 +199,8 @@ e_path_user_path_remove(E_Path *ep, const char *path)
       }
    else
      {
-	for (l = *(ep->user_dir_list); l; l = l->next)
+	EINA_LIST_FOREACH(*(ep->user_dir_list), l, epd)
 	  {
-	     E_Path_Dir *epd;
-	     epd = l->data;
 	     if (epd->dir)
 	       {
 		  if (!strcmp(epd->dir, path))
@@ -223,12 +219,10 @@ e_path_user_path_remove(E_Path *ep, const char *path)
 
 EAPI void
 e_path_user_path_clear(E_Path *ep)
-{	
-   while (*(ep->user_dir_list))
+{
+   E_Path_Dir *epd;
+   EINA_LIST_FREE(*(ep->user_dir_list), epd)
      {
-	E_Path_Dir *epd;
-	epd = (*(ep->user_dir_list))->data;
-	*(ep->user_dir_list) = eina_list_remove_list(*(ep->user_dir_list), *(ep->user_dir_list));
 	eina_stringshare_del(epd->dir);
 	free(epd);     
      }
@@ -268,11 +262,8 @@ e_path_find(E_Path *ep, const char *file)
 	  }
      }
    /* Look in the users dir list */
-   for (l = *(ep->user_dir_list); l; l = l->next)
+   EINA_LIST_FOREACH(*(ep->user_dir_list), l, epd)
      {
-	E_Path_Dir *epd;
-
-	epd = l->data;
 	if (epd->dir)
 	  {
 	     snprintf(buf, sizeof(buf), "%s/%s", epd->dir, file);
@@ -294,8 +285,8 @@ e_path_find(E_Path *ep, const char *file)
 EAPI void
 e_path_evas_append(E_Path *ep, Evas *evas)
 {
-   Eina_List *l;
    Eina_List *dir_list;
+   E_Path_Dir *epd;
    
    E_OBJECT_CHECK(ep);
    E_OBJECT_TYPE_CHECK(ep, E_PATH_TYPE);
@@ -303,16 +294,12 @@ e_path_evas_append(E_Path *ep, Evas *evas)
 
    dir_list = e_path_dir_list_get(ep);
 
-   for (l = dir_list; l; l = l->next)
+   EINA_LIST_FREE(dir_list, epd)
      {
-	E_Path_Dir *epd;
-	
-	epd = l->data;
 	if (epd->dir) evas_font_path_append(evas, epd->dir);
 	eina_stringshare_del(epd->dir);
 	free(epd);
      }
-   if (dir_list) eina_list_free(dir_list);
 }
 
 /* combine default_list and and user_list in and easy to use list */
@@ -328,18 +315,16 @@ e_path_dir_list_get(E_Path *ep)
 
    if (ep->user_dir_list)
      {
-	for (l = *(ep->user_dir_list); l; l = l->next)
+	EINA_LIST_FOREACH(*(ep->user_dir_list), l, epd)
 	  {
-	     epd = l->data;
 	     new_epd = malloc(sizeof(E_Path_Dir));
 	     new_epd->dir = eina_stringshare_add(epd->dir);
 	     dir_list = eina_list_append(dir_list, new_epd);
 	  }
      }
 
-   for (l = ep->default_dir_list; l; l = l->next)
+   EINA_LIST_FOREACH(ep->default_dir_list, l, epd)
      {
-	epd = l->data;
 	new_epd = malloc(sizeof(E_Path_Dir));
 	new_epd->dir = eina_stringshare_add(epd->dir);
 	dir_list = eina_list_append(dir_list, new_epd);
@@ -353,10 +338,8 @@ e_path_dir_list_free(Eina_List *dir_list)
 {
    E_Path_Dir *epd;
 
-   while (dir_list)
+   EINA_LIST_FREE(dir_list, epd)
      {
-	epd = dir_list->data;
-	dir_list = eina_list_remove_list(dir_list, dir_list);
 	eina_stringshare_del(epd->dir);
 	free(epd);
      }
@@ -366,15 +349,13 @@ e_path_dir_list_free(Eina_List *dir_list)
 static void 
 _e_path_free(E_Path *ep)
 {
+   E_Path_Dir *epd;
+
    _e_path_cache_free(ep);
-   while (ep->default_dir_list)
+   EINA_LIST_FREE(ep->default_dir_list, epd)
      {
-	E_Path_Dir *epd;
-	epd = ep->default_dir_list->data;
 	eina_stringshare_del(epd->dir);
 	free(epd);
-	ep->default_dir_list = eina_list_remove_list(ep->default_dir_list, 
-						     ep->default_dir_list);
      }
    free(ep);
 }
diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index e22fcc8..1e9f9ab 100644
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -22,15 +22,14 @@ e_place_zone_region_smart_cleanup(E_Zone *zone)
 	  {
 	     int area;
 	     Eina_List *ll;
+	     E_Border *bd;
 
 	     /* Ordering windows largest to smallest gives better results */
 	     area = border->w * border->h;
-	     for (ll = borders; ll; ll = ll->next)
+	     EINA_LIST_FOREACH(borders, ll, bd)
 	       {
 		  int testarea;
-		  E_Border *bd;
 
-		  bd = ll->data;
 		  testarea = bd->w * bd->h;
 		  /* Insert the border if larger than the current border */
 		  if (area >= testarea)
@@ -46,15 +45,13 @@ e_place_zone_region_smart_cleanup(E_Zone *zone)
    e_container_border_list_free(bl);
 
    /* Loop over the borders moving each one using the smart placement */
-   while (borders)
+   EINA_LIST_FREE(borders, border)
      {
 	int new_x, new_y;
 
-	border = borders->data;
 	e_place_zone_region_smart(zone, borders, border->x, border->y,
 				  border->w, border->h, &new_x, &new_y);
 	e_border_move(border, new_x, new_y);
-	borders = eina_list_remove(borders, border);
      }
 }
 
@@ -69,7 +66,7 @@ _e_place_coverage_border_add(E_Zone *zone, Eina_List *skiplist, int ar, int x, i
 {
    Eina_List *ll;
    E_Border_List *bl;
-   E_Border *bd;
+   E_Border *bd, *bd2;
    int x2, y2, w2, h2;
    int ok;
    int iw, ih;
@@ -80,9 +77,9 @@ _e_place_coverage_border_add(E_Zone *zone, Eina_List *skiplist, int ar, int x, i
      {
 	ok = 1;
 	x2 = (bd->x - zone->x); y2 = (bd->y - zone->y); w2 = bd->w; h2 = bd->h;
-	for (ll = skiplist; ll; ll = ll->next)
+	EINA_LIST_FOREACH(skiplist, ll, bd2)
 	  {
-	     if (ll->data == bd)
+	     if (bd2 == bd)
 	       {
 		  ok = 0;
 		  break;
@@ -114,10 +111,8 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h)
    E_Shelf *es;
    int x2, y2, w2, h2;
 
-   for (l = e_shelf_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-
-	es = l->data;
 	if (es->zone != zone) continue;
 	x2 = es->x; y2 = es->y; w2 = es->w; h2 = es->h;
 	if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2))
@@ -151,7 +146,7 @@ e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w
    char               *u_x = NULL, *u_y = NULL;
    Eina_List          *ll;
    E_Border_List      *bl;
-   E_Border           *bd;
+   E_Border           *bd, *bd2;
 
    *rx = x;
    *ry = y;
@@ -195,13 +190,12 @@ e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w
    if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART)
      {
 	Eina_List *l;
+	E_Shelf *es;
 
-	for (l = e_shelf_list(); l; l = l->next)
+	EINA_LIST_FOREACH(e_shelf_list(), l, es)
 	  {
-	     E_Shelf *es;
 	     int bx, by, bw, bh;
 
-	     es = l->data;
 	     if (es->zone != zone) continue;
 
 	     bx = es->x;
@@ -278,9 +272,9 @@ e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w
 	int bx, by, bw, bh;
 
 	ok = 1;
-	for (ll = skiplist; ll; ll = ll->next)
+	EINA_LIST_FOREACH(skiplist, ll, bd2)
 	  {
-	     if (ll->data == bd)
+	     if (bd2 == bd)
 	       {
 		  ok = 0;
 		  break;
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 9229082..3b4ac76 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -25,7 +25,7 @@ static void _e_pointer_canvas_del(E_Pointer *p);
 static void _e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info);
 static void _e_pointer_free(E_Pointer *p);
 static void _e_pointer_stack_free(E_Pointer_Stack *elem);
-static int  _e_pointer_type_set(E_Pointer *p, const char *type);
+static void  _e_pointer_type_set(E_Pointer *p, const char *type);
 static void _e_pointer_active_handle(E_Pointer *p);
 
 static int _e_pointer_cb_mouse_down(void *data, int type, void *event);
@@ -62,14 +62,7 @@ e_pointer_init(void)
 EAPI int
 e_pointer_shutdown(void)
 {
-   while (handlers)
-     {
-	Ecore_Event_Handler *h;
-
-	h = handlers->data;
-	handlers = eina_list_remove_list(handlers, handlers);
-	ecore_event_handler_del(h);
-     }
+   E_FREE_LIST(handlers, ecore_event_handler_del);
    return 1;
 }
 
@@ -81,19 +74,12 @@ e_pointer_window_new(Ecore_X_Window win, int filled)
    p = E_OBJECT_ALLOC(E_Pointer, E_POINTER_TYPE, _e_pointer_free);
    if (!p) return NULL;
 
+   p->e_cursor = e_config->use_e_cursor;
+   p->win = win;
+   p->color = 0;
    if (e_config->use_e_cursor)
-     {
-	p->e_cursor = 1;
-	p->win = win;
-	/* Init the cursor object */
-	if (ecore_x_cursor_color_supported_get()) p->color = 1;
-	else p->color = 0;
-     }
-   else
-     {
-	p->e_cursor = 0;
-	p->win = win;
-     }
+     if (ecore_x_cursor_color_supported_get()) p->color = 1;
+
    ecore_x_cursor_size_set(e_config->cursor_size * 3 / 4);
    if (filled) e_pointer_type_push(p, p, "default");
    _e_pointers = eina_list_append(_e_pointers, p); 
@@ -104,14 +90,13 @@ EAPI void
 e_pointers_size_set(int size)
 {
    Eina_List *l;
+   E_Pointer *p;
 
    if (!e_config->show_cursor) return;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	E_Pointer *p;
 	Evas_Engine_Info_Buffer *einfo;
 
-	p = l->data;
 	if (p->evas)
 	  {
 	     p->w = p->h = size;
@@ -180,11 +165,9 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
    Eina_List *l;
    E_Pointer_Stack *stack;
 
-   for (l = p->stack; l; l = l->next)
+   EINA_LIST_FOREACH(p->stack, l, stack)
      {
-	stack = l->data;
-	if ((stack->obj == obj) &&
-	    ((!type) || (!strcmp(stack->type, type))))
+	if ((stack->obj == obj) && ((!type) || (!strcmp(stack->type, type))))
 	  {
 	     _e_pointer_stack_free(stack);
 	     p->stack = eina_list_remove_list(p->stack, l);
@@ -201,7 +184,7 @@ e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
 	return;
      }
 
-   stack = p->stack->data;
+   stack = eina_list_data_get(p->stack);
    _e_pointer_type_set(p, stack->type);
 
    if (p->type) eina_stringshare_del(p->type);
@@ -216,14 +199,13 @@ EAPI void
 e_pointer_idler_before(void)
 {
    Eina_List *l;
+   E_Pointer *p;
 
    if (!e_config->show_cursor) return;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	E_Pointer *p;
 	Eina_List *updates;
 
-	p = l->data;
 	if (!p->e_cursor) continue;
 	if (!p->evas) continue;
 
@@ -232,7 +214,8 @@ e_pointer_idler_before(void)
 	  {
 	     Ecore_X_Cursor cur;
 
-	     cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, p->hot.x, p->hot.y);
+	     cur = ecore_x_cursor_new(p->win, p->pixels, p->w, p->h, 
+                                      p->hot.x, p->hot.y);
 	     ecore_x_window_cursor_set(p->win, cur);
 	     ecore_x_cursor_free(cur);
 	     evas_render_updates_free(updates);
@@ -267,17 +250,13 @@ _e_pointer_canvas_add(E_Pointer *p)
    p->pixels = malloc(p->w * p->h * sizeof(int));
    if (!p->pixels)
      {
-	evas_free(p->evas);
-	p->evas = NULL;
+        _e_pointer_canvas_del(p);
 	return;
      }
    einfo = (Evas_Engine_Info_Buffer *)evas_engine_info_get(p->evas);
    if (!einfo)
      {
-	free(p->pixels);
-	p->pixels = NULL;
-	evas_free(p->evas);
-	p->evas = NULL;
+        _e_pointer_canvas_del(p);
 	return;
      }
    einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_ARGB32;
@@ -344,11 +323,7 @@ _e_pointer_free(E_Pointer *p)
 
    _e_pointer_canvas_del(p);
 
-   while (p->stack)
-     {
-	_e_pointer_stack_free(p->stack->data);
-	p->stack = eina_list_remove_list(p->stack, p->stack);
-     }
+   E_FREE_LIST(p->stack, _e_pointer_stack_free);
 
    if (p->type) eina_stringshare_del(p->type);
    if (p->idle_timer) ecore_timer_del(p->idle_timer);
@@ -357,7 +332,7 @@ _e_pointer_free(E_Pointer *p)
    p->type = NULL;
    p->idle_timer = NULL;
    p->idle_poller = NULL;
-   free(p);
+   E_FREE(p);
 }
 
 static void
@@ -367,11 +342,11 @@ _e_pointer_stack_free(E_Pointer_Stack *elem)
    free(elem);
 }
 
-static int
+static void 
 _e_pointer_type_set(E_Pointer *p, const char *type)
 {
    /* Check if this pointer is already set */
-   if ((p->type) && (!strcmp(p->type, type))) return 1;
+   if ((p->type) && (!strcmp(p->type, type))) return;
 
    if (p->type) eina_stringshare_del(p->type);
    p->type = eina_stringshare_add(type);
@@ -380,29 +355,24 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
    if (!e_config->show_cursor)
      {
 	ecore_x_window_cursor_set(p->win, 0);
-	return 1;
+	return;
      }
 
    if (p->e_cursor)
      {
-	Evas_Object *o;
 	char cursor[1024];
 	Evas_Coord x, y;
 
 	if (!p->evas) _e_pointer_canvas_add(p);
-	o = p->pointer_object;
 	if (p->color)
-	  {
-	     snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/color", type);
-	     if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor))
-	       goto fallback;
-	  }
+          snprintf(cursor, sizeof(cursor), 
+                   "e/pointer/enlightenment/%s/color", type);
 	else
-	  {
-	     snprintf(cursor, sizeof(cursor), "e/pointer/enlightenment/%s/mono", type);
-	     if (!e_theme_edje_object_set(o, "base/theme/pointer", cursor))
-	       goto fallback;
-	  }
+          snprintf(cursor, sizeof(cursor), 
+                   "e/pointer/enlightenment/%s/mono", type);
+        if (!e_theme_edje_object_set(p->pointer_object, 
+                                     "base/theme/pointer", cursor))
+          goto fallback;
 	edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", 
                                  p->hot_object);
 	edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", 
@@ -413,7 +383,7 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
 	     p->hot.y = y;
 	  }
 	p->hot.update = 1;
-	return 1;
+	return;
      }
    fallback:
      {
@@ -421,95 +391,42 @@ _e_pointer_type_set(E_Pointer *p, const char *type)
 
 	if (p->evas) _e_pointer_canvas_del(p);
 	if (!strcmp(type, "move"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_FLEUR);
 #if 0
 	else if (!strcmp(type, "resize"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_SIZING);
 #endif
 	else if (!strcmp(type, "resize_tl"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_LEFT_CORNER);
 	else if (!strcmp(type, "resize_t"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_SIDE);
 	else if (!strcmp(type, "resize_tr"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_TOP_RIGHT_CORNER);
 	else if (!strcmp(type, "resize_r"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_RIGHT_SIDE);
 	else if (!strcmp(type, "resize_br"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);
 	else if (!strcmp(type, "resize_b"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_SIDE);
 	else if (!strcmp(type, "resize_bl"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);
 	else if (!strcmp(type, "resize_l"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_SIDE);
 	else if (!strcmp(type, "entry"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_XTERM);
 	else if (!strcmp(type, "default"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_LEFT_PTR);
 	else if (!strcmp(type, "plus"))
-	  {
-	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
-	     if (!cursor) printf("X Cursor for %s is missing\n", type);
-	     ecore_x_window_cursor_set(p->win, cursor);
-	  }
+          cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_PLUS);
 	else
 	  {
 	     printf("Unknown pointer type: %s\n", type);
 	     cursor = ecore_x_cursor_shape_get(ECORE_X_CURSOR_ARROW);
-	     if (!cursor) printf("X Cursor for default is missing\n");
-	     ecore_x_window_cursor_set(p->win, cursor);
 	  }
+        if (!cursor) printf("X Cursor for %s is missing\n", type);
+        ecore_x_window_cursor_set(p->win, cursor);
 	if (cursor) ecore_x_cursor_free(cursor);
      }
-   return 1;
 }
 
 static void
@@ -534,7 +451,7 @@ _e_pointer_active_handle(E_Pointer *p)
 	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 */
+   /* and schedule a pre-idle check in 1 second if no more events happen */
    if (!e_config->idle_cursor) return;
    p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p);
 }
@@ -547,14 +464,14 @@ _e_pointer_cb_mouse_down(void *data, int type, void *event)
    E_Pointer *p;
 
    ev = event;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	p = l->data;
 	_e_pointer_active_handle(p);
 	if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
 	  {
 	     if (p->pointer_object)
-	       edje_object_signal_emit(p->pointer_object, "e,action,mouse,down", "e");
+	       edje_object_signal_emit(p->pointer_object, 
+                                       "e,action,mouse,down", "e");
 	  }
      }
    return 1;
@@ -568,14 +485,14 @@ _e_pointer_cb_mouse_up(void *data, int type, void *event)
    E_Pointer *p;
 
    ev = event;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	p = l->data;
 	_e_pointer_active_handle(p);
 	if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
 	  {
 	     if (p->pointer_object)
-	       edje_object_signal_emit(p->pointer_object, "e,action,mouse,up", "e");
+	       edje_object_signal_emit(p->pointer_object, 
+                                       "e,action,mouse,up", "e");
 	  }
      }
    return 1;
@@ -589,14 +506,14 @@ _e_pointer_cb_mouse_move(void *data, int type, void *event)
    E_Pointer *p;
 
    ev = event;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	p = l->data;
 	_e_pointer_active_handle(p);
 	if (e_powersave_mode_get() < E_POWERSAVE_MODE_HIGH)
 	  {
 	     if (p->pointer_object)
-	       edje_object_signal_emit(p->pointer_object, "e,action,mouse,move", "e");
+	       edje_object_signal_emit(p->pointer_object, 
+                                       "e,action,mouse,move", "e");
 	  }
      }
    return 1;
@@ -610,14 +527,14 @@ _e_pointer_cb_mouse_wheel(void *data, int type, void *event)
    E_Pointer *p;
 
    ev = event;
-   for (l = _e_pointers; l; l = l->next)
+   EINA_LIST_FOREACH(_e_pointers, l, p)
      {
-	p = l->data;
 	_e_pointer_active_handle(p);
 	if (e_powersave_mode_get() < E_POWERSAVE_MODE_EXTREME)
 	  {
 	     if (p->pointer_object)
-	       edje_object_signal_emit(p->pointer_object, "e,action,mouse,wheel", "e");
+	       edje_object_signal_emit(p->pointer_object, 
+                                       "e,action,mouse,wheel", "e");
 	  }
      }
    return 1;
@@ -683,7 +600,8 @@ _e_pointer_cb_idle_poller(void *data)
 	if (p->idle)
 	  {
 	     if (p->pointer_object)
-	       edje_object_signal_emit(p->pointer_object, "e,state,mouse,active", "e");
+	       edje_object_signal_emit(p->pointer_object, 
+                                       "e,state,mouse,active", "e");
 	     p->idle = 0;
 	  }
 	/* use poller to check from now on */
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index f9bbe91..ebb6774 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -5,9 +5,9 @@
 
 /* local subsystem functions */
 static void _e_popup_free(E_Popup *pop);
+static int  _e_popup_idle_enterer(void *data);
 static int  _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
-static E_Popup *_e_popup_find_by_window(Ecore_X_Window win);
-/*
+/*static E_Popup *_e_popup_find_by_window(Ecore_X_Window win);
 static int _e_popup_cb_mouse_down(void *data, int type, void *event);
 static int _e_popup_cb_mouse_up(void *data, int type, void *event);
 static int _e_popup_cb_mouse_wheel(void *data, int type, void *event);
@@ -93,8 +93,20 @@ e_popup_show(E_Popup *pop)
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (pop->visible) return;
    pop->visible = 1;
-   ecore_evas_show(pop->ecore_evas);
-   e_container_shape_show(pop->shape);
+   if (pop->shaped)
+     {
+        ecore_evas_move(pop->ecore_evas,
+                        pop->zone->container->manager->w,
+                        pop->zone->container->manager->h);
+        ecore_evas_show(pop->ecore_evas);
+        if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+        pop->idle_enterer = ecore_idle_enterer_add(_e_popup_idle_enterer, pop);
+     }
+   else
+     {
+        ecore_evas_show(pop->ecore_evas);
+        e_container_shape_show(pop->shape);
+     }
 }
 
 EAPI void
@@ -103,6 +115,8 @@ e_popup_hide(E_Popup *pop)
    E_OBJECT_CHECK(pop);
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (!pop->visible) return;
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    pop->visible = 0;
    ecore_evas_hide(pop->ecore_evas);
    e_container_shape_hide(pop->shape);
@@ -201,12 +215,10 @@ EAPI void
 e_popup_idler_before(void)
 {
    Eina_List *l;
+   E_Popup *pop;
    
-   for (l = _e_popup_list; l; l = l->next)
+   EINA_LIST_FOREACH(_e_popup_list, l, pop)
      {
-	E_Popup *pop;
-	
-	pop = l->data;
 	if (pop->need_shape_export)
 	  {
              Ecore_X_Rectangle *rects, *orects;
@@ -270,7 +282,8 @@ e_popup_idler_before(void)
 	       }
 	     pop->need_shape_export = 0;
 	  }
-	if (pop->visible)
+	if ((pop->visible) && (!pop->idle_enterer) &&
+	    (!pop->shaped && e_config->use_composite))
 	  e_container_shape_show(pop->shape);
      }
 }
@@ -280,6 +293,8 @@ e_popup_idler_before(void)
 static void
 _e_popup_free(E_Popup *pop)
 {
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    E_FREE(pop->shape_rects);
    pop->shape_rects_num = 0;
    e_container_shape_hide(pop->shape);
@@ -293,36 +308,51 @@ _e_popup_free(E_Popup *pop)
 }
 
 static int
+_e_popup_idle_enterer(void *data)
+{
+   E_Popup *pop;
+   
+   pop = (E_Popup *)data;
+   ecore_evas_move(pop->ecore_evas,
+		   pop->zone->x + pop->x, 
+		   pop->zone->y + pop->y);
+
+   if (!(pop->shaped && e_config->use_composite))
+     e_container_shape_show(pop->shape);
+   
+   pop->idle_enterer = NULL;
+   return 0;
+}
+
+static int
 _e_popup_cb_window_shape(void *data, int ev_type, void *ev)
 {
    Eina_List *l;
+   E_Popup *pop;
    Ecore_X_Event_Window_Shape *e;
    
    e = ev;
-   for (l = _e_popup_list; l; l = l->next)
+   EINA_LIST_FOREACH(_e_popup_list, l, pop)
      {
-	E_Popup *pop;
-	
-	pop = l->data;
 	if (pop->evas_win == e->win)
 	  pop->need_shape_export = 1;
      }
    return 1;
 }
 
-static E_Popup *
+/*static E_Popup *
 _e_popup_find_by_window(Ecore_X_Window win)
 {
    E_Popup *pop;
    Eina_List *l;
    
-   for (l = _e_popup_list; l; l = l->next)
+   EINA_LIST_FOREACH(_e_popup_list, l, pop)
      {
-	pop = l->data;
 	if (pop->evas_win == win) return pop;
      }
    return NULL;
 }
+*/
 /*
 static int
 _e_popup_cb_mouse_down(void *data, int type, void *event)
diff --git a/src/bin/e_popup.h b/src/bin/e_popup.h
index 0097a41..ad10ade 100644
--- a/src/bin/e_popup.h
+++ b/src/bin/e_popup.h
@@ -28,6 +28,7 @@ struct _E_Popup
    E_Zone              *zone;
    int                  shape_rects_num;
    Ecore_X_Rectangle   *shape_rects;
+   Ecore_Idle_Enterer  *idle_enterer;
 };
 
 EAPI int         e_popup_init(void);
diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c
index ecf4314..8da9a08 100644
--- a/src/bin/e_powersave.c
+++ b/src/bin/e_powersave.c
@@ -134,13 +134,11 @@ e_powersave_mode_get(void)
 static int
 _e_powersave_cb_deferred_timer(void *data)
 {
+   E_Powersave_Deferred_Action *pa;
+
    walking_deferred_actions++;
-   while (deferred_actions)
+   EINA_LIST_FREE(deferred_actions, pa)
      {
-	E_Powersave_Deferred_Action *pa;
-	
-	pa = deferred_actions->data;
-	deferred_actions = eina_list_remove_list(deferred_actions, deferred_actions);
 	if (!pa->delete_me) pa->func((void *)pa->data);
 	free(pa);
      }
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 258b310..8ffcb89 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -6,71 +6,193 @@
 #define REMEMBER_HIERARCHY 1
 #define REMEMBER_SIMPLE 0
 
+typedef struct _E_Remember_List E_Remember_List;
+
+
+struct _E_Remember_List
+{
+  Eina_List *list;
+};
+
 /* local subsystem functions */
 static void _e_remember_free(E_Remember *rem);
-static int _e_remember_sort_list(const void * d1, const void * d2);
+static void _e_remember_update(E_Border *bd, E_Remember *rem);
 static E_Remember  *_e_remember_find(E_Border *bd, int check_usable);
-
-/* FIXME: match netwm window type */
+static void _e_remember_cb_hook_pre_post_fetch(void *data, void *bd);
+static void _e_remember_cb_hook_eval_post_new_border(void *data, void *bd);
+static void _e_remember_init_edd(void);
+static int _e_remember_restore_cb(void *data, int type, void *event);
 
 /* local subsystem globals */
+static Eina_List *hooks = NULL;
+static E_Config_DD *e_remember_edd = NULL;
+static E_Config_DD *e_remember_list_edd = NULL;
+static E_Remember_List *remembers = NULL;
+static Eina_List *handlers = NULL;
+
+/* static Eina_List *e_remember_restart_list = NULL; */
+
 
 /* externally accessible functions */
 EAPI int
 e_remember_init(E_Startup_Mode mode)
 {
    Eina_List *l = NULL;
-   int not_updated = 0;
+   E_Remember *rem;
+   E_Border_Hook *h;
 
    if (mode == E_STARTUP_START)
      {
-	for (l = e_config->remembers; l; l = l->next)
+	EINA_LIST_FOREACH(e_config->remembers, l, rem)
 	  {
-	     E_Remember *rem;
-
-	     rem = l->data;
 	     if ((rem->apply & E_REMEMBER_APPLY_RUN) && (rem->prop.command))
 	       e_util_head_exec(rem->prop.head, rem->prop.command);
 	  }
      }
 
-#if 1
-   for (l = e_config->remembers; l; l = l->next)
-     {
-        E_Remember *rem;
+   h = e_border_hook_add(E_BORDER_HOOK_EVAL_PRE_POST_FETCH,
+			 _e_remember_cb_hook_pre_post_fetch, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
+   h = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_NEW_BORDER,
+			 _e_remember_cb_hook_eval_post_new_border, NULL);
+   if (h) hooks = eina_list_append(hooks, h);
 
-        rem = l->data;
-	/* Code to bring up old configs to scratch. Can be removed
-	 * after X amount of time, where X is a figure that will be
-	 * decided by whoever remembers to take this out. */
-	if (!rem->max_score)
-	  {
-	     int max_count = 0;
-	     if (rem->match & E_REMEMBER_MATCH_NAME) max_count += 2;
-	     if (rem->match & E_REMEMBER_MATCH_CLASS) max_count += 2;
-	     if (rem->match & E_REMEMBER_MATCH_TITLE) max_count += 2;
-	     if (rem->match & E_REMEMBER_MATCH_ROLE) max_count += 2;
-	     if (rem->match & E_REMEMBER_MATCH_TYPE) max_count += 2;
-	     if (rem->match & E_REMEMBER_MATCH_TRANSIENT) max_count +=2;
-	     if (rem->apply_first_only) max_count++;
-	     rem->max_score = max_count;
-	     not_updated = 1;
-	  }
-     }
+   _e_remember_init_edd();
+   remembers = e_config_domain_load("e_remember_restart", e_remember_list_edd);
 
-   if (not_updated)
-     e_config->remembers = eina_list_sort(e_config->remembers, -1, 
-                                          _e_remember_sort_list);
-#endif
+   if (remembers)
+     {
+	handlers = eina_list_append
+	  (handlers, ecore_event_handler_add
+	   (E_EVENT_MODULE_INIT_END, _e_remember_restore_cb, NULL)); 
+     }
+   
    return 1;
 }
 
 EAPI int
 e_remember_shutdown(void)
 {
+   E_Border_Hook *h;
+   Ecore_Event_Handler *hh;
+   
+   EINA_LIST_FREE(hooks, h)
+     e_border_hook_del(h);
+
+   E_CONFIG_DD_FREE(e_remember_edd);
+   E_CONFIG_DD_FREE(e_remember_list_edd);
+
+   EINA_LIST_FREE(handlers, hh)
+     ecore_event_handler_del(hh);
+   
    return 1;
 }
 
+EAPI void
+e_remember_internal_save(void)
+{
+   Eina_List *l;
+   E_Border *bd;
+   E_Remember *rem;
+
+   //printf("internal save %d\n", restart);
+   if (!remembers)
+     remembers = E_NEW(E_Remember_List, 1);
+   else
+     {
+	EINA_LIST_FREE(remembers->list, rem)
+	  _e_remember_free(rem);
+     }
+   
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+	if (!bd->internal) continue;
+
+	rem = E_NEW(E_Remember, 1);
+	if (!rem) break;
+
+	e_remember_default_match_set(rem, bd);
+	rem->apply = (E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE |
+		      E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_LAYER |
+		      E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE |
+		      E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_LOCKS |
+		      E_REMEMBER_APPLY_SKIP_WINLIST |	  
+		      E_REMEMBER_APPLY_SKIP_PAGER |
+		      E_REMEMBER_APPLY_SKIP_TASKBAR);
+	_e_remember_update(bd, rem);
+
+	remembers->list = eina_list_append(remembers->list, rem);
+     }
+
+   e_config_domain_save("e_remember_restart", e_remember_list_edd, remembers);
+}
+
+static int
+_e_remember_restore_cb(void *data, int type, void *event)
+{
+   E_Remember *rem;
+   Eina_List *l;
+   E_Action *act_fm, *act;
+   E_Container *con;
+
+   act_fm = e_action_find("fileman"); 
+
+   con = e_container_current_get(e_manager_current_get());
+   
+   EINA_LIST_FOREACH(remembers->list, l, rem)
+     {
+	if (!rem->class) continue;
+
+	if (!strncmp(rem->class, "e_fwin::", 8))
+	  {
+	     if (!act_fm)
+	       continue;
+	     /* at least '/' */
+	     if (!(rem->class + 9))
+	       continue;
+
+	     act_fm->func.go(NULL, rem->class + 8);
+	  }
+	else if (!strncmp(rem->class, "_config::", 9))
+	  {
+	     char *param = NULL;
+	     char path[1024];
+	     const char *p;
+	     
+	     p = rem->class + 9;
+
+	     if ((param = strstr(p, "::")))
+	       {
+		  snprintf(path, (param - p) + sizeof(char), "%s", p);
+		  param = param + 2;
+	       }
+	     else
+	       snprintf(path, sizeof(path), "%s", p);
+	     
+	     if (e_configure_registry_exists(path))
+	       {
+		  e_configure_registry_call(path, con, param);
+	       }
+	  }
+	else if (!strcmp(rem->class, "_configure"))
+	  {
+	     /* TODO this is just for settings panel. it could also
+		use e_configure_registry_item_add */
+	     /* ..or make a general path for window that are started
+		by actions */
+
+	     act = e_action_find("configuration");
+	     if (act)
+	       act->func.go(NULL, NULL);
+	  }
+     }
+
+   if (handlers) eina_list_free(handlers);
+   handlers = NULL;
+   
+   return 0;
+}
+
 EAPI E_Remember *
 e_remember_new(void)
 {
@@ -99,33 +221,23 @@ EAPI void
 e_remember_unuse(E_Remember *rem)
 {
    rem->used_count--;
-   if ((rem->used_count == 0) && (rem->delete_me))
-     _e_remember_free(rem);
 }
 
 EAPI void
 e_remember_del(E_Remember *rem)
 {
-   if (rem->delete_me) return;
-   if (rem->used_count != 0)
-     {
-	Eina_List *l = NULL;
+   Eina_List *l = NULL;
+   E_Border *bd;
 
-	rem->delete_me = 1;
-	for (l = e_border_client_list(); l; l = l->next)
-	  {
-	     E_Border *bd;
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
+     {
+	if (bd->remember != rem) continue;
 
-	     bd = l->data;
-	     if (bd->remember == rem)
-	       {
-		  bd->remember = NULL;
-		  e_remember_unuse(rem);
-	       }
-	  }
-	return;
+	bd->remember = NULL;
+	e_remember_unuse(rem);
      }
-   _e_remember_free(rem);
+
+   _e_remember_free(rem); 
 }
 
 EAPI E_Remember *
@@ -165,14 +277,13 @@ e_remember_match_update(E_Remember *rem)
 	 * need to remove from list and insert back into the appropriate
 	 * loction. */
 	Eina_List *l = NULL;
-	E_Remember *r; 
+	E_Remember *r;
 
 	rem->max_score = max_count;
 	e_config->remembers = eina_list_remove(e_config->remembers, rem);
 
-	for (l = e_config->remembers; l; l = l->next)
+	EINA_LIST_FOREACH(e_config->remembers, l, r)
 	  {
-	     r = l->data;
 	     if (r->max_score <= rem->max_score) break;
 	  }
 
@@ -184,179 +295,153 @@ e_remember_match_update(E_Remember *rem)
 }
 
 EAPI int
-e_remember_default_match(E_Border *bd)
+e_remember_default_match_set(E_Remember *rem, E_Border *bd)
 {
-   int match = E_REMEMBER_MATCH_TRANSIENT;
-   if ((bd->client.icccm.name) &&
-	 (bd->client.icccm.class) &&
-	 (bd->client.icccm.name[0] != 0) &&
-	 (bd->client.icccm.class[0] != 0))
-     match |= E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS;
-   else
-     if ((e_border_name_get(bd))[0] != 0)
-       match |= E_REMEMBER_MATCH_TITLE;
-
-   if ((bd->client.icccm.window_role) && 
-	 (bd->client.icccm.window_role[0] != 0))
-     match |= E_REMEMBER_MATCH_ROLE;
-
-   if (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_UNKNOWN)
-     match |= E_REMEMBER_MATCH_TYPE;
-
-   return match;
-}
-
-EAPI void
-e_remember_update(E_Remember *rem, E_Border *bd)
-{
-   if (!rem) return;
-   if (bd->new_client) return;
+   const char *title, *clasz, *name, *role;
+   
    if (rem->name) eina_stringshare_del(rem->name);
    if (rem->class) eina_stringshare_del(rem->class);
    if (rem->title) eina_stringshare_del(rem->title);
    if (rem->role) eina_stringshare_del(rem->role);
-   if (rem->prop.border) eina_stringshare_del(rem->prop.border);
-   if (rem->prop.command) eina_stringshare_del(rem->prop.command);
    rem->name = NULL;
    rem->class = NULL;
    rem->title = NULL;
    rem->role = NULL;
-   rem->prop.border = NULL;
-   rem->prop.command = NULL;
-
-   if (bd->client.icccm.name)
-     rem->name = eina_stringshare_add(bd->client.icccm.name);
-   if (bd->client.icccm.class)
-     rem->class = eina_stringshare_add(bd->client.icccm.class);
-   if (bd->client.netwm.name)
-     rem->title = eina_stringshare_add(bd->client.netwm.name);
-   else if (bd->client.icccm.title)
-     rem->title = eina_stringshare_add(bd->client.icccm.title);
-   if (bd->client.icccm.window_role)
-     rem->role = eina_stringshare_add(bd->client.icccm.window_role);
-
-   e_remember_match_update(rem);
-
-   rem->type = bd->client.netwm.type;
 
+   name = bd->client.icccm.name;
+   if (!name || name[0] == 0) name = NULL;
+   clasz = bd->client.icccm.class;
+   if (!clasz || clasz[0] == 0) clasz = NULL;
+   role = bd->client.icccm.window_role;
+   if (!role || role[0] == 0) role = NULL;
+   
+   int match = E_REMEMBER_MATCH_TRANSIENT;
    if (bd->client.icccm.transient_for != 0)
      rem->transient = 1;
    else
      rem->transient = 0;
 
-   if (bd->fullscreen)
+   if (name && clasz)
      {
-	rem->prop.fullscreen = bd->fullscreen;
-	rem->prop.pos_x = bd->saved.x;
-	rem->prop.pos_y = bd->saved.y;
-	rem->prop.pos_w = bd->saved.w;
-	rem->prop.pos_h = bd->saved.h;
-	rem->prop.layer = bd->saved.layer;
+	match |= E_REMEMBER_MATCH_NAME | E_REMEMBER_MATCH_CLASS;
+	rem->name = eina_stringshare_add(name);
+	rem->class = eina_stringshare_add(clasz);
      }
-   else
+   else if ((title = e_border_name_get(bd)) && title[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;
-
-	if (bd->bordername)
-	  rem->prop.border = eina_stringshare_add(bd->bordername);
-
-	rem->prop.fullscreen = bd->fullscreen;
+	match |= E_REMEMBER_MATCH_TITLE;
+	rem->title = eina_stringshare_add(title);
+     }   
+   if (role)
+     {
+	match |= E_REMEMBER_MATCH_ROLE;
+	rem->role = eina_stringshare_add(role);
+     }
+   if (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_UNKNOWN)
+     {
+	match |= E_REMEMBER_MATCH_TYPE;
+	rem->type = bd->client.netwm.type;
      }
 
-   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;
-   rem->prop.lock_client_size = bd->lock_client_size;
-   rem->prop.lock_user_stacking = bd->lock_user_stacking;
-   rem->prop.lock_client_stacking = bd->lock_client_stacking;
-   rem->prop.lock_user_iconify = bd->lock_user_iconify;
-   rem->prop.lock_client_iconify = bd->lock_client_iconify;
-   rem->prop.lock_user_desk = bd->lock_user_desk;
-   rem->prop.lock_client_desk = bd->lock_client_desk;
-   rem->prop.lock_user_sticky = bd->lock_user_sticky;
-   rem->prop.lock_client_sticky = bd->lock_client_sticky;
-   rem->prop.lock_user_shade = bd->lock_user_shade;
-   rem->prop.lock_client_shade = bd->lock_client_shade;
-   rem->prop.lock_user_maximize = bd->lock_user_maximize;
-   rem->prop.lock_client_maximize = bd->lock_client_maximize;
-   rem->prop.lock_user_fullscreen = bd->lock_user_fullscreen;
-   rem->prop.lock_client_fullscreen = bd->lock_client_fullscreen;
-   rem->prop.lock_border = bd->lock_border;
-   rem->prop.lock_close = bd->lock_close;
-   rem->prop.lock_focus_in = bd->lock_focus_in;
-   rem->prop.lock_focus_out = bd->lock_focus_out;
-   rem->prop.lock_life = bd->lock_life;
-
-   rem->prop.sticky = bd->sticky;
-
-   if (bd->shaded)
-     rem->prop.shaded = (100 + bd->shade.dir);
-   else
-     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->match = match;
+   
+   return match;
+}
 
-   rem->prop.zone = bd->zone->num;
-   rem->prop.head = bd->zone->container->manager->num;
+EAPI void
+e_remember_update(E_Border *bd)
+{
+   if (bd->new_client) return;
+   if (!bd->remember) return;
+   if (bd->remember->keep_settings) return;
+   _e_remember_update(bd, bd->remember);
+   e_config_save_queue();   
+}
 
-   if ((bd->client.icccm.command.argc > 0) &&
-       (bd->client.icccm.command.argv))
+static void
+_e_remember_update(E_Border *bd, E_Remember *rem)
+{
+   if (rem->apply & E_REMEMBER_APPLY_POS ||
+       rem->apply & E_REMEMBER_APPLY_SIZE)
      {
-	char buf[4096];
-	int i, j, k;
-
-	buf[0] = 0;
-	k = 0;
-	for (i = 0; i < bd->client.icccm.command.argc; i++)
+	if (bd->fullscreen)
 	  {
-	     if (i > 0)
-	       {
-		  buf[k] = ' ';
-		  k++;
-	       }
-	     for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
-	       {
-		  if (k >= (sizeof(buf) - 10))
-		    {
-		       buf[k] = 0;
-		       goto done;
-		    }
-		  if ((bd->client.icccm.command.argv[i][j] == ' ') ||
-		      (bd->client.icccm.command.argv[i][j] == '\t') ||
-		      (bd->client.icccm.command.argv[i][j] == '\\') ||
-		      (bd->client.icccm.command.argv[i][j] == '\"') ||
-		      (bd->client.icccm.command.argv[i][j] == '\'') ||
-		      (bd->client.icccm.command.argv[i][j] == '$') ||
-		      (bd->client.icccm.command.argv[i][j] == '%'))
-		    {
-		       buf[k] = '\\';
-		       k++;
-		    }
-		  buf[k] = bd->client.icccm.command.argv[i][j];
-		  k++;
-	       }
+	     rem->prop.pos_x = bd->saved.x;
+	     rem->prop.pos_y = bd->saved.y;
+	     rem->prop.pos_w = bd->saved.w;
+	     rem->prop.pos_h = bd->saved.h;
+	  }
+	else
+	  {
+	     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;
 	  }
-	buf[k] = 0;
-	done:
-	rem->prop.command = eina_stringshare_add(buf);
      }
-
-   e_config_save_queue();
+   if (rem->apply & E_REMEMBER_APPLY_LAYER)
+     {
+	if (bd->fullscreen)
+	  rem->prop.layer = bd->saved.layer;
+	else
+	  rem->prop.layer = bd->layer;
+     }   
+   if (rem->apply & E_REMEMBER_APPLY_LOCKS)
+     {
+	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;
+	rem->prop.lock_client_size     = bd->lock_client_size;
+	rem->prop.lock_user_stacking   = bd->lock_user_stacking;
+	rem->prop.lock_client_stacking = bd->lock_client_stacking;
+	rem->prop.lock_user_iconify    = bd->lock_user_iconify;
+	rem->prop.lock_client_iconify  = bd->lock_client_iconify;
+	rem->prop.lock_user_desk       = bd->lock_user_desk;
+	rem->prop.lock_client_desk     = bd->lock_client_desk;
+	rem->prop.lock_user_sticky     = bd->lock_user_sticky;
+	rem->prop.lock_client_sticky   = bd->lock_client_sticky;
+	rem->prop.lock_user_shade      = bd->lock_user_shade;
+	rem->prop.lock_client_shade    = bd->lock_client_shade;
+	rem->prop.lock_user_maximize   = bd->lock_user_maximize;
+	rem->prop.lock_client_maximize = bd->lock_client_maximize;
+	rem->prop.lock_user_fullscreen = bd->lock_user_fullscreen;
+	rem->prop.lock_client_fullscreen = bd->lock_client_fullscreen;
+	rem->prop.lock_border          = bd->lock_border;
+	rem->prop.lock_close           = bd->lock_close;
+	rem->prop.lock_focus_in        = bd->lock_focus_in;
+	rem->prop.lock_focus_out       = bd->lock_focus_out;
+	rem->prop.lock_life            = bd->lock_life;
+     }
+   if (rem->apply & E_REMEMBER_APPLY_SHADE)
+     {
+	if (bd->shaded)
+	  rem->prop.shaded = (100 + bd->shade.dir);
+	else
+	  rem->prop.shaded = (50 + bd->shade.dir);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_ZONE)
+     {
+	rem->prop.zone = bd->zone->num;
+	rem->prop.head = bd->zone->container->manager->num;
+     }   
+   if (rem->apply & E_REMEMBER_APPLY_SKIP_WINLIST)
+     rem->prop.skip_winlist = bd->user_skip_winlist;
+   if (rem->apply & E_REMEMBER_APPLY_STICKY)
+     rem->prop.sticky = bd->sticky;
+   if (rem->apply & E_REMEMBER_APPLY_SKIP_PAGER)
+     rem->prop.skip_pager   = bd->client.netwm.state.skip_pager;
+   if (rem->apply & E_REMEMBER_APPLY_SKIP_TASKBAR)
+     rem->prop.skip_taskbar = bd->client.netwm.state.skip_taskbar;
+   if (rem->apply & E_REMEMBER_APPLY_ICON_PREF)
+     rem->prop.icon_preference = bd->icon_preference;
+   if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
+     e_desk_xy_get(bd->desk, &rem->prop.desk_x, &rem->prop.desk_y);
+   if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
+     rem->prop.fullscreen = bd->fullscreen;   
 }
 
 /* local subsystem functions */
@@ -364,16 +449,15 @@ static E_Remember *
 _e_remember_find(E_Border *bd, int check_usable)
 {
    Eina_List *l = NULL;
+   E_Remember *rem;
 
 #if REMEMBER_SIMPLE
-   for (l = e_config->remembers; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->remembers, l, rem)
      {
-	E_Remember *rem;
 	int required_matches;
 	int matches;
 	const char *title = "";
 
-	rem = l->data;
 	matches = 0;
 	required_matches = 0;
 	if (rem->match & E_REMEMBER_MATCH_NAME) required_matches++;
@@ -409,7 +493,7 @@ _e_remember_find(E_Border *bd, int check_usable)
 	    (((rem->transient) && (bd->client.icccm.transient_for != 0)) ||
 	     ((!rem->transient) && (bd->client.icccm.transient_for == 0))))
 	  matches++;
-	 if ((matches >= required_matches) && (!rem->delete_me))
+	 if (matches >= required_matches)
 	  return rem;
      }
    return NULL;
@@ -420,12 +504,10 @@ _e_remember_find(E_Border *bd, int check_usable)
     * with the most possible matches at the start of the list. This
     * means, as soon as a valid match is found, it is a match
     * within the set of best possible matches. */
-   for (l = e_config->remembers; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->remembers, l, rem)
      {
-        E_Remember *rem;
         const char *title = "";
 
-        rem = l->data;
         if ((check_usable) && (!e_remember_usable_get(rem)))
           continue;
 
@@ -436,16 +518,13 @@ _e_remember_find(E_Border *bd, int check_usable)
          * 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))
+	    !e_util_glob_match(bd->client.icccm.name, rem->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))
+	    !e_util_glob_match(bd->client.icccm.class, rem->class))
           continue;
         if (rem->match & E_REMEMBER_MATCH_TITLE &&
-            e_util_strcmp(rem->title, title) &&
-            !e_util_both_str_empty(rem->title, title))
+	    !e_util_glob_match(title, rem->title))
           continue;
         if (rem->match & E_REMEMBER_MATCH_ROLE &&
             e_util_strcmp(rem->role, bd->client.icccm.window_role) &&
@@ -476,18 +555,390 @@ _e_remember_free(E_Remember *rem)
    if (rem->role) eina_stringshare_del(rem->role);
    if (rem->prop.border) eina_stringshare_del(rem->prop.border);
    if (rem->prop.command) eina_stringshare_del(rem->prop.command);
+   if (rem->prop.desktop_file) eina_stringshare_del(rem->prop.desktop_file);
    free(rem);
 }
 
-static int 
-_e_remember_sort_list(const void * d1, const void * d2)
+static void
+_e_remember_cb_hook_eval_post_new_border(void *data, void *border)
 {
-   const E_Remember *r1, *r2;
+   E_Border *bd = border;
 
-   r1 = d1;
-   r2 = d2;
-   if (r1->max_score >= r2->max_score)
-     return -1;
-   else
-     return 1;
+   // remember only when window was modified
+   // if (!bd->new_client) return;
+
+   if ((bd->internal) && (!bd->remember) &&
+       (e_config->remember_internal_windows) &&
+       (!bd->internal_no_remember) &&
+       (bd->client.icccm.class && bd->client.icccm.class[0]))
+     {
+	E_Remember *rem;
+	
+	if (!strncmp(bd->client.icccm.class, "e_fwin", 6))
+	  {
+	     if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS))
+	       return;
+	  }
+	else 
+	  {
+	     if (!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS))
+	       return;
+	  }
+
+	rem = e_remember_new();
+	if (!rem) return;
+
+	e_remember_default_match_set(rem, bd);
+	
+	rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_BORDER;
+
+	e_remember_use(rem);
+	e_remember_update(bd);
+	bd->remember = rem;
+     }
+}
+
+static void
+_e_remember_cb_hook_pre_post_fetch(void *data, void *border)
+{
+   E_Border *bd = border;
+   E_Remember *rem = NULL;
+   int temporary = 0;
+   
+   if (!bd->new_client) return;
+
+   if (!bd->remember)
+     {
+	rem = e_remember_find_usable(bd);
+	if (rem)
+	  {
+	     bd->remember = rem;
+	     e_remember_use(rem);
+	  }
+     }
+   
+   if (bd->internal && remembers && bd->client.icccm.class && bd->client.icccm.class[0])
+     {
+	Eina_List *l;
+	EINA_LIST_FOREACH(remembers->list, l, rem)
+	  {
+	     if (rem->class && !strcmp(rem->class, bd->client.icccm.class))
+		 break;
+	  }
+	if (rem)
+	  {
+	     temporary = 1;
+	     remembers->list = eina_list_remove(remembers->list, rem);
+	     if (!remembers->list)
+	       e_config_domain_save("e_remember_restart",
+				    e_remember_list_edd, remembers);
+	  }
+	else rem = bd->remember;
+     }
+   
+   if (!rem)
+     return;
+
+   if (rem->apply & E_REMEMBER_APPLY_ZONE)
+     {
+	E_Zone *zone;
+
+	zone = e_container_zone_number_get(bd->zone->container, rem->prop.zone);
+	if (zone)
+	  e_border_zone_set(bd, zone);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_DESKTOP)
+     {
+	E_Desk *desk;
+
+	desk = e_desk_at_xy_get(bd->zone, rem->prop.desk_x, rem->prop.desk_y);
+	if (desk)
+	  {
+	     e_border_desk_set(bd, desk);
+	     if (e_config->desk_auto_switch)
+	       e_desk_show(desk);
+	  }
+     }
+   if (rem->apply & E_REMEMBER_APPLY_SIZE)
+     {
+	bd->client.w = rem->prop.w;
+	bd->client.h = rem->prop.h;
+	/* we can trust internal windows */
+	if (bd->internal)
+	  {
+	     if (bd->zone->w != rem->prop.res_x)
+	       {
+		  if (bd->client.w > (bd->zone->w - 64))
+		    bd->client.w = bd->zone->w - 64;
+	       }
+	     if (bd->zone->h != rem->prop.res_y)
+	       {
+		  if (bd->client.h > (bd->zone->h - 64))
+		    bd->client.h = bd->zone->h - 64;
+	       }
+	     if (bd->client.icccm.min_w > bd->client.w)
+	       bd->client.w = bd->client.icccm.min_w;
+	     if (bd->client.icccm.max_w < bd->client.w)
+	       bd->client.w = bd->client.icccm.max_w;
+	     if (bd->client.icccm.min_h > bd->client.h)
+	       bd->client.h = bd->client.icccm.min_h;
+	     if (bd->client.icccm.max_h < bd->client.h)
+	       bd->client.h = bd->client.icccm.max_h;
+	  }
+	bd->w = bd->client.w + bd->client_inset.l + bd->client_inset.r;
+	bd->h = bd->client.h + bd->client_inset.t + bd->client_inset.b;
+	bd->changes.size = 1;
+	bd->changes.shape = 1;
+     }
+   if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage))
+     {
+	bd->x = rem->prop.pos_x;
+	bd->y = rem->prop.pos_y;
+	if (bd->zone->w != rem->prop.res_x)
+	  {
+	     int px;
+
+	     px = bd->x + (bd->w / 2);
+	     if (px < ((rem->prop.res_x * 1) / 3))
+	       {
+		  if (bd->zone->w >= (rem->prop.res_x / 3))
+		    bd->x = rem->prop.pos_x;
+		  else
+		    bd->x = ((rem->prop.pos_x - 0) * bd->zone->w) /
+		      (rem->prop.res_x / 3);
+	       }
+	     else if (px < ((rem->prop.res_x * 2) / 3))
+	       {
+		  if (bd->zone->w >= (rem->prop.res_x / 3))
+		    bd->x = (bd->zone->w / 2) +
+		      (px - (rem->prop.res_x / 2)) -
+		      (bd->w / 2);
+		  else
+		    bd->x = (bd->zone->w / 2) +
+		      (((px - (rem->prop.res_x / 2)) * bd->zone->w) /
+		       (rem->prop.res_x / 3)) -
+		      (bd->w / 2);
+	       }
+	     else
+	       {
+		  if (bd->zone->w >= (rem->prop.res_x / 3))
+		    bd->x = bd->zone->w +
+		      rem->prop.pos_x - rem->prop.res_x +
+		      (rem->prop.w - bd->client.w);
+		  else
+		    bd->x = bd->zone->w +
+		      (((rem->prop.pos_x - rem->prop.res_x) * bd->zone->w) /
+		       (rem->prop.res_x / 3)) +
+		      (rem->prop.w - bd->client.w);
+	       }
+	     if ((rem->prop.pos_x >= 0) && (bd->x < 0))
+	       bd->x = 0;
+	     else if (((rem->prop.pos_x + rem->prop.w) < rem->prop.res_x) &&
+		      ((bd->x + bd->w) > bd->zone->w))
+	       bd->x = bd->zone->w - bd->w;
+	  }
+	if (bd->zone->h != rem->prop.res_y)
+	  {
+	     int py;
+
+	     py = bd->y + (bd->h / 2);
+	     if (py < ((rem->prop.res_y * 1) / 3))
+	       {
+		  if (bd->zone->h >= (rem->prop.res_y / 3))
+		    bd->y = rem->prop.pos_y;
+		  else
+		    bd->y = ((rem->prop.pos_y - 0) * bd->zone->h) /
+		      (rem->prop.res_y / 3);
+	       }
+	     else if (py < ((rem->prop.res_y * 2) / 3))
+	       {
+		  if (bd->zone->h >= (rem->prop.res_y / 3))
+		    bd->y = (bd->zone->h / 2) +
+		      (py - (rem->prop.res_y / 2)) -
+		      (bd->h / 2);
+		  else
+		    bd->y = (bd->zone->h / 2) +
+		      (((py - (rem->prop.res_y / 2)) * bd->zone->h) /
+		       (rem->prop.res_y / 3)) -
+		      (bd->h / 2);
+	       }
+	     else
+	       {
+		  if (bd->zone->h >= (rem->prop.res_y / 3))
+		    bd->y = bd->zone->h +
+		      rem->prop.pos_y - rem->prop.res_y +
+		      (rem->prop.h - bd->client.h);
+		  else
+		    bd->y = bd->zone->h +
+		      (((rem->prop.pos_y - rem->prop.res_y) * bd->zone->h) /
+		       (rem->prop.res_y / 3)) +
+		      (rem->prop.h - bd->client.h);
+	       }
+	     if ((rem->prop.pos_y >= 0) && (bd->y < 0))
+	       bd->y = 0;
+	     else if (((rem->prop.pos_y + rem->prop.h) < rem->prop.res_y) &&
+		      ((bd->y + bd->h) > bd->zone->h))
+	       bd->y = bd->zone->h - bd->h;
+	  }
+	//		  if (bd->zone->w != rem->prop.res_x)
+	//		    bd->x = (rem->prop.pos_x * bd->zone->w) / rem->prop.res_x;
+	//		  if (bd->zone->h != rem->prop.res_y)
+	//		    bd->y = (rem->prop.pos_y * bd->zone->h) / rem->prop.res_y;
+	bd->x += bd->zone->x;
+	bd->y += bd->zone->y;
+	bd->placed = 1;
+	bd->changes.pos = 1;
+     }
+   if (rem->apply & E_REMEMBER_APPLY_LAYER)
+     {
+	bd->layer = rem->prop.layer;
+	if (bd->layer == 100)
+	  e_hints_window_stacking_set(bd, E_STACKING_NONE);
+	else if (bd->layer == 150)
+	  e_hints_window_stacking_set(bd, E_STACKING_ABOVE);
+	e_container_border_raise(bd);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_BORDER)
+     {
+	if (rem->prop.border)
+	  {
+	     if (bd->bordername) eina_stringshare_del(bd->bordername);
+	     if (rem->prop.border) bd->bordername = eina_stringshare_add(rem->prop.border);
+	     else bd->bordername = NULL;
+	     bd->client.border.changed = 1;
+	  }
+     }
+   if (rem->apply & E_REMEMBER_APPLY_FULLSCREEN)
+     {
+	if (rem->prop.fullscreen)
+	  e_border_fullscreen(bd, e_config->fullscreen_policy);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_STICKY)
+     {
+	if (rem->prop.sticky) e_border_stick(bd);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_SHADE)
+     {
+	if (rem->prop.shaded >= 100)
+	  e_border_shade(bd, rem->prop.shaded - 100);
+	else if (rem->prop.shaded >= 50)
+	  e_border_unshade(bd, rem->prop.shaded - 50);
+     }
+   if (rem->apply & E_REMEMBER_APPLY_LOCKS)
+     {
+	bd->lock_user_location = rem->prop.lock_user_location;
+	bd->lock_client_location = rem->prop.lock_client_location;
+	bd->lock_user_size = rem->prop.lock_user_size;
+	bd->lock_client_size = rem->prop.lock_client_size;
+	bd->lock_user_stacking = rem->prop.lock_user_stacking;
+	bd->lock_client_stacking = rem->prop.lock_client_stacking;
+	bd->lock_user_iconify = rem->prop.lock_user_iconify;
+	bd->lock_client_iconify = rem->prop.lock_client_iconify;
+	bd->lock_user_desk = rem->prop.lock_user_desk;
+	bd->lock_client_desk = rem->prop.lock_client_desk;
+	bd->lock_user_sticky = rem->prop.lock_user_sticky;
+	bd->lock_client_sticky = rem->prop.lock_client_sticky;
+	bd->lock_user_shade = rem->prop.lock_user_shade;
+	bd->lock_client_shade = rem->prop.lock_client_shade;
+	bd->lock_user_maximize = rem->prop.lock_user_maximize;
+	bd->lock_client_maximize = rem->prop.lock_client_maximize;
+	bd->lock_user_fullscreen = rem->prop.lock_user_fullscreen;
+	bd->lock_client_fullscreen = rem->prop.lock_client_fullscreen;
+	bd->lock_border = rem->prop.lock_border;
+	bd->lock_close = rem->prop.lock_close;
+	bd->lock_focus_in = rem->prop.lock_focus_in;
+	bd->lock_focus_out = rem->prop.lock_focus_out;
+	bd->lock_life = rem->prop.lock_life;
+     }
+   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)
+     bd->want_focus = 1;
+
+   if (temporary)
+     _e_remember_free(rem);
+}
+
+
+static void
+_e_remember_init_edd(void)
+{
+   e_remember_edd = E_CONFIG_DD_NEW("E_Remember", E_Remember);
+#undef T
+#undef D
+#define T E_Remember
+#define D e_remember_edd
+   E_CONFIG_VAL(D, T, match, INT);
+   E_CONFIG_VAL(D, T, apply_first_only, UCHAR);
+   E_CONFIG_VAL(D, T, keep_settings, UCHAR);
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, class, STR);
+   E_CONFIG_VAL(D, T, title, STR);
+   E_CONFIG_VAL(D, T, role, STR);
+   E_CONFIG_VAL(D, T, type, INT);
+   E_CONFIG_VAL(D, T, transient, UCHAR);
+   E_CONFIG_VAL(D, T, apply, INT);
+   E_CONFIG_VAL(D, T, max_score, INT);
+   E_CONFIG_VAL(D, T, prop.pos_x, INT);
+   E_CONFIG_VAL(D, T, prop.pos_y, INT);
+   E_CONFIG_VAL(D, T, prop.res_x, INT);
+   E_CONFIG_VAL(D, T, prop.res_y, INT);
+   E_CONFIG_VAL(D, T, prop.pos_w, INT);
+   E_CONFIG_VAL(D, T, prop.pos_h, INT);
+   E_CONFIG_VAL(D, T, prop.w, INT);
+   E_CONFIG_VAL(D, T, prop.h, INT);
+   E_CONFIG_VAL(D, T, prop.layer, INT);
+   E_CONFIG_VAL(D, T, prop.lock_user_location, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_location, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_size, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_size, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_stacking, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_stacking, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_iconify, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_iconify, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_desk, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_desk, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_sticky, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_sticky, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_shade, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_shade, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_maximize, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_maximize, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_user_fullscreen, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_client_fullscreen, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_border, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_close, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_focus_in, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_focus_out, UCHAR);
+   E_CONFIG_VAL(D, T, prop.lock_life, UCHAR);
+   E_CONFIG_VAL(D, T, prop.border, STR);
+   E_CONFIG_VAL(D, T, prop.sticky, UCHAR);
+   E_CONFIG_VAL(D, T, prop.shaded, UCHAR);
+   E_CONFIG_VAL(D, T, prop.skip_winlist, UCHAR);
+   E_CONFIG_VAL(D, T, prop.skip_pager, UCHAR);
+   E_CONFIG_VAL(D, T, prop.skip_taskbar, UCHAR);
+   E_CONFIG_VAL(D, T, prop.fullscreen, UCHAR);
+   E_CONFIG_VAL(D, T, prop.desk_x, INT);
+   E_CONFIG_VAL(D, T, prop.desk_y, INT);
+   E_CONFIG_VAL(D, T, prop.zone, INT);
+   E_CONFIG_VAL(D, T, prop.head, INT);
+   E_CONFIG_VAL(D, T, prop.command, STR);
+   E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
+   E_CONFIG_VAL(D, T, prop.desktop_file, STR);
+#undef T
+#undef D
+   e_remember_list_edd = E_CONFIG_DD_NEW("E_Remember_List", E_Remember_List);
+#undef T
+#undef D
+#define T E_Remember_List
+#define D e_remember_list_edd
+   E_CONFIG_LIST(D, T, list, e_remember_edd);
+#undef T
+#undef D
 }
diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h
index 404fb2c..12d8de4 100644
--- a/src/bin/e_remember.h
+++ b/src/bin/e_remember.h
@@ -29,15 +29,18 @@ typedef struct _E_Remember E_Remember;
 #define E_REMEMBER_SET_FOCUS_ON_START (1 << 14)
 #define E_REMEMBER_APPLY_FULLSCREEN (1 << 15)
 
+#define E_REMEMBER_INTERNAL_DIALOGS   (1 << 0)
+#define E_REMEMBER_INTERNAL_FM_WINS   (1 << 1)
+
 #else
 #ifndef E_REMEMBER_H
 #define E_REMEMBER_H
 
 struct _E_Remember
 {
-   unsigned char  delete_me;
    int            match;
    unsigned char  apply_first_only;
+   unsigned char  keep_settings;
    int            used_count;
    const char    *name;
    const char    *class;
@@ -54,7 +57,7 @@ struct _E_Remember
 	int           pos_w, pos_h;
 	int           w, h;      
 	int           layer;
-      
+
 	unsigned char lock_user_location; 
 	unsigned char lock_client_location; 
 	unsigned char lock_user_size; 
@@ -78,9 +81,9 @@ struct _E_Remember
 	unsigned char lock_focus_in; 
 	unsigned char lock_focus_out; 
 	unsigned char lock_life;
-      
+
 	const char   *border;
-      
+
 	unsigned char sticky;
 	unsigned char shaded;
 	unsigned char fullscreen;
@@ -93,6 +96,7 @@ struct _E_Remember
 	int           zone;
 	int           head;
 	const char   *command;
+	const char   *desktop_file;
      } prop;
 };
 
@@ -106,8 +110,8 @@ EAPI void         e_remember_del(E_Remember *rem);
 EAPI E_Remember  *e_remember_find(E_Border *bd);
 EAPI E_Remember  *e_remember_find_usable(E_Border *bd);
 EAPI void         e_remember_match_update(E_Remember *rem);
-EAPI void         e_remember_update(E_Remember *rem, E_Border *bd);
-EAPI int	  e_remember_default_match(E_Border *bd);
-    
+EAPI void         e_remember_update(E_Border *bd);
+EAPI int	  e_remember_default_match_set(E_Remember *rem, E_Border *bd);
+EAPI void         e_remember_internal_save(void);
 #endif
 #endif
diff --git a/src/bin/e_remote_main.c b/src/bin/e_remote_main.c
deleted file mode 100644
index 0fc3fe1..0000000
--- a/src/bin/e_remote_main.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-#include "e.h"
-
-#ifdef USE_IPC
-
-typedef struct _Opt Opt;
-
-struct _Opt
-{
-   char     *opt;
-   int       num_param;
-   char     *desc;
-   int       num_reply;
-   E_Ipc_Op  opcode;
-};
-
-Opt opts[] = {
-#define TYPE  E_REMOTE_OPTIONS
-#include      "e_ipc_handlers.h"
-#undef TYPE
-};
-
-static int _e_cb_signal_exit(void *data, int ev_type, void *ev);
-static int _e_ipc_init(void);
-static void _e_ipc_shutdown(void);
-static int _e_ipc_cb_server_add(void *data, int type, void *event);
-static int _e_ipc_cb_server_del(void *data, int type, void *event);
-static int _e_ipc_cb_server_data(void *data, int type, void *event);
-static void _e_help(void);
-
-/* local subsystem globals */
-static Ecore_Ipc_Server *_e_ipc_server  = NULL;
-static const char *display_name = NULL;
-static int reply_count = 0;
-static int reply_expect = 0;
-
-#endif
-
-int
-main(int argc, char **argv)
-{
-#ifdef USE_IPC
-   int i;
-   
-   /* handle some command-line parameters */
-   display_name = getenv("DISPLAY");
-   for (i = 1; i < argc; i++)
-     {
-	if ((!strcmp(argv[i], "-h")) ||
-	    (!strcmp(argv[i], "-help")) ||
-	    (!strcmp(argv[i], "--h")) ||
-	    (!strcmp(argv[i], "--help")))
-	  {
-	     _e_help();
-	     exit(0);
-	  }
-     }
-  
-   /* basic ecore init */
-   if (!ecore_init())
-     {
-	printf("ERROR: Enlightenment_remote cannot Initialize Ecore!\n"
-	       "Perhaps you are out of memory?\n");
-	exit(-1);
-     }
-   ecore_app_args_set(argc, (const char **)argv);
-   /* setup a handler for when e is asked to exit via a system signal */
-   if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_cb_signal_exit, NULL))
-     {
-	printf("ERROR: Enlightenment_remote cannot set up an exit signal handler.\n"
-	       "Perhaps you are out of memory?\n");
-	exit(-1);
-     }
-   /* init ipc */
-   if (!ecore_ipc_init())
-     {
-	printf("ERROR: Enlightenment_remote cannot initialize the ipc system.\n"
-	       "Perhaps you are out of memory?\n");
-	exit(-1);
-     }
-   
-   /* setup e ipc service */
-   if (!_e_ipc_init())
-     {
-	printf("ERROR: Enlightenment_remote cannot set up the IPC socket.\n"
-	       "Try setting DISPLAY=:0 in your environment.\n");
-	exit(-1);
-     }
-   e_ipc_codec_init();
-
-   /* start our main loop */
-   ecore_main_loop_begin();
-
-   e_ipc_codec_shutdown();
-   _e_ipc_shutdown();
-   ecore_ipc_shutdown();
-   ecore_shutdown();
-#endif
-   
-   /* just return 0 to keep the compiler quiet */
-   return 0;
-}
-
-#ifdef USE_IPC
-/* local subsystem functions */
-static int
-_e_cb_signal_exit(void *data, int ev_type, void *ev)
-{
-   /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
-   ecore_main_loop_quit();
-   return 1;
-}
-
-static int
-_e_ipc_init(void)
-{
-   char *sdir;
-   
-   sdir = getenv("E_IPC_SOCKET");
-   if (!sdir)
-     {
-	printf("The E_IPC_SOCKET environment variable is not set. This is\n"
-	       "exported by Enlightenment to all processes it launches.\n"
-	       "This environment variable must be set and must point to\n"
-	       "Enlightenment's IPC socket file (minus port number).\n");
-	return 0;
-     }
-   _e_ipc_server = ecore_ipc_server_connect(ECORE_IPC_LOCAL_SYSTEM, sdir, 0, NULL);
-   if (!_e_ipc_server) return 0;
-   
-   ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, _e_ipc_cb_server_add, NULL);
-   ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, _e_ipc_cb_server_del, NULL);
-   ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, _e_ipc_cb_server_data, NULL);
-   
-   return 1;
-}
-
-static void
-_e_ipc_shutdown(void)
-{
-   if (_e_ipc_server)
-     {
-	ecore_ipc_server_del(_e_ipc_server);
-	_e_ipc_server = NULL;
-     }
-}
-
-static int
-_e_ipc_cb_server_add(void *data, int type, void *event)
-{
-   Ecore_Ipc_Event_Server_Add *e;
-   char **argv, **params;
-   int i, j, argc, process_count = 0;
-   
-   e = event;
-   ecore_app_args_get(&argc, &argv);
-   for (i = 1; i < argc; i++)
-     {
-	for (j = 0; j < (int)(sizeof(opts) / sizeof(Opt)); j++)
-	  {
-	     Opt *opt;
-	     
-	     opt = &(opts[j]);
-	     if (!strcmp(opt->opt, argv[i]))
-	       {
-		  if (i >= (argc - opt->num_param))
-		    {
-		       printf("ERROR: option %s expects %i parameters\n",
-			      opt->opt, opt->num_param);
-		       exit(-1);
-		    }
-		  else
-		    {
-		       params = &(argv[i + 1]);
-		       switch (opt->opcode)
-			 {
-#define TYPE  E_REMOTE_OUT
-#include      "e_ipc_handlers.h"
-#undef TYPE
-			  default:
-			    break;
-			 }
-		       process_count++;
-		       reply_expect += opt->num_reply;
-		       i += opt->num_param;
-		    }
-	       }
-	  }
-     }
-   if (process_count <= 0) _e_help();
-   if (reply_count >= reply_expect) ecore_main_loop_quit();
-   return 1;
-}
-
-static int
-_e_ipc_cb_server_del(void *data, int type, void *event)
-{
-   Ecore_Ipc_Event_Server_Del *e;
-   
-   e = event;
-   return 1; 
-}
-
-static int
-_e_ipc_cb_server_data(void *data, int type, void *event)
-{
-   Ecore_Ipc_Event_Server_Data *e;
-   
-   e = event;
-   printf("REPLY <- BEGIN\n");
-   switch (e->minor)
-     {
-#define TYPE  E_REMOTE_IN
-#include      "e_ipc_handlers.h"
-#undef TYPE
-      default:
-	 break;
-     }
-   printf("REPLY <- END\n");
-   reply_count++;
-   if (reply_count >= reply_expect) ecore_main_loop_quit();
-   return 1;
-}
-
-static void
-_e_help(void)
-{
-   int i, j;
-   
-   printf("OPTIONS:\n");
-   printf("  -h This help\n");
-   printf("  -help This help\n");
-   printf("  --help This help\n");
-   printf("  --h This help\n");
-   for (j = 0; j < (int)(sizeof(opts) / sizeof(Opt)); j++)
-     {
-	Opt *opt;
-	
-	opt = &(opts[j]);
-	printf("  %s ", opt->opt);
-	for (i = 0; i < opt->num_param; i++)
-	  printf("OPT%i ", i + 1);
-	printf("%s\n", opt->desc);
-     }
-}
-#endif
diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c
index 441147c..773485f 100644
--- a/src/bin/e_resist.c
+++ b/src/bin/e_resist.c
@@ -23,8 +23,10 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
    Eina_List *l, *ll, *rects = NULL;
    E_Resist_Rect *r;
    E_Border_List *bl;
-   E_Border *bd;
+   E_Border *bd, *bd2;
    E_Desk *desk;
+   E_Shelf *es;
+   E_Zone *zone;
    
    if (!e_config->use_resist)
      {
@@ -51,11 +53,8 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
       rects = eina_list_append(rects, r); \
    }
 
-   for (l = con->zones; l; l = l->next)
+   EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	E_Zone *zone;
-
-	zone = l->data;
 	HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist);
      }
    /* FIXME: need to add resist or complete BLOCKS for things like ibar */
@@ -70,9 +69,9 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
 	     int ok;
 
 	     ok = 1;
-	     for (ll = skiplist; ll; ll = ll->next)
+	     EINA_LIST_FOREACH(skiplist, ll, bd2)
 	       {
-		  if (ll->data == bd)
+		  if (bd2 == bd)
 		    {
 		       ok = 0;
 		       break;
@@ -87,21 +86,17 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
    e_container_border_list_free(bl);
 
    desk = e_desk_current_get(e_zone_current_get(con));
-   for (l = e_shelf_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	E_Shelf *es;
 	Eina_List *ll;
+	E_Config_Shelf_Desk *sd;
 
-	es = l->data;
 	if (es->zone->container == con)
 	  {
 	     if (es->cfg->desk_show_mode)
 	       {
-		  for (ll = es->cfg->desk_list; ll; ll = ll->next)
+		  EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
 		    {
-		       E_Config_Shelf_Desk *sd;
-
-		       sd = ll->data;
 		       if (!sd) continue;
 		       if ((sd->x == desk->x) && (sd->y == desk->y))
 			 {
@@ -125,11 +120,7 @@ e_resist_container_border_position(E_Container *con, Eina_List *skiplist,
 		       	x, y, w, h,
 		       	rx, ry, rw, rh);
 
-	for (l = rects; l; l = l->next)
-	  {
-	     E_FREE(l->data);
-	  }
-	eina_list_free(rects);
+	E_FREE_LIST(rects, E_FREE);
      }
    return 1;
 }
@@ -142,6 +133,7 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist,
 {
    Eina_List *l, *rects = NULL;
    E_Resist_Rect *r;
+   E_Shelf *es;
 
    if (!e_config->use_resist)
      {
@@ -150,11 +142,8 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist,
 	return 0;
      }
 
-   for (l = e_shelf_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	E_Shelf *es;
-
-	es = l->data;
 	if (es->zone->container == con)
 	  {
 	     OBSTACLE(es->x + es->zone->x, es->y + es->zone->y, es->w, es->h,
@@ -169,11 +158,7 @@ e_resist_container_gadman_position(E_Container *con, Eina_List *skiplist,
 		       	x, y, w, h,
 		       	rx, ry, NULL, NULL);
 
-	for (l = rects; l; l = l->next)
-	  {
-	     E_FREE(l->data);
-	  }
-	eina_list_free(rects);
+	E_FREE_LIST(rects, E_FREE);
      }
    return 1;
 }
@@ -195,9 +180,8 @@ _e_resist_rects(Eina_List *rects,
    dw = w - pw;
    dh = h - ph;
 
-   for (l = rects; l; l = l->next)
+   EINA_LIST_FOREACH(rects, l, r)
      {
-	r = l->data;
 	if (E_SPANS_COMMON(r->y, r->h, y, h))
 	  {
 	     if (dx > 0)
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index a4368d2..32fc905 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -114,9 +114,12 @@ e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child)
    API_ENTRY return;
    if (sd->child_obj)
      {
-	e_pan_child_set(sd->pan_obj, NULL);
-	evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, 
-                                       _e_smart_child_del_hook);
+        if (sd->pan_obj)
+          {
+             e_pan_child_set(sd->pan_obj, NULL);
+             evas_object_event_callback_del(sd->child_obj, EVAS_CALLBACK_FREE, 
+                                            _e_smart_child_del_hook);
+          }
      }
 
    sd->child_obj = child;
@@ -229,6 +232,7 @@ e_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    double vx, vy;
 
    API_ENTRY return;
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    if (mx > 0) vx = (double)x / (double)mx;
    else vx = 0.0;
@@ -247,7 +251,13 @@ EAPI void
 e_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 {
    API_ENTRY return;
-   sd->pan_func.get(sd->pan_obj, x, y);
+   if (sd->pan_obj)
+     sd->pan_func.get(sd->pan_obj, x, y);
+   else
+     {
+        *x = 0;
+        *y = 0;
+     }
 }
 
 EAPI void
@@ -256,6 +266,7 @@ e_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Ev
    Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny;
 
    API_ENTRY return;
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    sd->pan_func.child_size_get(sd->pan_obj, &cw, &ch);
    sd->pan_func.get(sd->pan_obj, &px, &py);
@@ -406,6 +417,7 @@ _e_smart_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *event_i
    E_Smart_Data *sd;
 
    sd = data;
+   if (!sd->pan_obj) return;
    sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
    if ((w != sd->child.w) || (h != sd->child.h))
      {
@@ -422,6 +434,7 @@ _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj __UNUSED__, void *eve
    E_Smart_Data *sd;
 
    sd = data;
+   if (!sd->pan_obj) return;
    sd->pan_func.get(sd->pan_obj, &x, &y);
    e_scrollframe_child_pos_set(sd->smart_obj, x, y);
 }
@@ -655,6 +668,7 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    sd = data;
    ev = event_info;
    e_scrollframe_child_pos_get(sd->smart_obj, &x, &y);
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
    if (!strcmp(ev->keyname, "Left"))
@@ -694,10 +708,12 @@ _e_smart_scrollbar_read(E_Smart_Data *sd)
 
    edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", NULL, &vy);
    edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.hbar", &vx, NULL);
+   if (!sd->pan_obj) return;
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    x = vx * (double)mx;
    y = vy * (double)my;
-   sd->pan_func.set(sd->pan_obj, x, y);
+   if (sd->pan_obj)
+     sd->pan_func.set(sd->pan_obj, x, y);
    if (((e_config->thumbscroll_enable) || (sd->thumbscroll.forced))
        && (sd->down.now) && (!sd->down.dragged))
      sd->down.now = 0;
@@ -713,7 +729,8 @@ _e_smart_scrollbar_reset(E_Smart_Data *sd)
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.vbar", 1.0, 1.0);
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 1.0, 1.0);
      }
-   sd->pan_func.set(sd->pan_obj, 0, 0);
+   if (sd->pan_obj)
+     sd->pan_func.set(sd->pan_obj, 0, 0);
 }
 
 static int
@@ -904,9 +921,12 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
                                         &vx, NULL);
 	edje_object_part_drag_value_get(sd->edje_obj, "e.dragable.vbar", 
                                         NULL, &vy);
-	sd->pan_func.max_get(sd->pan_obj, &mx, &my);
-	x = vx * mx;
-	y = vy * my;
+        if (sd->pan_obj)
+          {
+             sd->pan_func.max_get(sd->pan_obj, &mx, &my);
+             x = vx * mx;
+             y = vy * my;
+          }
 
 	edje_object_part_drag_step_set(sd->edje_obj, "e.dragable.hbar", 
                                        (double)sd->step.x / (double)w, 0.0);
@@ -925,7 +945,8 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
 	  edje_object_part_drag_page_set(sd->edje_obj, "e.dragable.vbar", 
                                          0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0);
 
-	sd->pan_func.set(sd->pan_obj, x, y);
+        if (sd->pan_obj)
+          sd->pan_func.set(sd->pan_obj, x, y);
      }
    else
      {
@@ -933,7 +954,8 @@ _e_smart_scrollbar_size_adjust(E_Smart_Data *sd)
                                        1.0, 1.0);
 	edje_object_part_drag_size_set(sd->edje_obj, "e.dragable.hbar", 
                                        1.0, 1.0);
-	sd->pan_func.set(sd->pan_obj, 0, 0);
+        if (sd->pan_obj)
+          sd->pan_func.set(sd->pan_obj, 0, 0);
      }
    _e_smart_scrollbar_bar_visibility_adjust(sd);
 }
@@ -1013,7 +1035,10 @@ _e_smart_del(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
    e_scrollframe_child_set(obj, NULL);
-   if (!sd->extern_pan) evas_object_del(sd->pan_obj);
+   if (sd->pan_obj)
+     {
+        if (!sd->extern_pan) evas_object_del(sd->pan_obj);
+     }
    evas_object_del(sd->edje_obj);
    evas_object_del(sd->event_obj);
    if (sd->down.momentum_animator) 
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 628800e..bd049f8 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -27,6 +27,9 @@ static int _e_shelf_cb_hide_animator_timer(void *data);
 static int _e_shelf_cb_hide_urgent_timer(void *data);
 static int _e_shelf_cb_instant_hide_timer(void *data);
 static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
+static void _e_shelf_gadcon_client_remove(void *data, E_Gadcon_Client *gcc);
+static int _e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc);
+static const char * _e_shelf_orient_icon_name_get(E_Shelf *s);
 
 static Eina_List *shelves = NULL;
 static Eina_Hash *winid_shelves = NULL;
@@ -45,7 +48,7 @@ e_shelf_shutdown(void)
      {
 	E_Shelf *es;
 
-	es = shelves->data;
+	es = eina_list_data_get(shelves);
 	e_object_del(E_OBJECT(es));
      }
 
@@ -56,22 +59,21 @@ EAPI void
 e_shelf_config_init(void)
 {
    Eina_List *l;
+   E_Config_Shelf *cf_es;
    int id = 0;
 
    while (shelves)
      {
 	E_Shelf *es;
 
-	es = shelves->data;
+	es = eina_list_data_get(shelves);
 	e_object_del(E_OBJECT(es));
      }
 
-   for (l = e_config->shelves; l; l = l->next)
+   EINA_LIST_FOREACH(e_config->shelves, l, cf_es)
      {
-	E_Config_Shelf *cf_es;
 	E_Zone *zone;
 
-	cf_es = l->data;
 	if (cf_es->id <= 0) cf_es->id = id + 1;
 	zone = e_util_container_zone_id_get(cf_es->container, cf_es->zone);
 	if (zone) 
@@ -95,6 +97,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
    E_Shelf *es;
    const char *option;
    char buf[1024];
+   const char * locname;
 
    es = E_OBJECT_ALLOC(E_Shelf, E_SHELF_TYPE, _e_shelf_free);
    if (!es) return NULL;
@@ -128,14 +131,12 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
 
    /* TODO: We should have a mouse out on the evas object if we are on the desktop */
    es->handlers = eina_list_append(es->handlers,
-	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in, es));
-   es->handlers = eina_list_append(es->handlers,
-	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_OUT, _e_shelf_cb_mouse_out, es));
-   es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(E_EVENT_ZONE_EDGE_MOVE, _e_shelf_cb_mouse_in, es));
    es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_shelf_cb_mouse_in, es));
    es->handlers = eina_list_append(es->handlers,
+	 ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, _e_shelf_cb_mouse_in, es));
+   es->handlers = eina_list_append(es->handlers,
 	 ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT, _e_shelf_cb_mouse_out, es));
 
    es->o_base = edje_object_add(es->evas);
@@ -150,6 +151,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
 	evas_object_show(es->o_event);
 	evas_object_show(es->o_base);
 	e_popup_edje_bg_object_set(es->popup, es->o_base);
+	ecore_x_netwm_window_type_set(es->popup->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
      }
    else
      {
@@ -160,6 +162,11 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
      }
 
    es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content");
+   locname = es->name;
+   if (!name) locname = _("Shelf #");
+   snprintf(buf, sizeof(buf), "%s %i", locname, es->id);
+   es->gadcon->location = e_gadcon_location_new(buf, E_GADCON_SITE_SHELF, _e_shelf_gadcon_client_add, es, _e_shelf_gadcon_client_remove, es);
+   e_gadcon_location_register(es->gadcon->location);
 // hmm dnd in ibar and ibox kill this. ok. need to look into this more   
 //   es->gadcon->instant_edit = 1;
    e_gadcon_min_size_request_callback_set(es->gadcon,
@@ -228,11 +235,29 @@ e_shelf_zone_move_resize_handle(E_Zone *zone)
 {
    Eina_List *l;
    E_Shelf *es;
+   Evas_Coord w, h;
 
-   for (l = shelves; l; l = l->next)
+   EINA_LIST_FOREACH(shelves, l, es)
      {
-	es = l->data;
-	if (es->zone == zone) e_shelf_position_calc(es);
+	if (es->zone == zone) 
+	  {
+	     E_Gadcon * gc;
+
+	     gc = es->gadcon;
+	     if (gc->min_size_request.func)
+	       {
+	          /* let gadcon container decrease to any size */
+	          edje_extern_object_min_size_set(gc->o_container, 0, 0);
+	       }
+	     evas_object_smart_callback_call (gc->o_container, "min_size_request", NULL);
+	     e_shelf_position_calc(es);
+	     if (gc->min_size_request.func)
+	       {
+	          evas_object_geometry_get(gc->o_container, NULL, NULL, &w, &h);
+	          /* fix gadcon container min size to current geometry */
+	          edje_extern_object_min_size_set(gc->o_container, w, h);
+	       }
+	  }
      }
 }
 
@@ -488,6 +513,7 @@ e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient)
             _e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(es->o_base);
+   e_gadcon_location_set_icon_name(es->gadcon->location, _e_shelf_orient_icon_name_get(es));
    e_zone_useful_geometry_dirty(es->zone);
 }
 
@@ -664,7 +690,8 @@ e_shelf_popup_set(E_Shelf *es, int popup)
 	evas_object_show(es->o_event);
 	evas_object_show(es->o_base);
 	e_popup_edje_bg_object_set(es->popup, es->o_base);
-
+	ecore_x_netwm_window_type_set(es->popup->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
+	
 	e_drop_xdnd_register_set(es->popup->evas_win, 1);
 	e_gadcon_xdnd_window_set(es->gadcon, es->popup->evas_win);
 	e_gadcon_dnd_window_set(es->gadcon, es->popup->evas_win);
@@ -712,13 +739,11 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
      {
 	E_Desk *desk;
 	Eina_List *ll;
+	E_Config_Shelf_Desk *sd;
 
 	desk = e_desk_current_get(zone);
-	for (ll = cf_es->desk_list; ll; ll = ll->next)
+	EINA_LIST_FOREACH(cf_es->desk_list, ll, sd)
 	  {
-	     E_Config_Shelf_Desk *sd;
-
-	     sd = ll->data;
 	     if ((desk->x == sd->x) && (desk->y == sd->y))
 	       {
 		  e_shelf_show(es);
@@ -737,6 +762,7 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es)
 static void
 _e_shelf_free(E_Shelf *es)
 {
+   e_gadcon_location_unregister(es->gadcon->location);
    e_zone_useful_geometry_dirty(es->zone);
    E_FREE_LIST(es->handlers, ecore_event_handler_del);
 
@@ -1049,15 +1075,13 @@ static void
 _e_shelf_toggle_border_fix(E_Shelf *es)
 {
    Eina_List *l;
+   E_Border *bd;
 
    if ((es->cfg->overlap) || (!e_config->border_fix_on_shelf_toggle))
      return;
 
-   for (l = e_border_client_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_NONE)
 	  {
 	     if (bd->lock_client_location) continue;
@@ -1294,7 +1318,7 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
    Evas_Event_Mouse_Down *ev;
    E_Shelf *es;
    E_Menu *mn;
-   int cx, cy, cw, ch;
+   int cx, cy;
    E_Zone *zone;
 
    es = data;
@@ -1313,12 +1337,12 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
 
         zone = es->gadcon->zone;
         if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
-        e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch);
+        e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, NULL, NULL);
 	e_menu_activate_mouse(mn,
 			      e_util_zone_current_get(e_manager_current_get()),
 			      cx + ev->output.x, 
                               cy + ev->output.y, 1, 1,
-			      E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+			      E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
 	break;
      }
 }
@@ -1331,7 +1355,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
    es = data;
    if (es->cfg->autohide_show_action) return 1;
 
-   if ((type == E_EVENT_ZONE_EDGE_IN) || (type == E_EVENT_ZONE_EDGE_MOVE))
+   if (type == E_EVENT_ZONE_EDGE_MOVE)
      {
 	E_Event_Zone_Edge *ev;
 	int show = 0;
@@ -1410,18 +1434,26 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
      }
    else if (type == ECORE_X_EVENT_MOUSE_IN)
      {
-	Ecore_X_Window win;
 	Ecore_X_Event_Mouse_In *ev;
 
 	ev = event;
-	/* If we are about to hide the shelf, interrupt on mouse in */
-	if (es->popup) win = es->popup->evas_win;
-	else win = es->zone->container->event_win;
-	if (ev->win == win)
+	if (!es->popup) return 1;
+	if (ev->win == es->popup->evas_win)
 	  {
 	     edje_object_signal_emit(es->o_base, "e,state,focused", "e");
-	     if ((es->hide_animator) || (es->hide_timer) || (es->instant_timer))
-	       e_shelf_toggle(es, 1);
+	     e_shelf_toggle(es, 1);
+	  }
+     }
+   else if (type == ECORE_EVENT_MOUSE_MOVE)
+     {
+	Ecore_Event_Mouse_Move *ev;
+
+	ev = event;
+	if (!es->popup) return 1;
+	if (ev->event_window == es->popup->evas_win)
+	  {
+	     edje_object_signal_emit(es->o_base, "e,state,focused", "e");
+	     e_shelf_toggle(es, 1);
 	  }
      }
    return 1;
@@ -1435,45 +1467,7 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
 
    es = data;
 
-   if (type == E_EVENT_ZONE_EDGE_OUT)
-     {
-	E_Event_Zone_Edge *ev;
-	int show = 1;
-
-	ev = event;
-	if (es->zone != ev->zone) return 1;
-	switch (es->gadcon->orient)
-	  {
-	   case E_GADCON_ORIENT_LEFT:
-	   case E_GADCON_ORIENT_CORNER_LT:
-	   case E_GADCON_ORIENT_CORNER_LB:
-             if ((ev->edge == E_ZONE_EDGE_LEFT) && (ev->x >= es->x + es->w))
-               show = 0;
-             break;
-	   case E_GADCON_ORIENT_RIGHT:
-	   case E_GADCON_ORIENT_CORNER_RT:
-	   case E_GADCON_ORIENT_CORNER_RB:
-             if ((ev->edge == E_ZONE_EDGE_RIGHT) && (-ev->x > es->w))
-               show = 0;
-             break;
-	   case E_GADCON_ORIENT_TOP:
-	   case E_GADCON_ORIENT_CORNER_TL:
-	   case E_GADCON_ORIENT_CORNER_TR:
-             if ((ev->edge == E_ZONE_EDGE_TOP) && (ev->y > es->y + es->h))
-               show = 0;
-             break;
-	   case E_GADCON_ORIENT_BOTTOM:
-	   case E_GADCON_ORIENT_CORNER_BL:
-	   case E_GADCON_ORIENT_CORNER_BR:
-             if ((ev->edge == E_ZONE_EDGE_BOTTOM) && (-ev->y > es->h))
-               show = 0;
-             break;
-	   default:
-             break;
-	  }
-	if (!show) e_shelf_toggle(es, 0);
-     }
-   else if (type == ECORE_X_EVENT_MOUSE_OUT)
+   if (type == ECORE_X_EVENT_MOUSE_OUT)
      {
 	Ecore_X_Event_Mouse_Out *ev;
 
@@ -1538,6 +1532,10 @@ _e_shelf_cb_hide_animator(void *data)
         hide_max = es->w - es->hidden_state_size;
         if (es->hide_origin == -1) es->hide_origin = es->x;
         break;
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+	break;
      }
 
    step = (hide_max / e_config->framerate) / es->cfg->hide_duration;
@@ -1588,6 +1586,10 @@ _e_shelf_cb_hide_animator(void *data)
       case E_GADCON_ORIENT_CORNER_RT:
         e_shelf_move(es, es->hide_origin + es->hide_step, es->y);
         break;
+      case E_GADCON_ORIENT_FLOAT:
+      case E_GADCON_ORIENT_HORIZ:
+      case E_GADCON_ORIENT_VERT:
+	 break;
      }
 
    return 1;
@@ -1709,3 +1711,84 @@ _e_shelf_menu_pre_cb(void *data, E_Menu *m)
    e_util_menu_item_theme_icon_set(mi, "list-remove");
    e_menu_item_callback_set(mi, _e_shelf_cb_menu_delete, es);   
 }
+
+static void
+_e_shelf_gadcon_client_remove(void *data, E_Gadcon_Client *gcc)
+{
+   E_Shelf *s;
+   E_Gadcon *gc;
+
+   s = data;
+   gc = s->gadcon;
+   e_gadcon_client_config_del(gc->cf, gcc->cf);
+   e_gadcon_unpopulate(gc);
+   e_gadcon_populate(gc);
+   e_config_save_queue();
+}
+
+static int
+_e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc)
+{
+   E_Shelf *s;
+   E_Gadcon *gc;
+
+   s = data;
+   gc = s->gadcon;
+   if (!e_gadcon_client_config_new(gc, cc->name)) return 0;
+   e_gadcon_unpopulate(gc);
+   e_gadcon_populate(gc);
+   e_config_save_queue();
+   return 1;
+}
+
+static const char *
+_e_shelf_orient_icon_name_get(E_Shelf * s)
+{
+   const char * name;
+
+   name = NULL;
+   switch (s->cfg->orient) 
+     {
+      case E_GADCON_ORIENT_LEFT:
+	name = "preferences-position-left";
+	break;
+      case E_GADCON_ORIENT_RIGHT:
+	name = "preferences-position-right";
+	break;
+      case E_GADCON_ORIENT_TOP:
+	name = "preferences-position-top";
+	break;
+      case E_GADCON_ORIENT_BOTTOM:
+	name = "preferences-position-bottom";
+	break;
+      case E_GADCON_ORIENT_CORNER_TL:
+	name = "preferences-position-top-left";
+	break;
+      case E_GADCON_ORIENT_CORNER_TR:
+	name = "preferences-position-top-right";
+	break;
+      case E_GADCON_ORIENT_CORNER_BL:
+	name = "preferences-position-bottom-left";
+	break;
+      case E_GADCON_ORIENT_CORNER_BR:
+	name = "preferences-position-bottom-right";
+	break;
+      case E_GADCON_ORIENT_CORNER_LT:
+	name = "preferences-position-left-top";
+	break;
+      case E_GADCON_ORIENT_CORNER_RT:
+	name = "preferences-position-right-top";
+	break;
+      case E_GADCON_ORIENT_CORNER_LB:
+	name = "preferences-position-left-bottom";
+	break;
+      case E_GADCON_ORIENT_CORNER_RB:
+	name = "preferences-position-right-bottom";
+	break;
+      default:
+	name = "preferences-desktop-shelf";
+	break;
+     }
+   return name;
+}
+
diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c
index feff16d..bb5c151 100644
--- a/src/bin/e_signals.c
+++ b/src/bin/e_signals.c
@@ -7,6 +7,10 @@
 #include "e.h"
 #include <X11/Xlib.h>
 
+#ifdef HAVE_EXECINFO_H
+# include <execinfo.h> 
+#endif
+
 static volatile Eina_Bool _e_x_composite_shutdown_try = 0;
 static void
 _e_x_composite_shutdown(void)
@@ -56,6 +60,17 @@ _e_gdb_print_backtrace(int fd)
    char cmd[1024];
    size_t size;
 
+   // FIXME: we are in a segv'd state. do as few function calls and things
+   // depending on a known working state as possible. this also prevents the
+   // white box allowing recovery or deeper gdbing, thus until this works
+   // properly, it's disabled (properly means always reliable, always
+   // printf bt and allows e to continue and pop up box, perferably allowing
+   // debugging in the gui etc. etc.
+   return;
+   
+   if (getenv("E_NO_GDB_BACKTRACE"))
+     return;
+
    size = snprintf(cmd, sizeof(cmd),
 		   "gdb --pid=%d "
 		   "-ex 'thread apply all bt' "
@@ -78,6 +93,8 @@ _e_backtrace_int(int fd, const char *msg, size_t msg_len)
    void *array[255];
    size_t size;
 
+   return; // disable. causes hangs and problems
+   
    _e_write_safe_int(fd, msg, msg_len);
    _e_write_safe(fd, "\nBEGIN TRACEBACK\n");
    size = backtrace(array, 255);
diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c
index 108dc02..c0de44c 100644
--- a/src/bin/e_slidecore.c
+++ b/src/bin/e_slidecore.c
@@ -316,14 +316,12 @@ _e_smart_add(Evas_Object *obj)
 static void
 _e_smart_del(Evas_Object *obj)
 {
+   E_Smart_Item *it;
+
    INTERNAL_ENTRY;
    if (sd->slide_animator) ecore_animator_del(sd->slide_animator);
-   while (sd->items)
+   EINA_LIST_FREE(sd->items, it)
      {
-	E_Smart_Item *it;
-	
-	it = sd->items->data;
-	sd->items = eina_list_remove_list(sd->items, sd->items);
 	if (it->label) eina_stringshare_del(it->label);
 	if (it->icon) eina_stringshare_del(it->icon);
 	free(it);
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index b0eb76f..cb5c632 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -202,7 +202,7 @@ e_slider_direction_get(Evas_Object *obj)
 }
 
 EAPI void
-e_slider_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_slider_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    API_ENTRY return;
    if (minw) *minw = sd->minw;
diff --git a/src/bin/e_slider.h b/src/bin/e_slider.h
index 4879ae9..4951f13 100644
--- a/src/bin/e_slider.h
+++ b/src/bin/e_slider.h
@@ -21,7 +21,7 @@ EAPI void         e_slider_value_format_display_set (Evas_Object *obj, const cha
 EAPI const char  *e_slider_value_format_display_get (Evas_Object *obj);
 EAPI void         e_slider_direction_set            (Evas_Object *obj, int reversed);
 EAPI int          e_slider_direction_get            (Evas_Object *obj);
-EAPI void         e_slider_min_size_get             (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void         e_slider_size_min_get             (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
 EAPI Evas_Object *e_slider_edje_object_get          (Evas_Object *obj);
 #endif
 #endif
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 7c8eceb..e925bc4 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -394,7 +394,7 @@ valgrind_append(char **dst, int valgrind_mode, const char *valgrind_path, const
 }
 
 static void
-copy_args(char **dst, const char **src, size_t count)
+copy_args(char **dst, char **src, size_t count)
 {
    for (; count > 0; count--, dst++, src++)
      *dst = *src;
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 67b5007..fe6d757 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -289,13 +289,11 @@ static int
 _e_sys_cb_logout_timer(void *data)
 {
    Eina_List *l;
+   E_Border *bd;
    int pending = 0;
 
-   for (l = e_border_client_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	if (!bd->internal) pending++;
      }
    if (pending == 0) goto after;
@@ -356,6 +354,7 @@ static void
 _e_sys_logout_begin(E_Sys_Action a_after)
 {
    Eina_List *l;
+   E_Border *bd;
    E_Obj_Dialog *od;
 
    /* start logout - at end do the a_after action */
@@ -370,11 +369,8 @@ _e_sys_logout_begin(E_Sys_Action a_after)
    if (_e_sys_dialog) e_object_del(E_OBJECT(_e_sys_dialog));
    _e_sys_dialog = od;
    _e_sys_action_after = a_after;
-   for (l = e_border_client_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd)
      {
-	E_Border *bd;
-
-	bd = l->data;
 	e_border_act_close_begin(bd);
      }
    /* and poll to see if all pending windows are gone yet every 0.5 sec */
diff --git a/src/bin/e_table.c b/src/bin/e_table.c
index 5ef9a2d..02adf49 100644
--- a/src/bin/e_table.c
+++ b/src/bin/e_table.c
@@ -176,7 +176,7 @@ e_table_col_row_size_get(Evas_Object *obj, int *cols, int *rows)
 }
 
 EAPI void
-e_table_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_table_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    E_Smart_Data *sd;
    
@@ -187,7 +187,7 @@ e_table_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 }
 
 EAPI void
-e_table_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
+e_table_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
 {
    E_Smart_Data *sd;
    
@@ -246,12 +246,12 @@ _e_table_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
    ti->max.w = 0;
    ti->max.h = 0;
    evas_object_clip_set(obj, sd->clip);
-   evas_object_stack_above(obj, sd->obj);
+//   evas_object_stack_above(obj, sd->obj);
    evas_object_smart_member_add(obj, ti->sd->obj);
    evas_object_data_set(obj, "e_table_data", ti);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FREE,
 				  _e_table_smart_item_del_hook, NULL);
-   evas_object_stack_below(obj, sd->obj);
+//   evas_object_stack_below(obj, sd->obj);
    if ((!evas_object_visible_get(sd->clip)) &&
        (evas_object_visible_get(sd->obj)))
      evas_object_show(sd->clip);
@@ -289,6 +289,7 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 {
    Evas_Coord x, y, w, h, xx, yy;
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh, expandw, expandh;
 
    if (!sd->changed) return;
@@ -314,12 +315,10 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 	y = y + ((h - minh) * (1.0 - sd->align.y));
 	h = minh;
      }
-   for (l = sd->items; l; l = l->next)
+   EINA_LIST_FOREACH(sd->items, l, obj)
      {
 	E_Table_Item *ti;
-	Evas_Object *obj;
 	
-	obj = l->data;
 	ti = evas_object_data_get(obj, "e_table_data");
 	if (ti->expand_w) expandw++;
 	if (ti->expand_h) expandh++;
@@ -338,13 +337,11 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
    y = sd->y;
    if (sd->homogenous)
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Table_Item *ti;
-	     Evas_Object *obj;
 	     Evas_Coord ww, hh, ow, oh;
 	     
-	     obj = l->data;
 	     ti = evas_object_data_get(obj, "e_table_data");
 	     
 	     xx = x + ((ti->col) * (w / (Evas_Coord)sd->size.cols));
@@ -366,12 +363,10 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
    else
      {
 	int i, ex, tot, need, num, dif, left, nx;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Table_Item *ti;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     ti = evas_object_data_get(obj, "e_table_data");	
 	     if (sd->size.cols < (ti->col + ti->colspan))
 	       sd->size.cols = ti->col + ti->colspan;
@@ -387,12 +382,10 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 	     colsx = calloc(sd->size.cols, sizeof(int));
 	     rowsx = calloc(sd->size.rows, sizeof(int));
 	     
-	     for (l = sd->items; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->items, l, obj)
 	       {
 		  E_Table_Item *ti;
-		  Evas_Object *obj;
 
-		  obj = l->data;
 		  ti = evas_object_data_get(obj, "e_table_data");
 		  for (i = ti->col; i < (ti->col + ti->colspan); i++)
 		    colsx[i] |= ti->expand_w;
@@ -400,12 +393,10 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 		    rowsx[i] |= ti->expand_h;
 	       }
 	     
-	     for (l = sd->items; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->items, l, obj)
 	       {
 		  E_Table_Item *ti;
-		  Evas_Object *obj;
 		  
-		  obj = l->data;
 		  ti = evas_object_data_get(obj, "e_table_data");
 		  
 		  /* handle horizontal */
@@ -581,13 +572,11 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
 		    }
 	       }
 	     
-	     for (l = sd->items; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->items, l, obj)
 	       {
 		  E_Table_Item *ti;
-		  Evas_Object *obj;
 		  Evas_Coord ww, hh, ow, oh, i;
 		  
-		  obj = l->data;
 		  ti = evas_object_data_get(obj, "e_table_data");
 		  
 		  xx = x;
@@ -623,6 +612,7 @@ static void
 _e_table_smart_extents_calcuate(E_Smart_Data *sd)
 {
    Eina_List *l;
+   Evas_Object *obj;
    int minw, minh;
 
    sd->max.w = -1; /* max < 0 == unlimited */
@@ -634,13 +624,11 @@ _e_table_smart_extents_calcuate(E_Smart_Data *sd)
    minh = 0;
    if (sd->homogenous)
      {
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Table_Item *ti;
-	     Evas_Object *obj;
 	     int mw, mh;
 	     
-	     obj = l->data;
 	     ti = evas_object_data_get(obj, "e_table_data");	
 	     if (sd->size.cols < (ti->col + ti->colspan))
 	       sd->size.cols = ti->col + ti->colspan;
@@ -657,12 +645,10 @@ _e_table_smart_extents_calcuate(E_Smart_Data *sd)
    else
      {
 	int i, ex, tot, need, num, dif, left, nx;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, obj)
 	  {
 	     E_Table_Item *ti;
-	     Evas_Object *obj;
 	     
-	     obj = l->data;
 	     ti = evas_object_data_get(obj, "e_table_data");	
 	     if (sd->size.cols < (ti->col + ti->colspan))
 	       sd->size.cols = ti->col + ti->colspan;
@@ -678,12 +664,10 @@ _e_table_smart_extents_calcuate(E_Smart_Data *sd)
 	     colsx = calloc(sd->size.cols, sizeof(int));
 	     rowsx = calloc(sd->size.rows, sizeof(int));
 	     
-	     for (l = sd->items; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->items, l, obj)
 	       {
 		  E_Table_Item *ti;
-		  Evas_Object *obj;
 
-		  obj = l->data;
 		  ti = evas_object_data_get(obj, "e_table_data");
 		  for (i = ti->col; i < (ti->col + ti->colspan); i++)
 		    colsx[i] |= ti->expand_w;
@@ -691,12 +675,10 @@ _e_table_smart_extents_calcuate(E_Smart_Data *sd)
 		    rowsx[i] |= ti->expand_h;
 	       }
 	     
-	     for (l = sd->items; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->items, l, obj)
 	       {
 		  E_Table_Item *ti;
-		  Evas_Object *obj;
 		  
-		  obj = l->data;
 		  ti = evas_object_data_get(obj, "e_table_data");
 		  
 		  /* handle horizontal */
@@ -880,7 +862,7 @@ _e_table_smart_del(Evas_Object *obj)
      {
 	Evas_Object *child;
 	
-	child = sd->items->data;
+	child = eina_list_data_get(sd->items);
 	e_table_unpack(child);
      }
    e_table_thaw(obj);
@@ -899,16 +881,17 @@ _e_table_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if ((x == sd->x) && (y == sd->y)) return;
      {
 	Eina_List *l;
+	Evas_Object *item;
 	Evas_Coord dx, dy;
 	
 	dx = x - sd->x;
 	dy = y - sd->y;
-	for (l = sd->items; l; l = l->next)
+	EINA_LIST_FOREACH(sd->items, l, item)
 	  {
 	     Evas_Coord ox, oy;
 	     
-	     evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-	     evas_object_move(l->data, ox + dx, oy + dy);
+	     evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
+	     evas_object_move(item, ox + dx, oy + dy);
 	  }
      }
    sd->x = x;
diff --git a/src/bin/e_table.h b/src/bin/e_table.h
index add27ea..0371ffd 100644
--- a/src/bin/e_table.h
+++ b/src/bin/e_table.h
@@ -14,8 +14,8 @@ EAPI void         e_table_pack              (Evas_Object *obj, Evas_Object *chil
 EAPI void         e_table_pack_options_set  (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h);
 EAPI void         e_table_unpack            (Evas_Object *obj);
 EAPI void         e_table_col_row_size_get  (Evas_Object *obj, int *cols, int *rows);
-EAPI void         e_table_min_size_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-EAPI void         e_table_max_size_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+EAPI void         e_table_size_min_get      (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void         e_table_size_max_get      (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
 EAPI void         e_table_align_get         (Evas_Object *obj, double *ax, double *ay);
 EAPI void         e_table_align_set         (Evas_Object *obj, double ax, double ay);
 
diff --git a/src/bin/e_test.c b/src/bin/e_test.c
index 1fe314c..cfd5d4b 100644
--- a/src/bin/e_test.c
+++ b/src/bin/e_test.c
@@ -8,19 +8,14 @@ static void _e_test_internal(E_Container *con);
 EAPI void
 e_test(void)
 {
-   Eina_List *managers, *l, *ll;
+   Eina_List *l, *ll;
+   E_Manager *man;
+   E_Container *con;
    
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     E_Container *con;
-	     
-	     con = ll->data;
 	     _e_test_internal(con);
 	  }
      }
@@ -32,6 +27,7 @@ _e_test_timer(void *data)
 {
    E_Menu *m;
    Eina_List *managers, *l;
+   E_Manager *man;
    
    m = data;
    if (m)
@@ -42,11 +38,8 @@ _e_test_timer(void *data)
 	return 0;
      }
    managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(managers, l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
 	m = e_int_menus_main_new();
 	e_menu_activate_mouse(m,
 			      e_container_zone_number_get(e_container_current_get(man), 0),
@@ -122,14 +115,11 @@ static void
 _e_test_internal(E_Container *con)
 {
    E_Menu *m;
-   Eina_List *managers, *l;
+   Eina_List *l;
+   E_Manager *man;
    
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	E_Manager *man;
-	
-	man = l->data;
 	m = e_int_menus_main_new();
 	e_menu_activate_mouse(m,
 			      e_container_zone_number_get(e_container_current_get(man), 0),
@@ -272,7 +262,7 @@ _e_test_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_ilist_min_size_get(data, &mw, &mh);
+   e_ilist_size_min_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
    if (vw >= mw)
      {
@@ -337,7 +327,7 @@ _e_test_internal(E_Container *con)
    e_icon_file_set(o3, "/home/raster/C/stuff/icons/cd.png");
    e_ilist_append(o, o3, "Norbert", 0, _e_test_sel, NULL, NULL, NULL);
    
-   e_ilist_min_size_get(o, &mw, &mh);
+   e_ilist_size_min_get(o, &mw, &mh);
    evas_object_resize(o, mw, mh);
    evas_object_focus_set(o, 1);
    evas_object_show(o);
@@ -382,7 +372,7 @@ _e_test_internal(E_Container *con)
    e_slider_value_set(o, 0.5);
    e_slider_value_step_count_set(o, 4);
    e_slider_value_format_display_set(o, "%1.2f V");
-   e_slider_min_size_get(o, &mw, &mh);
+   e_slider_size_min_get(o, &mw, &mh);
    evas_object_smart_callback_add(o, "changed", _e_test_cb_e_smart_pan_changed_hook, NULL);
    evas_object_show(o);
    
@@ -463,7 +453,7 @@ _e_test_cb_favorites_selected(void *data, Evas_Object *obj, void *event_info)
    printf("FAV SELECTED\n");
    selected = e_fm2_selected_list_get(obj);
    if (!selected) return;
-   ici = selected->data;
+   ici = eina_list_data_get(selected);
    if ((ici->link) && (ici->mount))
      e_fm2_path_set(data, ici->link, "/");
    else if (ici->link)
@@ -487,9 +477,8 @@ _e_test_cb_favorites_files_changed(void *data, Evas_Object *obj, void *event_inf
    realpath = e_fm2_real_path_get(data);
    p1 = ecore_file_realpath(realpath);
    if (!p1) goto done;
-   for (l = icons; l; l = l->next)
+   EINA_LIST_FOREACH(icons, l, ici)
      {
-	ici = l->data;
 	if (ici->link)
 	  {
 	     p2 = ecore_file_realpath(ici->link);
@@ -559,7 +548,7 @@ _e_test_internal(E_Container *con)
    of = e_widget_scrollframe_pan_add(dia->win->evas, ofm,
 				     e_fm2_pan_set, e_fm2_pan_get,
 				     e_fm2_pan_max_get, e_fm2_pan_child_size_get);
-   e_widget_min_size_set(of, 128, 128);
+   e_widget_size_min_set(of, 128, 128);
    e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
    evas_object_show(ofm);
    evas_object_show(of);
@@ -594,14 +583,14 @@ _e_test_internal(E_Container *con)
    of = e_widget_scrollframe_pan_add(dia->win->evas, ofm,
 				     e_fm2_pan_set, e_fm2_pan_get,
 				     e_fm2_pan_max_get, e_fm2_pan_child_size_get);
-   e_widget_min_size_set(of, 128, 128);
+   e_widget_size_min_set(of, 128, 128);
    e_widget_table_object_append(ot, of, 0, 1, 1, 1, 0, 1, 0, 1);
    evas_object_show(ofm);
    evas_object_show(of);
    
    /* show and pack table */
    evas_object_show(ot);
-   e_widget_min_size_get(ot, &mw, &mh);
+   e_widget_size_min_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
    
    /* buttons at the bottom */
@@ -640,7 +629,7 @@ _e_test_internal(E_Container *con)
 			 _e_test_cb_selected, dia,
 			 _e_test_cb_changed, dia, 0);
    evas_object_show(o);
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
    
    /* buttons at the bottom */
@@ -721,12 +710,12 @@ _e_test_internal(E_Container *con)
      }
    
    /* fixme... more */
-   e_box_min_size_get(ob, &mw, &mh);
+   e_box_size_min_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);
+//   e_widget_size_min_get(o, &mw, &mh);
    mw = 300; mh = 300;
    e_dialog_content_set(dia, of, mw, mh);
    evas_object_show(of);
@@ -739,7 +728,15 @@ _e_test_internal(E_Container *con)
    e_win_resize(dia->win, 400, 400);
    
 }
+
+static void
+_e_test_internal(E_Container *con)
+{
+   ecore_timer_add(1.0, _e_test_timer, con);
+}
+
 #elif 0
+
 static int
 _e_test_timer(void *data)
 {
@@ -785,7 +782,74 @@ _e_test_timer(void *data)
    e_widget_toolbar_item_select(o, 1);
    
    /* fixme... more */
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
+   e_dialog_content_set(dia, o, mw, mh);
+   evas_object_show(o);
+   
+   /* 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, 200);
+   
+   return 0;
+}
+
+static void
+_e_test_internal(E_Container *con)
+{
+   ecore_timer_add(1.0, _e_test_timer, con);
+}
+
+#elif 0
+
+static int
+_e_test_timer(void *data)
+{
+   E_Container *con;
+   E_Dialog *dia;
+   Evas_Object *o, *ic;
+   Evas_Coord mw, mh;
+   
+   con = data;
+   dia = e_dialog_new(con, "E", "_test");
+   e_dialog_title_set(dia, "A Test Dialog");
+
+   o = e_widget_toolbar_add(dia->win->evas, 48, 48);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_hdd.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_cd.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_desktop.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_home.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_root.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_efm_tmp.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_globe.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_mixer.png");
+   e_widget_toolbar_item_append(o, ic, NULL, NULL, NULL, NULL);
+   ic = e_icon_add(dia->win->evas);
+   e_icon_file_set(ic, "/home/raster/C/e17/data/themes/images/icon_performance.png");
+   e_widget_toolbar_item_append(o, ic, "x", NULL, NULL, NULL);
+
+   e_widget_toolbar_scrollable_set(o, 1);
+   e_widget_toolbar_item_select(o, 1);
+   
+   /* fixme... more */
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
    evas_object_show(o);
    
@@ -798,11 +862,13 @@ _e_test_timer(void *data)
    
    return 0;
 }
+
 static void
 _e_test_internal(E_Container *con)
 {
    ecore_timer_add(1.0, _e_test_timer, con);
 }
+
 #else
 static void
 _e_test_internal(E_Container *con)
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index 5073ecd..0b237ab 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -493,17 +493,15 @@ _e_theme_mappings_quickfind_free_cb(const Eina_Hash *hash, const void *key, void
 static void
 _e_theme_category_register(const char *category)
 {
-   const char *c;
    Eina_List *l;
    int ret;
 
    if (!categories)
      categories = eina_list_append(categories, eina_stringshare_add(category));
 
-   l = eina_list_search_sorted_near_list(categories, EINA_COMPARE_CB(strcmp), category);
-   c = eina_list_data_get(l);
+   l = eina_list_search_sorted_near_list(categories, EINA_COMPARE_CB(strcmp),
+         category, &ret);
 
-   ret = strcmp(c, category);
    if (!ret) return;
 
    if (ret < 0)
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index 32abf9b..b0cc383 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -59,11 +59,7 @@ e_thumb_shutdown(void)
    ecore_event_handler_del(_exe_del_handler);
    _exe_del_handler = NULL;
    _thumbnailers = eina_list_free(_thumbnailers);
-   while (_thumbnailers_exe)
-     {
-	ecore_exe_free(_thumbnailers_exe->data);
-	_thumbnailers_exe = eina_list_remove_list(_thumbnailers_exe, _thumbnailers_exe);
-     }
+   E_FREE_LIST(_thumbnailers_exe, ecore_exe_free);
    _thumb_queue = eina_list_free(_thumb_queue);
    _objid = 0;
    eina_hash_free(_thumbs);
@@ -154,10 +150,8 @@ e_thumb_icon_begin(Evas_Object *obj)
 	eth->queued = 1;
 	return;
      }
-   while (_thumb_queue)
+   EINA_LIST_FREE(_thumb_queue, eth2)
      {
-	eth2 = _thumb_queue->data;
-	_thumb_queue = eina_list_remove_list(_thumb_queue, _thumb_queue);
 	eth2->queued = 0;
 	eth2->busy = 1;
 	_pending++;
@@ -268,7 +262,7 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
 		       _pending--;
 		       eth->done = 1;
 		       if (_pending == 0) _e_thumb_thumbnailers_kill();
-//y//                  e_icon_preload_set(obj, 1);
+                       e_icon_preload_set(obj, 1);
 		       e_icon_file_key_set(obj, icon, "/thumbnail/data");
                        _e_thumb_key_load(eth, icon);
 		       evas_object_smart_callback_call(obj, "e_thumb_gen", NULL);
@@ -279,10 +273,8 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e)
    if (e->minor == 1)
      {
 	/* hello message */
-	while (_thumb_queue)
+	EINA_LIST_FREE(_thumb_queue, eth)
 	  {
-	     eth = _thumb_queue->data;
-	     _thumb_queue = eina_list_remove_list(_thumb_queue, _thumb_queue);
 	     eth->queued = 0;
 	     eth->busy = 1;
 	     _pending++;
@@ -316,7 +308,7 @@ _e_thumb_gen_begin(int objid, const char *file, const char *key, int w, int h)
    strcpy(buf, file);
    if (key) strcpy(buf + l1 + 1, key);
    else buf[l1 + 1] = 0;
-   cli = _thumbnailers->data;
+   cli = eina_list_data_get(_thumbnailers);
    if (!cli) return;
    _thumbnailers = eina_list_remove_list(_thumbnailers, _thumbnailers);
    _thumbnailers = eina_list_append(_thumbnailers, cli);
@@ -330,9 +322,8 @@ _e_thumb_gen_end(int objid)
    Ecore_Ipc_Client *cli;
 
    /* send thumb cancel */
-   for (l = _thumbnailers; l; l = l->next)
+   EINA_LIST_FOREACH(_thumbnailers, l, cli)
      {
-	cli = l->data;
 	ecore_ipc_client_send(cli, E_IPC_DOMAIN_THUMB, 2, objid, 0, 0, NULL, 0);
      }
 }
@@ -407,9 +398,10 @@ static int
 _e_thumb_cb_kill(void *data)
 {
    Eina_List *l;
+   Ecore_Exe *exe;
 
-   for (l = _thumbnailers_exe; l; l = l->next)
-     ecore_exe_terminate(l->data);
+   EINA_LIST_FOREACH(_thumbnailers_exe, l, exe)
+     ecore_exe_terminate(exe);
    _kill_timer = NULL;
    return 0;
 }
@@ -418,12 +410,13 @@ static int
 _e_thumb_cb_exe_event_del(void *data, int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
+   Ecore_Exe *exe;
    Eina_List *l;
 
    ev = event;
-   for (l = _thumbnailers_exe; l; l = l->next)
+   EINA_LIST_FOREACH(_thumbnailers_exe, l, exe)
      {
-	if (l->data == ev->exe)
+	if (exe == ev->exe)
 	  {
 	     _thumbnailers_exe = eina_list_remove_list(_thumbnailers_exe, l);
 	     break;
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 5535f8f..d3217f4 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -187,9 +187,8 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 	break;
       case 2:
 	/* end thumb */
-	for (l = _thumblist; l; l = l->next)
+	EINA_LIST_FOREACH(_thumblist, l, eth)
 	  {
-	     eth = l->data;
 	     if (eth->objid == e->ref)
 	       {
 		  _thumblist = eina_list_remove_list(_thumblist, l);
@@ -221,7 +220,7 @@ _e_cb_timer(void *data)
    /* take thumb at head of list */
    if (_thumblist)
      {
-	eth = _thumblist->data;
+	eth = eina_list_data_get(_thumblist);
 	_thumblist = eina_list_remove_list(_thumblist, _thumblist);
 	_e_thumb_generate(eth);
 	if (eth->file) free(eth->file);
diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c
index 0355ceb..c1c456d 100644
--- a/src/bin/e_toolbar.c
+++ b/src/bin/e_toolbar.c
@@ -35,7 +35,7 @@ e_toolbar_shutdown(void)
      {
 	E_Toolbar *tbar;
 
-	tbar = toolbars->data;
+	tbar = eina_list_data_get(toolbars);
 	e_object_del(E_OBJECT(tbar));
      }
    return 1;
@@ -499,14 +499,12 @@ _e_toolbar_fm2_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "changed", tbar);
      }
@@ -517,14 +515,12 @@ _e_toolbar_fm2_dir_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "dir_changed", tbar);
      }
@@ -535,14 +531,12 @@ _e_toolbar_fm2_dir_deleted(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "dir_deleted", tbar);
      }
@@ -553,14 +547,12 @@ _e_toolbar_fm2_files_deleted(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "files_deleted", tbar);
      }
@@ -571,14 +563,12 @@ _e_toolbar_fm2_selected(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "selected", tbar);
      }
@@ -589,14 +579,12 @@ _e_toolbar_fm2_selection_changed(void *data, Evas_Object *obj, void *event_info)
 {
    E_Toolbar *tbar;
    Eina_List *l = NULL;
+   E_Gadcon_Client *gcc = NULL;
 
    tbar = data;
    if (!tbar) return;
-   for (l = tbar->gadcon->clients; l; l = l->next) 
+   EINA_LIST_FOREACH(tbar->gadcon->clients, l, gcc)
      {
-	E_Gadcon_Client *gcc = NULL;
-
-	gcc = l->data;
 	if (!gcc) continue;
 	evas_object_smart_callback_call(gcc->o_base, "selection_changed", tbar);
      }
diff --git a/src/bin/e_toolbar.h b/src/bin/e_toolbar.h
index 055d1e5..7858eda 100644
--- a/src/bin/e_toolbar.h
+++ b/src/bin/e_toolbar.h
@@ -26,21 +26,21 @@ struct _E_Toolbar
    Evas_Object *o_base, *o_event;
 };
 
-EAPI int          e_toolbar_init          (void);
-EAPI int          e_toolbar_shutdown      (void);
-EAPI E_Toolbar   *e_toolbar_new           (Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2);
-EAPI void         e_toolbar_fwin_set      (E_Toolbar *tbar, E_Win *fwin);
-EAPI E_Win       *e_toolbar_fwin_get      (E_Toolbar *tbar);
-EAPI void         e_toolbar_fm2_set       (E_Toolbar *tbar, Evas_Object *fm2);
-EAPI Evas_Object *e_toolbar_fm2_get       (E_Toolbar *tbar);
-EAPI void         e_toolbar_show          (E_Toolbar *tbar);
-EAPI void         e_toolbar_hide          (E_Toolbar *tbar);
-EAPI void         e_toolbar_move          (E_Toolbar *tbar, int x, int y);
-EAPI void         e_toolbar_resize        (E_Toolbar *tbar, int w, int h);
-EAPI void         e_toolbar_move_resize   (E_Toolbar *tbar, int x, int y, int w, int h);
-EAPI void         e_toolbar_orient        (E_Toolbar *tbar, E_Gadcon_Orient orient);
-EAPI void         e_toolbar_position_calc (E_Toolbar *tbar);
-EAPI void         e_toolbar_populate      (E_Toolbar *tbar);
+EAPI int e_toolbar_init(void);
+EAPI int e_toolbar_shutdown(void);
+EAPI E_Toolbar *e_toolbar_new(Evas *evas, const char *name, E_Win *fwin, Evas_Object *fm2);
+EAPI void e_toolbar_fwin_set(E_Toolbar *tbar, E_Win *fwin);
+EAPI E_Win *e_toolbar_fwin_get(E_Toolbar *tbar);
+EAPI void e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2);
+EAPI Evas_Object *e_toolbar_fm2_get(E_Toolbar *tbar);
+EAPI void e_toolbar_show(E_Toolbar *tbar);
+EAPI void e_toolbar_hide(E_Toolbar *tbar);
+EAPI void e_toolbar_move(E_Toolbar *tbar, int x, int y);
+EAPI void e_toolbar_resize(E_Toolbar *tbar, int w, int h);
+EAPI void e_toolbar_move_resize(E_Toolbar *tbar, int x, int y, int w, int h);
+EAPI void e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient);
+EAPI void e_toolbar_position_calc(E_Toolbar *tbar);
+EAPI void e_toolbar_populate(E_Toolbar *tbar);
 
 #endif
 #endif
diff --git a/src/bin/e_user.h b/src/bin/e_user.h
index d7a727f..3e9d45a 100644
--- a/src/bin/e_user.h
+++ b/src/bin/e_user.h
@@ -6,8 +6,6 @@
 #ifndef E_USER_H
 #define E_USER_H
 
-#include <Eina.h>
-
 EAPI const char *e_user_homedir_get(void);
 EAPI size_t      e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_len);
 EAPI size_t      e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4);
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index d31a400..c0edbb2 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -126,13 +126,12 @@ EAPI E_Container *
 e_util_container_number_get(int num)
 {
    Eina_List *l;
+   E_Manager *man;
 
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	E_Manager *man;
 	E_Container *con;
 
-	man = l->data;
 	con = e_container_number_get(man, num);
 	if (con) return con;
      }
@@ -478,7 +477,7 @@ _e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon)
    unsigned int size;
 
    if ((!icon) || (!icon[0])) return 0;
-   size = e_util_icon_size_normalize(16 * e_scale);
+   size = e_util_icon_size_normalize(24 * e_scale);
    path = efreet_icon_path_find(e_config->icon_theme, icon, size);
    if (!path) return 0;
    e_menu_item_icon_file_set(mi, path);
@@ -507,17 +506,13 @@ EAPI E_Container *
 e_util_container_window_find(Ecore_X_Window win)
 {
    Eina_List *l, *ll;
+   E_Manager *man;
+   E_Container *con;
 
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	E_Manager *man;
-
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
           {
-	     E_Container *con;
-
-	     con = ll->data;
 	     if ((con->win == win) || (con->bg_win == win) ||
 		 (con->event_win == win))
 	       return con;
@@ -529,7 +524,7 @@ e_util_container_window_find(Ecore_X_Window win)
 EAPI E_Border *
 e_util_desk_border_above(E_Border *bd)
 {
-   E_Border *above = NULL;
+   E_Border *bd2, *above = NULL;
    Eina_List *l;
    int pos, i;
 
@@ -543,11 +538,10 @@ e_util_desk_border_above(E_Border *bd)
    else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
    else pos = 5;
 
-   for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
-	(l) && (l->next) && (!above);
-	l = l->next)
+   EINA_LIST_FOREACH(eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd), l, bd2)
      {
-	above = l->next->data;
+	if(!eina_list_next(l) || above) break;
+	above = eina_list_data_get(eina_list_next(l));
 	if ((above->desk != bd->desk) && (!above->sticky))
 	  above = NULL;
      }
@@ -556,11 +550,10 @@ e_util_desk_border_above(E_Border *bd)
 	/* Need to check the layers above */
 	for (i = pos + 1; (i < 7) && (!above); i++)
 	  {
-	     for (l = bd->zone->container->layers[i].clients;
-		  (l) && (!above);
-		  l = l->next)
+	     EINA_LIST_FOREACH(bd->zone->container->layers[i].clients, l, bd2)
 	       {
-		  above = l->data;
+		  if (above) break;
+		  above = bd2;
 		  if ((above->desk != bd->desk) && (!above->sticky))
 		    above = NULL;
 	       }
@@ -572,7 +565,7 @@ e_util_desk_border_above(E_Border *bd)
 EAPI E_Border *
 e_util_desk_border_below(E_Border *bd)
 {
-   E_Border *below = NULL;
+   E_Border *below = NULL, *bd2;
    Eina_List *l;
    int pos, i;
 
@@ -586,11 +579,10 @@ e_util_desk_border_below(E_Border *bd)
    else if ((bd->layer > 150) && (bd->layer <= 200)) pos = 4;
    else pos = 5;
 
-   for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
-	(l) && (l->prev) && (!below);
-	l = l->prev)
+   for (l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd); l; l = l->prev)
      {
-	below = l->prev->data;
+        if (!eina_list_prev(l) || below) break;
+	below = eina_list_data_get(eina_list_prev(l));
 	if ((below->desk != bd->desk) && (!below->sticky))
 	  below = NULL;
      }
@@ -601,11 +593,11 @@ e_util_desk_border_below(E_Border *bd)
 	  {
 	     if (bd->zone->container->layers[i].clients)
 	       {
-		  for (l = eina_list_last(bd->zone->container->layers[i].clients);
-		       (l) && (!below);
-		       l = l->prev)
+		  l = eina_list_data_find_list(bd->zone->container->layers[pos].clients, bd);
+		  for (; l && !below; l = l->prev)
 		    {
-		       below = l->data;
+		       bd2 = l->data;
+		       below = bd2;
 		       if ((below->desk != bd->desk) && (!below->sticky))
 			 below = NULL;
 		    }
@@ -620,11 +612,12 @@ EAPI int
 e_util_edje_collection_exists(const char *file, const char *coll)
 {
    Eina_List *clist, *l;
+   char *str;
 
    clist = edje_file_collection_list(file);
-   for (l = clist; l; l = l->next)
+   EINA_LIST_FOREACH(clist, l, str)
      {
-	if (!strcmp(coll, l->data))
+	if (!strcmp(coll, str))
 	  {
 	     edje_file_collection_list_free(clist);
 	     return 1;
@@ -916,6 +909,7 @@ e_util_icon_add(const char *path, Evas *evas)
    if (!ecore_file_exists(path)) return NULL;
 
    o = e_icon_add(evas);
+   e_icon_preload_set(o, 1);
    ext = strrchr(path, '.');
    if (ext)
      {
@@ -1075,6 +1069,102 @@ e_util_win_auto_resize_fill(E_Win *win)
      }
 }
 
+EAPI void
+e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show)
+{
+   
+   Eina_List *l, *ll, *lll;
+   E_Manager *man;
+   E_Container *con;
+   E_Zone *zone;
+
+   /* Update all zones to show the edge */
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
+     {
+	EINA_LIST_FOREACH(man->containers, ll, con)
+	  {
+	     EINA_LIST_FOREACH(con->zones, lll, zone)
+	       {
+		  switch(edge)
+		    {
+		     case E_ZONE_EDGE_LEFT:
+			if (show)
+			  ecore_x_window_show(zone->edge.left);
+			else
+			  ecore_x_window_hide(zone->edge.left);
+			break;
+		     case E_ZONE_EDGE_TOP:
+			if (show)
+			  ecore_x_window_show(zone->edge.top);
+			else
+			  ecore_x_window_hide(zone->edge.top);
+			break;
+		     case E_ZONE_EDGE_RIGHT:
+			if (show)
+			  ecore_x_window_show(zone->edge.right);
+			else
+			  ecore_x_window_hide(zone->edge.right);
+			break;
+		     case E_ZONE_EDGE_BOTTOM:
+			if (show)
+			  ecore_x_window_show(zone->edge.bottom);
+			else
+			  ecore_x_window_hide(zone->edge.bottom);
+			break;
+		     case E_ZONE_EDGE_TOP_LEFT:
+			if (show)
+			  {
+			     ecore_x_window_show(zone->corner.top_left);
+			     ecore_x_window_show(zone->corner.left_top);
+			  }
+			else
+			  {
+			     ecore_x_window_hide(zone->corner.top_left);
+			     ecore_x_window_hide(zone->corner.left_top);
+			  }
+			break;
+		     case E_ZONE_EDGE_TOP_RIGHT:
+			if (show)
+			  {
+			     ecore_x_window_show(zone->corner.top_right);
+			     ecore_x_window_show(zone->corner.right_top);
+			  }
+			else
+			  {
+			     ecore_x_window_hide(zone->corner.top_right);
+			     ecore_x_window_hide(zone->corner.right_top);
+			  }
+			break;
+		     case E_ZONE_EDGE_BOTTOM_RIGHT:
+			if (show)
+			  {
+			     ecore_x_window_show(zone->corner.bottom_right);
+			     ecore_x_window_show(zone->corner.right_bottom);
+			  }
+			else
+			  {
+			     ecore_x_window_hide(zone->corner.bottom_right);
+			     ecore_x_window_hide(zone->corner.right_bottom);
+			  }
+			break;
+		     case E_ZONE_EDGE_BOTTOM_LEFT:
+			if (show)
+			  {
+			     ecore_x_window_show(zone->corner.bottom_left);
+			     ecore_x_window_show(zone->corner.left_bottom);
+			  }
+			else
+			  {
+			     ecore_x_window_hide(zone->corner.bottom_left);
+			     ecore_x_window_hide(zone->corner.left_bottom);
+			  }
+			break;
+		    }
+	       }
+	  }
+     }
+}
+
 /* local subsystem functions */
 static int
 _e_util_cb_delayed_del(void *data)
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 79ddc21..2f8a0cb 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -56,6 +56,7 @@ EAPI int          e_util_dir_check(const char *dir);
 EAPI void         e_util_defer_object_del(E_Object *obj);
 EAPI const char  *e_util_winid_str_get(Ecore_X_Window win);
 EAPI void         e_util_win_auto_resize_fill(E_Win *win);
+EAPI void         e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show);
     
 #endif
 #endif
diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c
index 2d669c6..c3f7b78 100644
--- a/src/bin/e_widget.c
+++ b/src/bin/e_widget.c
@@ -10,24 +10,23 @@ typedef struct _E_Smart_Data E_Smart_Data;
 
 struct _E_Smart_Data
 { 
-   Evas_Object   *parent_obj;
-   Evas_Coord     x, y, w, h;
-   Evas_Coord     minw, minh;
-   Eina_List     *subobjs;
-   Evas_Object   *resize_obj;
-   void         (*del_func) (Evas_Object *obj);
-   void         (*focus_func) (Evas_Object *obj);
-   void         (*activate_func) (Evas_Object *obj);
-   void         (*disable_func) (Evas_Object *obj);
-   void         (*on_focus_func) (void *data, Evas_Object *obj);
-   void          *on_focus_data;
-   void         (*on_change_func) (void *data, Evas_Object *obj);
-   void          *on_change_data;
-   void          *data;
-   unsigned char  can_focus : 1;
-   unsigned char  child_can_focus : 1;
-   unsigned char  focused : 1;
-   unsigned char  disabled : 1;
+   Evas_Object *parent_obj;
+   Evas_Coord x, y, w, h, minw, minh;
+   Eina_List *subobjs;
+   Evas_Object *resize_obj;
+   void (*del_func) (Evas_Object *obj);
+   void (*focus_func) (Evas_Object *obj);
+   void (*activate_func) (Evas_Object *obj);
+   void (*disable_func) (Evas_Object *obj);
+   void (*on_focus_func) (void *data, Evas_Object *obj);
+   void *on_focus_data;
+   void (*on_change_func) (void *data, Evas_Object *obj);
+   void *on_change_data;
+   void *data;
+   unsigned char can_focus : 1;
+   unsigned char child_can_focus : 1;
+   unsigned char focused : 1;
+   unsigned char disabled : 1;
 };
 
 /* local subsystem functions */
@@ -113,7 +112,7 @@ e_widget_data_get(Evas_Object *obj)
 }
 
 EAPI void
-e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
+e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
 {
    API_ENTRY return;
    if (minw >= 0) sd->minw = minw;
@@ -121,7 +120,7 @@ e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
 }
 
 EAPI void
-e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    API_ENTRY return;
    if (minw) *minw = sd->minw;
@@ -196,15 +195,14 @@ EAPI Evas_Object *
 e_widget_focused_object_get(Evas_Object *obj)
 {
    Eina_List *l = NULL;
+   Evas_Object *sobj = NULL;
 
    API_ENTRY return NULL;
    if (!sd->focused) return NULL;
-   for (l = sd->subobjs; l; l = l->next)
+   EINA_LIST_FOREACH(sd->subobjs, l, sobj)
      {
-	Evas_Object *fobj = NULL;
-
-	fobj = e_widget_focused_object_get(l->data);
-	if (fobj) return fobj;
+	sobj = e_widget_focused_object_get(sobj);
+	if (sobj) return sobj;
      }
    return obj;
 }
@@ -228,6 +226,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
    else
      {
 	Eina_List *l = NULL;
+	Evas_Object *sobj = NULL;
 	int focus_next = 0;
 
 	if (!sd->focused)
@@ -241,25 +240,25 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
 	  {
 	     if (forward)
 	       {
-		  for (l = sd->subobjs; l; l = l->next)
+		  EINA_LIST_FOREACH(sd->subobjs, l, sobj)
 		    {
-		       if (e_widget_can_focus_get(l->data))
+		       if (e_widget_can_focus_get(sobj))
 			 {
 			    if ((focus_next) &&
-				(!e_widget_disabled_get(l->data)))
+				(!e_widget_disabled_get(sobj)))
 			      {
 				 /* the previous focused item was unfocused - so focus
 				  * the next one (that can be focused) */
-				 if (e_widget_focus_jump(l->data, forward)) 
+				 if (e_widget_focus_jump(sobj, forward)) 
                                    return 1;
 				 else break;
 			      }
 			    else
 			      {
-				 if (e_widget_focus_get(l->data))
+				 if (e_widget_focus_get(sobj))
 				   {
 				      /* jump to the next focused item or focus this item */
-				      if (e_widget_focus_jump(l->data, forward)) 
+				      if (e_widget_focus_jump(sobj, forward)) 
                                         return 1;
 				      /* it returned 0 - it got to the last item and is past it */
 				      focus_next = 1;
@@ -270,25 +269,25 @@ e_widget_focus_jump(Evas_Object *obj, int forward)
 	       }
 	     else
 	       {
-		  for (l = eina_list_last(sd->subobjs); l; l = l->prev)
+		  EINA_LIST_REVERSE_FOREACH(sd->subobjs, l, sobj)
 		    {
-		       if (e_widget_can_focus_get(l->data))
+		       if (e_widget_can_focus_get(sobj))
 			 {
 			    if ((focus_next) &&
-				(!e_widget_disabled_get(l->data)))
+				(!e_widget_disabled_get(sobj)))
 			      {
 				 /* the previous focused item was unfocused - so focus
 				  * the next one (that can be focused) */
-				 if (e_widget_focus_jump(l->data, forward)) 
+				 if (e_widget_focus_jump(sobj, forward)) 
                                    return 1;
 				 else break;
 			      }
 			    else
 			      {
-				 if (e_widget_focus_get(l->data))
+				 if (e_widget_focus_get(sobj))
 				   {
 				      /* jump to the next focused item or focus this item */
-				      if (e_widget_focus_jump(l->data, forward)) 
+				      if (e_widget_focus_jump(sobj, forward)) 
                                         return 1;
 				      /* it returned 0 - it got to the last item and is past it */
 				      focus_next = 1;
@@ -321,27 +320,28 @@ e_widget_focus_set(Evas_Object *obj, int first)
    else
      {
 	Eina_List *l = NULL;
+	Evas_Object *sobj;
 
 	if (first)
 	  {
-	     for (l = sd->subobjs; l; l = l->next)
+	     EINA_LIST_FOREACH(sd->subobjs, l, sobj)
 	       {
-		  if ((e_widget_can_focus_get(l->data)) &&
-		      (!e_widget_disabled_get(l->data)))
+		  if ((e_widget_can_focus_get(sobj)) &&
+		      (!e_widget_disabled_get(sobj)))
 		    {
-		       e_widget_focus_set(l->data, first);
+		       e_widget_focus_set(sobj, first);
 		       break;
 		    }
 	       }
 	  }
 	else
 	  {
-	     for (l = eina_list_last(sd->subobjs); l; l = l->prev)
+	     EINA_LIST_REVERSE_FOREACH(sd->subobjs, l, sobj)
 	       {
-		  if ((e_widget_can_focus_get(l->data)) &&
-		      (!e_widget_disabled_get(l->data)))
+		  if ((e_widget_can_focus_get(sobj)) &&
+		      (!e_widget_disabled_get(sobj)))
 		    {
-		       e_widget_focus_set(l->data, first);
+		       e_widget_focus_set(sobj, first);
 		       break;
 		    }
 	       }
@@ -360,15 +360,16 @@ EAPI void
 e_widget_focused_object_clear(Evas_Object *obj)
 {
    Eina_List *l = NULL;
+   Evas_Object *sobj = NULL;
 
    API_ENTRY return;
    if (!sd->focused) return;
    sd->focused = 0;
-   for (l = sd->subobjs; l; l = l->next)
+   EINA_LIST_FOREACH(sd->subobjs, l, sobj)
      {
-	if (e_widget_focus_get(l->data))
+	if (e_widget_focus_get(sobj))
 	  {
-	     e_widget_focused_object_clear(l->data);
+	     e_widget_focused_object_clear(sobj);
 	     break;
 	  }
      }
@@ -416,7 +417,7 @@ EAPI void
 e_widget_change(Evas_Object *obj)
 {
    API_ENTRY return;
-   e_widget_change(e_widget_parent_get(obj));
+   if (sd->parent_obj) e_widget_change(sd->parent_obj);
    if (sd->on_change_func) sd->on_change_func(sd->on_change_data, obj);
 }
 
@@ -424,8 +425,7 @@ EAPI void
 e_widget_disabled_set(Evas_Object *obj, int disabled)
 {
    API_ENTRY return;
-   if (((sd->disabled) && (disabled)) ||
-       ((!sd->disabled) && (!disabled))) return;
+   if (sd->disabled == disabled) return;
    sd->disabled = disabled;
    if (sd->focused)
      {
@@ -462,7 +462,7 @@ e_widget_pointer_get(Evas_Object *obj)
 }
 
 EAPI void
-e_widget_min_size_resize(Evas_Object *obj)
+e_widget_size_min_resize(Evas_Object *obj)
 {
    API_ENTRY return;
    evas_object_resize(obj, sd->minw, sd->minh);
@@ -497,16 +497,9 @@ _e_smart_add(Evas_Object *obj)
 static void
 _e_smart_del(Evas_Object *obj)
 {
-   Evas_Object *sobj = NULL;
-
    INTERNAL_ENTRY;
    if (sd->del_func) sd->del_func(obj);
-   while (sd->subobjs)
-     {
-	sobj = sd->subobjs->data;
-	sd->subobjs = eina_list_remove_list(sd->subobjs, sd->subobjs);
-	evas_object_del(sobj);
-     }
+   E_FREE_LIST(sd->subobjs, evas_object_del);
    free(sd);
 }
 
@@ -532,35 +525,40 @@ static void
 _e_smart_show(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_show(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_show(sd->resize_obj);
 }
 
 static void
 _e_smart_hide(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_hide(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_hide(sd->resize_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->resize_obj, r, g, b, a);
+   if (sd->resize_obj)
+     evas_object_color_set(sd->resize_obj, r, g, b, a);
 }
 
 static void
 _e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_set(sd->resize_obj, clip);
+   if (sd->resize_obj)
+     evas_object_clip_set(sd->resize_obj, clip);
 }
 
 static void
 _e_smart_clip_unset(Evas_Object *obj)
 {
    INTERNAL_ENTRY;
-   evas_object_clip_unset(sd->resize_obj);
+   if (sd->resize_obj)
+     evas_object_clip_unset(sd->resize_obj);
 }  
 
 /* never need to touch this */
diff --git a/src/bin/e_widget.h b/src/bin/e_widget.h
index f51b943..87877bc 100644
--- a/src/bin/e_widget.h
+++ b/src/bin/e_widget.h
@@ -15,8 +15,8 @@ EAPI void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data,
 EAPI void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
 EAPI void e_widget_data_set(Evas_Object *obj, void *data);
 EAPI void *e_widget_data_get(Evas_Object *obj);
-EAPI void e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
-EAPI void e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
+EAPI void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
 EAPI void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj);
 EAPI void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);  
 EAPI void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj);
@@ -34,7 +34,7 @@ EAPI void e_widget_change(Evas_Object *obj);
 EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled);
 EAPI int  e_widget_disabled_get(Evas_Object *obj);
 EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj);
-EAPI void e_widget_min_size_resize(Evas_Object *obj);
+EAPI void e_widget_size_min_resize(Evas_Object *obj);
 
 #endif
 #endif
diff --git a/src/bin/e_widget_aspect.c b/src/bin/e_widget_aspect.c
index 0454152..480ff0e 100644
--- a/src/bin/e_widget_aspect.c
+++ b/src/bin/e_widget_aspect.c
@@ -125,8 +125,8 @@ e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child)
    if (!wd) return;
 
    wd->child = child;
-   e_widget_min_size_get(child, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(child, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, child);
    _e_wid_reconfigure(wd);
 }
diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index 89ecc1e..a967082 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -56,7 +56,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
 			   "e/widgets/button");
    edje_object_signal_callback_add(o, "e,action,click", "", 
 				   _e_wid_signal_cb1, obj);
-   if (label && label[0] != 0)
+   if ((label) && (label[0] != 0))
      {
 	edje_object_part_text_set(o, "e.text.label", label);
 	wd->type |= E_WIDGET_BUTTON_TEXT;
@@ -81,7 +81,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
 
    _e_wid_button_state_send(wd);
    edje_object_size_min_calc(wd->o_button, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    return obj;
 }
@@ -93,7 +93,7 @@ e_widget_button_label_set(Evas_Object *obj, const char *label)
 
    wd = e_widget_data_get(obj);
    edje_object_part_text_set(wd->o_button, "e.text.label", label);
-   if (label && label[0] != 0)
+   if ((label) && (label[0] != 0))
      wd->type |= E_WIDGET_BUTTON_TEXT;
    else
      wd->type = ~(wd->type & E_WIDGET_BUTTON_TEXT);
@@ -197,7 +197,7 @@ _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info)
 static void
 _e_wid_button_state_send(E_Widget_Data *wd)
 {
-   if (!wd || !wd->o_button) return;
+   if ((!wd) || (!wd->o_button)) return;
    if (wd->type & E_WIDGET_BUTTON_TEXT)
      {
 	if (wd->type & E_WIDGET_BUTTON_ICON)
diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c
index c52841a..be18e3c 100644
--- a/src/bin/e_widget_check.c
+++ b/src/bin/e_widget_check.c
@@ -47,7 +47,7 @@ e_widget_check_add(Evas *evas, const char *label, int *val)
    edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if (wd->valptr)
      {
 	if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");
@@ -138,7 +138,7 @@ e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int ico
      }
    
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if (wd->valptr)
      {
 	if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");
diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c
index 3a1971c..c219f8a 100644
--- a/src/bin/e_widget_color_well.c
+++ b/src/bin/e_widget_color_well.c
@@ -152,7 +152,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog)
    evas_object_show(o); 
    wd->o_edje = o;
 
-   e_widget_min_size_set(obj, 50, 50);
+   e_widget_size_min_set(obj, 50, 50);
 
    o = evas_object_rectangle_add(evas);
    e_widget_sub_object_add(obj, o);
diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c
index 099077b..41d13b9 100644
--- a/src/bin/e_widget_config_list.c
+++ b/src/bin/e_widget_config_list.c
@@ -57,7 +57,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL);
    wd->gui.entry = o;
    e_widget_disabled_set(o, 1);
-   e_widget_min_size_set(o, 100, 25);
+   e_widget_size_min_set(o, 100, 25);
    e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0);
 
    o = e_widget_button_add(evas, _("Add"), "list-add", _button_cb_add,
@@ -75,7 +75,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    o = e_widget_ilist_add(evas, 0, 0, NULL);
    wd->gui.list = o;
    e_widget_disabled_set(o, 1);
-   e_widget_min_size_set(o, 80, 40);
+   e_widget_size_min_set(o, 80, 40);
    e_widget_on_change_hook_set(o, _list_cb_change, wd);
    e_widget_ilist_go(o);
    e_widget_table_object_append(wd->gui.table, o, 0, 4, 2, 1, 1, 1, 1, 1);
@@ -92,8 +92,8 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    e_widget_disabled_set(o, 1);
    e_widget_table_object_append(wd->gui.table, o, 1, 5, 1, 1, 1, 0, 1, 0);
 
-   e_widget_min_size_get(wd->gui.table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->gui.table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_resize_object_set(obj, wd->gui.table);
 
    return obj;
@@ -150,8 +150,8 @@ e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
    e_widget_table_object_append(wd->gui.table, sobj, col, row, 
 				colspan, rowspan, fill_w, fill_h, 
 				expand_w, expand_h);
-   e_widget_min_size_get(wd->gui.table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->gui.table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
 }
 
 /* Private Function defs */
diff --git a/src/bin/e_widget_csel.c b/src/bin/e_widget_csel.c
index cb528b7..c1aa18e 100644
--- a/src/bin/e_widget_csel.c
+++ b/src/bin/e_widget_csel.c
@@ -51,6 +51,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 {
    E_Widget_Data *wd = data;
    Eina_List *l;
+   Evas_Object *eo, *so;
    int i;
    int changed = -1;
 
@@ -59,9 +60,10 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
    wd->changing = 1;
 
    /* entry changed */
-   for (l = wd->entries, i = 0; l; l = l->next, i++)
+   i = 0;
+   EINA_LIST_FOREACH(wd->entries, l, eo)
      {
-	if (o == l->data)
+	if (o == eo)
 	  {
 	     changed = i;
 	     switch (i)
@@ -99,6 +101,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 	       }
 	     break;
 	  }
+	i++;
      }
 
    if (changed != -1)
@@ -116,9 +119,9 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 
 
    /* update the sliders */
-   for (l = wd->sliders, i = 0; l; l = l->next, i++)
+   i = 0;
+   EINA_LIST_FOREACH(wd->sliders, l, so)
      {
-	Evas_Object *so = l->data;
 	if (o != so)
 	  {
 	     e_widget_cslider_update(so);
@@ -127,6 +130,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 	  {
 	     changed = i;
 	  }
+	i++;
      }
 
    /* update the spectrum */
@@ -143,10 +147,11 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
    e_widget_color_well_update(wd->well);
 
    /* now update the text fields to show current values */
-   for (l = wd->entries, i = 0; l; l = l->next, i++)
+   i = 0;
+   EINA_LIST_FOREACH(wd->entries, l, eo)
      {
 	char buf[10];
-	if (o == l->data) continue;
+	if (o == eo) continue;
 	switch (i)
 	  {
 	   case E_COLOR_COMPONENT_R:
@@ -168,7 +173,7 @@ _e_wid_cb_color_changed(void *data, Evas_Object *o)
 	      snprintf(buf, 10, "%.2f", wd->cv->v);
 	      break;
 	  }
-	e_widget_entry_text_set((Evas_Object *)(l->data), buf);
+	e_widget_entry_text_set(eo, buf);
      }
 
    wd->changing = 0;
@@ -261,7 +266,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
    o = e_widget_cslider_add(evas, wd->mode, wd->cv, 1, 1);
    e_widget_sub_object_add(obj, o);
    e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
-   e_widget_min_size_set(o, 30, 50);
+   e_widget_size_min_set(o, 30, 50);
    evas_object_show(o);
    wd->vert = o;
    e_widget_table_object_append(table, o, 2, 1, 1, 1, 0, 1, 0, 1);
diff --git a/src/bin/e_widget_cslider.c b/src/bin/e_widget_cslider.c
index b6f362a..ac6694f 100644
--- a/src/bin/e_widget_cslider.c
+++ b/src/bin/e_widget_cslider.c
@@ -67,7 +67,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
      edje_object_signal_emit(o, "e,state,direction,h", "e");
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    e_widget_sub_object_add(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
diff --git a/src/bin/e_widget_desk_preview.c b/src/bin/e_widget_desk_preview.c
index a464221..c193814 100644
--- a/src/bin/e_widget_desk_preview.c
+++ b/src/bin/e_widget_desk_preview.c
@@ -36,16 +36,15 @@ _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
    Eina_List *l;
+   Evas_Object *o;
 
    wd = e_widget_data_get(obj);
    if (!wd) return;
 
    if (wd->update_handler) ecore_event_handler_del(wd->update_handler);
-   for (l = wd->desks; l; l = l->next)
+   EINA_LIST_FOREACH(wd->desks, l, o)
      {
-	Evas_Object *o;
 	E_Widget_Desk_Data *dd;
-	o = l->data;
 	dd = e_widget_data_get(o);
 	e_thumb_icon_end(o);
      }
@@ -124,6 +123,7 @@ static void
 _e_wid_reconfigure(E_Widget_Data *wd)
 {
    Eina_List *l, *delete = NULL;
+   Evas_Object *dw;
    int x, y;
    int aw, ah; /* available */
    int mw, mh; /* min size for each desk */
@@ -166,13 +166,12 @@ _e_wid_reconfigure(E_Widget_Data *wd)
      tw = 300;
    th = (tw * zone->h) / zone->w;
 
-   for (l = wd->desks; l; l = l->next)
+   EINA_LIST_FOREACH(wd->desks, l, dw)
      {
-	Evas_Object *dw = l->data;
 	E_Widget_Desk_Data *dd = e_widget_data_get(dw);
 	if (dd->x < nx && dd->y < ny)
 	  {
-	     e_widget_min_size_set(dw, mw, mh);
+	     e_widget_size_min_set(dw, mw, mh);
 	     e_widget_table_object_repack(wd->table, dw, dd->x, dd->y, 1, 1, 1, 1, 1, 1);
 	     e_thumb_icon_size_set(dd->thumb, tw, th);
 	     e_thumb_icon_rethumb(dd->thumb); 
@@ -182,13 +181,11 @@ _e_wid_reconfigure(E_Widget_Data *wd)
 	     delete = eina_list_append(delete, dw);
 	  }
      }
-   while (delete)
+   EINA_LIST_FREE(delete, dw)
      {
-	Evas_Object *dw = delete->data;
 	e_widget_table_unpack(wd->table, dw);
 	evas_object_del(dw);
 	wd->desks = eina_list_remove(wd->desks, dw);
-	delete = eina_list_remove_list(delete, delete);
      }
 
    for (y = 0; y < ny; y++)
@@ -201,7 +198,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
 	     Evas_Object *dw;
 
 	     dw = e_widget_deskpreview_desk_add(evas_object_evas_get(wd->obj), zone, x, y, tw, th);
-	     e_widget_min_size_set(dw, mw, mh);
+	     e_widget_size_min_set(dw, mw, mh);
 
 	     e_widget_table_object_append(wd->table, dw, x, y, 1, 1, 1, 1, 1, 1);
 	     wd->desks = eina_list_append(wd->desks, dw);
@@ -272,17 +269,16 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
    E_Event_Bg_Update *ev;
    E_Widget_Data *wd;
    Eina_List *l;
+   Evas_Object *o;
 
    if (type != E_EVENT_BG_UPDATE) return 1;
 
    wd = data;
    ev = event;
 
-   for (l = wd->desks; l; l = l->next)
+   EINA_LIST_FOREACH(wd->desks, l, o)
      {
-	Evas_Object *o;
 	E_Widget_Desk_Data *dd;
-	o = l->data;
 	dd = e_widget_data_get(o);
 
 	if (!dd) 
diff --git a/src/bin/e_widget_entry.c b/src/bin/e_widget_entry.c
index 21165cc..f99cbe8 100644
--- a/src/bin/e_widget_entry.c
+++ b/src/bin/e_widget_entry.c
@@ -63,8 +63,8 @@ EAPI Evas_Object
    if ((text_location) && (*text_location))
      e_entry_text_set(o, *text_location);
    
-   e_entry_min_size_get(o, &minw, &minh);
-   e_widget_min_size_set(obj, minw, minh);
+   e_entry_size_min_get(o, &minw, &minh);
+   e_widget_size_min_set(obj, minw, minh);
 
    wd->func = func;
    wd->data = data;
diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c
index 9db29f3..2bb1daf 100644
--- a/src/bin/e_widget_flist.c
+++ b/src/bin/e_widget_flist.c
@@ -80,7 +80,7 @@ e_widget_flist_add(Evas *evas)
                                   _e_wid_cb_selected, obj);
 
    evas_object_resize(obj, 32, 32);
-   e_widget_min_size_set(obj, 32, 32);
+   e_widget_size_min_set(obj, 32, 32);
    return obj;
 }
 
diff --git a/src/bin/e_widget_font_preview.c b/src/bin/e_widget_font_preview.c
index 98d414b..76f4d22 100644
--- a/src/bin/e_widget_font_preview.c
+++ b/src/bin/e_widget_font_preview.c
@@ -50,7 +50,7 @@ e_widget_font_preview_add(Evas *evas, const char *text)
    edje_object_part_text_set(wd->o_text, "e.fontpreview.text", text);
 
    evas_object_resize(obj, 40, 40);  
-   e_widget_min_size_set(obj, 40, 40);
+   e_widget_size_min_set(obj, 40, 40);
    
    return obj;
 }
diff --git a/src/bin/e_widget_framelist.c b/src/bin/e_widget_framelist.c
index 4fd6682..9351f02 100644
--- a/src/bin/e_widget_framelist.c
+++ b/src/bin/e_widget_framelist.c
@@ -47,7 +47,7 @@ e_widget_framelist_add(Evas *evas, const char *label, int horiz)
    evas_object_show(o);
    
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    
    return obj;
 }
@@ -61,7 +61,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
    wd = e_widget_data_get(obj);
    
    e_box_pack_end(wd->o_box, sobj);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_box_pack_options_set(sobj,
 			  1, 1, /* fill */
 			  1, 1, /* expand */
@@ -69,11 +69,11 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
 			  mw, mh, /* min */
 			  99999, 99999 /* max */
 			  );
-   e_box_min_size_get(wd->o_box, &mw, &mh);
+   e_box_size_min_get(wd->o_box, &mw, &mh);
    edje_extern_object_min_size_set(wd->o_box, mw, mh);
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }
diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c
index 9e148b7..6aac5da 100644
--- a/src/bin/e_widget_frametable.c
+++ b/src/bin/e_widget_frametable.c
@@ -46,7 +46,7 @@ e_widget_frametable_add(Evas *evas, const char *label, int homogenous)
    evas_object_show(o);
    
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    
    return obj;
 }
@@ -60,7 +60,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
    wd = e_widget_data_get(obj);
    
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			  fill_w, fill_h, /* fill */
 			  expand_w, expand_h, /* expand */
@@ -68,11 +68,11 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
 			  mw, mh, /* min */
 			  99999, 99999 /* max */
 			  );
-   e_table_min_size_get(wd->o_table, &mw, &mh);
+   e_table_size_min_get(wd->o_table, &mw, &mh);
    edje_extern_object_min_size_set(wd->o_table, mw, mh);
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }
diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c
index 0500c04..9849ce5 100644
--- a/src/bin/e_widget_fsel.c
+++ b/src/bin/e_widget_fsel.c
@@ -132,9 +132,8 @@ _e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj, void *event_in
    realpath = e_fm2_real_path_get(wd->o_files_fm);
    p1 = ecore_file_realpath(realpath);
    if (!p1) goto done;
-   for (l = icons; l; l = l->next)
+   EINA_LIST_FOREACH(icons, l, ici)
      {
-	ici = l->data;
 	if (ici->link)
 	  {
 	     p2 = ecore_file_realpath(ici->link);
@@ -168,7 +167,7 @@ _e_wid_fsel_favorites_selected(void *data, Evas_Object *obj, void *event_info)
    if (!wd->o_files_frame) return;
    selected = e_fm2_selected_list_get(wd->o_favorites_fm);
    if (!selected) return;
-   ici = selected->data;
+   ici = eina_list_data_get(selected);
    if ((ici->link) && (ici->mount))
      e_fm2_path_set(wd->o_files_fm, ici->link, "/");
    else if (ici->real_link)
@@ -219,7 +218,7 @@ _e_wid_fsel_files_selection_change(void *data, Evas_Object *obj, void *event_inf
    if (!wd->o_files_fm) return;
    selected = e_fm2_selected_list_get(wd->o_files_fm);
    if (!selected) return;
-   ici = selected->data;
+   ici = eina_list_data_get(selected);
    E_FREE(wd->path);
    realpath = e_fm2_real_path_get(wd->o_files_fm);
    if (!strcmp(realpath, "/"))
@@ -336,7 +335,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_size_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_size_entry,
 				     1, 0, 1, 1, 1, 1, 1, 1);
@@ -352,7 +351,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_owner_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_owner_entry, 
 				     1, 1, 1, 1, 1, 1, 1, 1);
@@ -368,7 +367,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_perms_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_perms_entry,
 				     1, 2, 1, 1, 1, 1, 1, 1);
@@ -384,7 +383,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_time_entry = o;
         e_widget_sub_object_add(obj, o); 
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_time_entry,
 				     1, 3, 1, 1, 1, 1, 1, 1);
@@ -429,7 +428,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    
    wd->o_favorites_frame = o;
    e_widget_sub_object_add(obj, o);
-   e_widget_min_size_set(o, 128, 128);
+   e_widget_size_min_set(o, 128, 128);
    e_widget_table_object_append(wd->o_table2, o, 0, 1, 1, 1, 1, 1, 0, 1);
 
    o = e_fm2_add(evas);
@@ -471,7 +470,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    
    wd->o_files_frame = o;
    e_widget_sub_object_add(obj, o);
-   e_widget_min_size_set(o, 128, 128);
+   e_widget_size_min_set(o, 128, 128);
    e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1);
 
    o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
@@ -496,8 +495,8 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    e_widget_table_object_append(wd->o_table, wd->o_entry,
                                 0, 1, 1, 1, 1, 0, 1, 0);
 
-   e_widget_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->o_table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
   
    evas_object_show(wd->o_favorites_add); 
    evas_object_show(wd->o_up_button);
@@ -533,7 +532,7 @@ e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path)
 
    if (!obj) return;
    wd = e_widget_data_get(obj);
-   return e_fm2_path_get(wd->o_files_fm, dev, path);
+   e_fm2_path_get(wd->o_files_fm, dev, path);
 }
 
 EAPI const char *
diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c
index 4edc702..2225015 100644
--- a/src/bin/e_widget_ilist.c
+++ b/src/bin/e_widget_ilist.c
@@ -69,7 +69,7 @@ _queue_timer(void *data)
      {
         E_Widget_Queue_Item *qi;
 
-        qi = wd->queue.queue->data;
+        qi = eina_list_data_get(wd->queue.queue);
         if (qi->command == 0)
           {
              E_Widget_Callback *wcb, *rcb;
@@ -246,7 +246,7 @@ _queue_clear(Evas_Object *obj)
 
    wd = e_widget_data_get(obj);
    while (wd->queue.queue)
-     _queue_remove(obj, wd->queue.queue->data, 1);
+     _queue_remove(obj, eina_list_data_get(wd->queue.queue), 1);
    if (wd->queue.timer) ecore_timer_del(wd->queue.timer);
    wd->queue.timer = NULL;
 }
@@ -286,7 +286,7 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value)
    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);
+   e_widget_size_min_set(obj, 32, 32);
    return obj;
 }
 
@@ -449,7 +449,7 @@ e_widget_ilist_go(Evas_Object *obj)
 
    wd = e_widget_data_get(obj);
    wd->o_widget = obj;
-   e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
+   e_ilist_size_min_get(wd->o_ilist, &mw, &mh);
    evas_object_resize(wd->o_ilist, mw, mh);
    e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
    evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
@@ -457,8 +457,8 @@ e_widget_ilist_go(Evas_Object *obj)
      {
 	Evas_Coord wmw, wmh;
 
-	e_widget_min_size_get(obj, &wmw, &wmh);
-	e_widget_min_size_set(obj, mw + (w - vw), wmh);
+	e_widget_size_min_get(obj, &wmw, &wmh);
+	e_widget_size_min_set(obj, mw + (w - vw), wmh);
      }
    else if (mw < vw)
      evas_object_resize(wd->o_ilist, vw,mh);
@@ -468,19 +468,16 @@ EAPI void
 e_widget_ilist_clear(Evas_Object *obj)
 {
    E_Widget_Data *wd;
+   E_Widget_Callback *wcb;
 
    wd = e_widget_data_get(obj);
    _queue_clear(obj);
    e_ilist_clear(wd->o_ilist);
    e_scrollframe_child_pos_set(wd->o_scrollframe, 0, 0);
-   while (wd->callbacks)
+   EINA_LIST_FREE(wd->callbacks, wcb)
      {
-	E_Widget_Callback *wcb;
-
-	wcb = wd->callbacks->data;
 	if (wcb->value) free(wcb->value);
 	free(wcb);
-	wd->callbacks = eina_list_remove_list(wd->callbacks, wd->callbacks);
      }
 }
 
@@ -729,7 +726,7 @@ e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h
    evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &ww, &hh);
    evas_object_resize(wd->o_scrollframe, 200, 200);
    e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
-   e_ilist_min_size_get(wd->o_ilist, &mw, &mh);
+   e_ilist_size_min_get(wd->o_ilist, &mw, &mh);
    evas_object_resize(wd->o_scrollframe, ww, hh);
    if (w) *w = 200 - vw + mw;
    if (h) *h = 200 - vh + mh;
@@ -739,17 +736,14 @@ static void
 _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
+   E_Widget_Callback *wcb;
 
    wd = e_widget_data_get(obj);
    _queue_clear(obj);
-   while (wd->callbacks)
+   EINA_LIST_FREE(wd->callbacks, wcb)
      {
-	E_Widget_Callback *wcb;
-
-	wcb = wd->callbacks->data;
 	if (wcb->value) free(wcb->value);
 	free(wcb);
-	wd->callbacks = eina_list_remove_list(wd->callbacks, wd->callbacks);
      }
    free(wd);
 }
@@ -778,7 +772,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
    Evas_Coord mw, mh, vw, vh, w, h;
 
    e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
-   e_ilist_min_size_get(data, &mw, &mh);
+   e_ilist_size_min_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
    if (vw >= mw)
      {
diff --git a/src/bin/e_widget_image.c b/src/bin/e_widget_image.c
index 08db83e..5f6c0ed 100644
--- a/src/bin/e_widget_image.c
+++ b/src/bin/e_widget_image.c
@@ -37,9 +37,9 @@ e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int mi
    wd->minh = minh <= 0 ? minh : 0;
    edje_object_size_min_get(object, &mw, &mh);
    if (minw || minh)
-     e_widget_min_size_set(obj, minw, minh);
+     e_widget_size_min_set(obj, minw, minh);
    else
-     e_widget_min_size_set(obj, mw, mh);
+     e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
       
@@ -65,7 +65,7 @@ e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh)
    evas_object_show(o);
    e_widget_data_set(obj, wd);   
    e_widget_can_focus_set(obj, 0);
-   e_widget_min_size_set(obj, minw, minh);
+   e_widget_size_min_set(obj, minw, minh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
    
@@ -112,9 +112,9 @@ e_widget_image_object_set(Evas_Object *obj, Evas_Object *o)
    e_icon_object_set(wd->img, o);
    edje_object_size_min_get(o, &mw, &mh);
    if (wd->minw || wd->minh)
-     e_widget_min_size_set(obj, wd->minw, wd->minh);
+     e_widget_size_min_set(obj, wd->minw, wd->minh);
    else
-     e_widget_min_size_set(obj, mw, mh);
+     e_widget_size_min_set(obj, mw, mh);
    evas_object_show(wd->img);
 }
 
diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c
index e1ca180..60d2486 100644
--- a/src/bin/e_widget_label.c
+++ b/src/bin/e_widget_label.c
@@ -35,7 +35,7 @@ e_widget_label_add(Evas *evas, const char *label)
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
    e_widget_can_focus_set(obj, 0);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
       
diff --git a/src/bin/e_widget_list.c b/src/bin/e_widget_list.c
index 5e93f01..e072d2a 100644
--- a/src/bin/e_widget_list.c
+++ b/src/bin/e_widget_list.c
@@ -47,7 +47,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
    
    e_box_pack_end(wd->o_box, sobj);
    mw = mh = 0;
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    if (e_box_orientation_get(wd->o_box) == 1)
      e_box_pack_options_set(sobj,
 			    1, fill, /* fill */
@@ -64,8 +64,8 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
 			    mw, mh, /* min */
 			    99999, 99999 /* max */
 			    );
-   e_box_min_size_get(wd->o_box, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_box_size_min_get(wd->o_box, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }
diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c
index d03c1a9..e8d91ec 100644
--- a/src/bin/e_widget_preview.c
+++ b/src/bin/e_widget_preview.c
@@ -47,7 +47,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
    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_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
 
    return obj;
@@ -137,7 +137,7 @@ _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info)
    /* edje_extern_object_max_size_set(wd->img, w, h); */
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
    edje_object_size_min_calc(wd->o_frame, &w, &h);
-   e_widget_min_size_set(wd->obj, w, h);
+   e_widget_size_min_set(wd->obj, w, h);
    evas_object_resize(wd->obj, w, h);
    evas_object_smart_callback_call(wd->obj, "preview_update", NULL);
 }
diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c
index 8a440fc..9c3bfbf 100644
--- a/src/bin/e_widget_radio.c
+++ b/src/bin/e_widget_radio.c
@@ -64,7 +64,7 @@ e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *gro
    edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if ((wd->group) && (wd->group->valptr))
      {
 	if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");
@@ -125,7 +125,7 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico
      }
   
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if ((wd->group) && (wd->group->valptr))
      {
 	if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");
@@ -153,12 +153,13 @@ e_widget_radio_toggle_set(Evas_Object *obj, int toggle)
    if (toggle)
      {
 	Eina_List *l;
+	Evas_Object *sobj;
 	
-	for (l = wd->group->radios; l; l = l->next)
+	EINA_LIST_FOREACH(wd->group->radios, l, sobj)
 	  {
-	     if (l->data != obj)
+	     if (sobj != obj)
 	       {
-		  wd = e_widget_data_get(l->data);
+		  wd = e_widget_data_get(sobj);
 		  if (wd->valnum == *(wd->group->valptr))
 		    {
 		       edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
@@ -217,13 +218,14 @@ _e_wid_do(Evas_Object *obj)
    if ((wd->group) && (wd->group->valptr))
      {
 	Eina_List *l;
+	Evas_Object *sobj;
 	int toggled = 0;
 	
-	for (l = wd->group->radios; l; l = l->next)
+	EINA_LIST_FOREACH(wd->group->radios, l, sobj)
 	  {
-	     if (l->data != obj)
+	     if (sobj != obj)
 	       {
-		  wd = e_widget_data_get(l->data);
+		  wd = e_widget_data_get(sobj);
 		  if (wd->valnum == *(wd->group->valptr))
 		    {
 		       edje_object_signal_emit(wd->o_radio, "e,state,off", "e");
diff --git a/src/bin/e_widget_scrollframe.c b/src/bin/e_widget_scrollframe.c
index 375b7a9..fcdd510 100644
--- a/src/bin/e_widget_scrollframe.c
+++ b/src/bin/e_widget_scrollframe.c
@@ -165,7 +165,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
    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);
+   e_widget_size_min_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
    if (vw >= mw)
      {
diff --git a/src/bin/e_widget_slider.c b/src/bin/e_widget_slider.c
index b46c5b1..a388711 100644
--- a/src/bin/e_widget_slider.c
+++ b/src/bin/e_widget_slider.c
@@ -50,11 +50,11 @@ e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min,
    if (dval) e_slider_value_set(o, *dval);
    else if (ival) e_slider_value_set(o, *ival);
    
-   e_slider_min_size_get(o, &mw, &mh);
+   e_slider_size_min_get(o, &mw, &mh);
    if (horiz)
-     e_widget_min_size_set(obj, mw + size, mh);
+     e_widget_size_min_set(obj, mw + size, mh);
    else
-     e_widget_min_size_set(obj, mw, mh + size);
+     e_widget_size_min_set(obj, mw, mh + size);
    
    wd->dval = dval;
    wd->ival = ival;
diff --git a/src/bin/e_widget_spectrum.c b/src/bin/e_widget_spectrum.c
index 5968c47..a56be6b 100644
--- a/src/bin/e_widget_spectrum.c
+++ b/src/bin/e_widget_spectrum.c
@@ -58,7 +58,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv)
 
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    e_widget_sub_object_add(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);
diff --git a/src/bin/e_widget_table.c b/src/bin/e_widget_table.c
index 52559d5..0e18d75 100644
--- a/src/bin/e_widget_table.c
+++ b/src/bin/e_widget_table.c
@@ -54,7 +54,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col,
    wd = e_widget_data_get(obj);
    
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			  fill_w, fill_h, /* fill */
 			  expand_w, expand_h, /* expand */
@@ -62,8 +62,8 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col,
 			  mw, mh, /* min */
 			  99999, 99999 /* max */
 			  );
-   e_table_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_table_size_min_get(wd->o_table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }
@@ -78,7 +78,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r
    
    e_table_unpack(sobj);
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			    fill_w, fill_h, /* fill */
 			    expand_w, expand_h, /* expand */
@@ -86,8 +86,8 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r
 			    mw, mh, /* min */
 			    99999, 99999 /* max */
 			    );
-   e_table_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_table_size_min_get(wd->o_table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
 }
 
 EAPI void
diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c
index c3d2dbf..a9223f7 100644
--- a/src/bin/e_widget_textblock.c
+++ b/src/bin/e_widget_textblock.c
@@ -45,7 +45,7 @@ e_widget_textblock_add(Evas *evas)
    evas_object_show(o);
 		       
    evas_object_resize(obj, 32, 32);
-   e_widget_min_size_set(obj, 32, 32);
+   e_widget_size_min_set(obj, 32, 32);
    return obj;
 }
 
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index 6f2a5dc..37e1bd9 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -84,7 +84,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h)
 
    edje_object_size_min_calc
      (e_scrollframe_edje_object_get(wd->o_base), &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    return obj;
 }
@@ -127,14 +127,14 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
 			  mw, mh, /* min */
 			  9999, 9999 /* max */
 			  );
-   e_box_min_size_get(wd->o_box, &mw, &mh);
+   e_box_size_min_get(wd->o_box, &mw, &mh);
    evas_object_resize(wd->o_box, mw, mh);
    evas_object_resize(wd->o_base, 500, 500);
    e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
    if (wd->scrollable)
-     e_widget_min_size_set(obj, 500 - vw, mh + (500 - vh));
+     e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
    else
-     e_widget_min_size_set(obj, mw + (500 - vw), mh + (500 - vh));
+     e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
 }
 
 EAPI void
@@ -209,14 +209,14 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
 
    wd = e_widget_data_get(obj);
    wd->scrollable = scrollable;
-   e_box_min_size_get(wd->o_box, &mw, &mh);
+   e_box_size_min_get(wd->o_box, &mw, &mh);
    evas_object_resize(wd->o_box, mw, mh);
    evas_object_resize(wd->o_base, 500, 500);
    e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
    if (wd->scrollable)
-     e_widget_min_size_set(obj, 500 - vw, mh + (500 - vh));
+     e_widget_size_min_set(obj, 500 - vw, mh + (500 - vh));
    else
-     e_widget_min_size_set(obj, mw + (500 - vw), mh + (500 - vh));
+     e_widget_size_min_set(obj, mw + (500 - vw), mh + (500 - vh));
 }
 
 EAPI void
@@ -298,11 +298,11 @@ _e_wid_disable_hook(Evas_Object *obj)
 
    wd = e_widget_data_get(obj);
    if (e_widget_disabled_get(obj))
-     edje_object_signal_emit
-     (e_scrollframe_edje_object_get(wd->o_base), "e,state,disabled", "e");
+     edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_base), 
+                             "e,state,disabled", "e");
    else
-     edje_object_signal_emit
-     (e_scrollframe_edje_object_get(wd->o_base), "e,state,enabled", "e");
+     edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_base), 
+                             "e,state,enabled", "e");
 }
 
 static void
@@ -335,11 +335,10 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
    Item *it;
 
    wd = e_widget_data_get(data);
-
-   if (wd->o_base == NULL || wd->o_box == NULL) return ;
+   if ((!wd->o_base) || (!wd->o_box)) return;
 
    e_scrollframe_child_viewport_size_get(wd->o_base, &vw, &vh);
-   e_box_min_size_get(wd->o_box, &mw, &mh);
+   e_box_size_min_get(wd->o_box, &mw, &mh);
    evas_object_geometry_get(wd->o_box, NULL, NULL, &w, &h);
    if (vw >= mw)
      {
@@ -467,7 +466,7 @@ _item_select(Item *it)
    edje_object_signal_emit(it->o_base, "e,state,selected", "e");
    edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
    _item_show(it);
-   if (it->func) it->func(it->data1, it->data2);
+   if (it->func) it->func((void *)it->data1, (void *)it->data2);
 }
 
 static void
diff --git a/src/bin/e_widget_toolbook.c b/src/bin/e_widget_toolbook.c
index 1c95a9a..7607260 100644
--- a/src/bin/e_widget_toolbook.c
+++ b/src/bin/e_widget_toolbook.c
@@ -19,11 +19,10 @@ e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h)
 {
    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));
+   wd = E_NEW(E_Widget_Data, 1);
    e_widget_data_set(obj, wd);
    wd->o_widget = obj;
 
@@ -32,7 +31,7 @@ e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h)
    evas_object_show(o);
    e_widget_sub_object_add(obj, o);
    wd->o_tb = o;
-   
+
    o = e_widget_toolbar_add(evas, icon_w, icon_h);
    e_widget_table_object_append(wd->o_tb, o, 0, 0, 1, 1, 1, 1, 1, 0);
    wd->o_bar = o;
@@ -50,21 +49,20 @@ e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const ch
    wd = e_widget_data_get(toolbook);
    e_widget_toolbar_item_append(wd->o_bar, icon, label, _item_sel, 
                                 toolbook, content);
-   e_widget_table_object_align_append(wd->o_tb, content, 
-                                      0, 1, 1, 1, 
+   e_widget_table_object_align_append(wd->o_tb, content, 0, 1, 1, 1, 
                                       fill_w, fill_h, expand_w, expand_h, 
                                       ax, ay);
    evas_object_hide(content);
    wd->content = eina_list_append(wd->content, content);
-   e_widget_min_size_get(wd->o_tb, &minw, &minh);
-   e_widget_min_size_set(toolbook, minw, minh);
+   e_widget_size_min_get(wd->o_tb, &minw, &minh);
+   e_widget_size_min_set(toolbook, minw, minh);
 }
 
 EAPI void
 e_widget_toolbook_page_show(Evas_Object *toolbook, int n)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(toolbook);
    e_widget_toolbar_item_select(wd->o_bar, n);
 }
@@ -74,28 +72,25 @@ static void
 _e_wid_del_hook(Evas_Object *obj)
 {
    E_Widget_Data *wd;
-   
+
    wd = e_widget_data_get(obj);
    eina_list_free(wd->content);
-   free(wd);
+   E_FREE(wd);
 }
 
 static void
 _item_sel(void *data1, void *data2)
 {
    E_Widget_Data *wd;
-   Evas_Object *obj, *sobj;
+   Evas_Object *o, *obj, *sobj;
    Eina_List *l;
-   
+
    obj = data1;
    sobj = data2;
    wd = e_widget_data_get(obj);
-   
-   for (l = wd->content; l; l = l->next)
+
+   EINA_LIST_FOREACH(wd->content, l, o) 
      {
-        Evas_Object *o;
-        
-        o = l->data;
         if (o == sobj) evas_object_show(o);
         else evas_object_hide(o);
      }
diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c
index 67fe361..3fcff6b 100644
--- a/src/bin/e_xinerama.c
+++ b/src/bin/e_xinerama.c
@@ -51,7 +51,7 @@ e_xinerama_fake_screen_add(int x, int y, int w, int h)
 {
    E_Screen *scr;
 
-   scr = calloc(1, sizeof(E_Screen));
+   scr = E_NEW(E_Screen, 1);
    scr->screen = eina_list_count(fake_screens);
    scr->escreen = scr->screen;
    scr->x = x;
@@ -65,20 +65,9 @@ e_xinerama_fake_screen_add(int x, int y, int w, int h)
 static void
 _e_xinerama_clean(void)
 {
-   while (all_screens)
-     {
-	free(all_screens->data);
-	all_screens = eina_list_remove_list(all_screens, all_screens);
-     }
-   while (chosen_screens)
-     {
-	chosen_screens = eina_list_remove_list(chosen_screens, chosen_screens);
-     }
-   while (fake_screens)
-     {
-	free(fake_screens->data);
-	fake_screens = eina_list_remove_list(fake_screens, fake_screens);
-     }
+   E_FREE_LIST(all_screens, E_FREE);
+   eina_list_free(chosen_screens);
+   E_FREE_LIST(fake_screens, E_FREE);
 }
 
 static void
@@ -87,6 +76,7 @@ _e_xinerama_update(void)
    int n;
    Ecore_X_Window *roots;
    Eina_List *l;
+   E_Screen *scr;
 
    roots = ecore_x_window_root_list(&n);
    if (roots)
@@ -112,7 +102,7 @@ _e_xinerama_update(void)
 	  {
 	     E_Screen *scr;
 
-	     scr = calloc(1, sizeof(E_Screen));
+	     scr = E_NEW(E_Screen, 1);
 	     scr->screen = 0;
 	     scr->x = 0;
 	     scr->y = 0;
@@ -134,7 +124,7 @@ _e_xinerama_update(void)
 		       printf("E17 INIT: XINERAMA SCREEN: [%i], %ix%i+%i+%i\n",
 			      i, w, h, x, y);
 		       /* add it to our list */
-		       scr = calloc(1, sizeof(E_Screen));
+		       scr = E_NEW(E_Screen, 1);
 		       scr->screen = i;
 		       scr->x = x;
 		       scr->y = y;
@@ -146,22 +136,17 @@ _e_xinerama_update(void)
 	  }
      }
    /* now go through all_screens... and build a list of chosen screens */
-   for (l = all_screens; l; l = l->next)
+   EINA_LIST_FOREACH(all_screens, l, scr)
      {
 	Eina_List *ll;
-	E_Screen *scr;
-	int add = 0;
+	E_Screen *scr2;
+	int add = 1;
 	Eina_List *removes;
 
-	scr = l->data;
-	add = 1;
 	removes = NULL;
 	/* does this screen intersect with any we have chosen? */
-	for (ll = chosen_screens; ll; ll = ll->next)
+	EINA_LIST_FOREACH(chosen_screens, ll, scr2)
 	  {
-	     E_Screen *scr2;
-
-	     scr2 = ll->data;
 	     /* if they intersect */
 	     if (E_INTERSECTS(scr->x, scr->y, scr->w, scr->h,
 			      scr2->x, scr2->y, scr2->w, scr2->h))
@@ -180,10 +165,9 @@ _e_xinerama_update(void)
 	       }
 	  }
 	/* if there are screens to remove - remove them */
-	while (removes)
+	EINA_LIST_FREE(removes, scr2)
 	  {
-	     chosen_screens = eina_list_remove(chosen_screens, removes->data);
-	     removes = eina_list_remove_list(removes, removes);
+	     chosen_screens = eina_list_remove(chosen_screens, scr2);
 	  }
 	/* if this screen is to be added, add it */
 	if (add)
@@ -192,14 +176,13 @@ _e_xinerama_update(void)
    chosen_screens = eina_list_sort(chosen_screens,
 				   eina_list_count(chosen_screens),
 				   _e_xinerama_cb_screen_sort);
-   for (n = 0, l = chosen_screens; l; l = l->next, n++)
+   n = 0;
+   EINA_LIST_FOREACH(chosen_screens, l, scr)
      {
-        E_Screen *scr;
-
-	scr = l->data;
 	printf("E17 INIT: XINERAMA CHOSEN: [%i], %ix%i+%i+%i\n",
 	       scr->screen, scr->w, scr->h, scr->x, scr->y);
 	scr->escreen = n;
+	n++;
      }
 }
 
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 4c0c502..f5108f8 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -13,6 +13,8 @@ static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, voi
 static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev);
 static int  _e_zone_cb_mouse_in(void *data, int type, void *event);
 static int  _e_zone_cb_mouse_out(void *data, int type, void *event);
+static int  _e_zone_cb_mouse_down(void *data, int type, void *event);
+static int  _e_zone_cb_mouse_up(void *data, int type, void *event);
 static int  _e_zone_cb_mouse_move(void *data, int type, void *event);
 static int  _e_zone_cb_desk_after_show(void *data, int type, void *event);
 static int  _e_zone_cb_edge_timer(void *data);
@@ -110,32 +112,10 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
    zone->corner.bottom_left = ecore_x_window_input_new(con->win,
 	 zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
 
-   e_container_window_raise(zone->container, zone->corner.left_bottom, 999);
-   e_container_window_raise(zone->container, zone->corner.left_top, 999);
-   e_container_window_raise(zone->container, zone->corner.top_left, 999);
-   e_container_window_raise(zone->container, zone->corner.top_right, 999);
-   e_container_window_raise(zone->container, zone->corner.right_top, 999);
-   e_container_window_raise(zone->container, zone->corner.right_bottom, 999);
-   e_container_window_raise(zone->container, zone->corner.bottom_right, 999);
-   e_container_window_raise(zone->container, zone->corner.bottom_left, 999);
-
-   e_container_window_raise(zone->container, zone->edge.left, 999);
-   e_container_window_raise(zone->container, zone->edge.right, 999);
-   e_container_window_raise(zone->container, zone->edge.top, 999);
-   e_container_window_raise(zone->container, zone->edge.bottom, 999);
-
-   ecore_x_window_show(zone->edge.left);
-   ecore_x_window_show(zone->edge.right);
-   ecore_x_window_show(zone->edge.top);
-   ecore_x_window_show(zone->edge.bottom);
-   ecore_x_window_show(zone->corner.left_bottom);
-   ecore_x_window_show(zone->corner.left_top);
-   ecore_x_window_show(zone->corner.top_left);
-   ecore_x_window_show(zone->corner.top_right);
-   ecore_x_window_show(zone->corner.right_top);
-   ecore_x_window_show(zone->corner.right_bottom);
-   ecore_x_window_show(zone->corner.bottom_right);
-   ecore_x_window_show(zone->corner.bottom_left);
+   if(e_config->fullscreen_flip)
+     e_zone_edge_win_layer_set(zone, 250);
+   else
+     e_zone_edge_win_layer_set(zone, 200);
 
    zone->handlers = 
      eina_list_append(zone->handlers,
@@ -147,6 +127,14 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
                                               _e_zone_cb_mouse_out, zone));
    zone->handlers = 
      eina_list_append(zone->handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
+                                              _e_zone_cb_mouse_down, zone));
+   zone->handlers = 
+     eina_list_append(zone->handlers,
+                      ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
+                                              _e_zone_cb_mouse_up, zone));
+   zone->handlers = 
+     eina_list_append(zone->handlers,
                       ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,
                                               _e_zone_cb_mouse_move, zone));
    zone->handlers = 
@@ -274,6 +262,8 @@ e_zone_move(E_Zone *zone, int x, int y)
 	 zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
    ecore_x_window_move_resize(zone->corner.bottom_left,
 	 zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
+
+   e_zone_bg_reconfigure(zone);
 }
 
 EAPI void
@@ -329,6 +319,8 @@ e_zone_resize(E_Zone *zone, int w, int h)
 	 zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
    ecore_x_window_move_resize(zone->corner.bottom_left,
 	 zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
+
+   e_zone_bg_reconfigure(zone);
 }
 
 EAPI void
@@ -394,6 +386,8 @@ e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h)
 	 zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
    ecore_x_window_move_resize(zone->corner.bottom_left,
 	 zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
+
+   e_zone_bg_reconfigure(zone);
 } 
 
 EAPI void
@@ -419,6 +413,7 @@ EAPI E_Zone *
 e_zone_current_get(E_Container *con)
 {
    Eina_List *l = NULL;
+   E_Zone *zone;
 
    E_OBJECT_CHECK_RETURN(con, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
@@ -427,18 +422,14 @@ e_zone_current_get(E_Container *con)
 	int x, y;
 
 	ecore_x_pointer_xy_get(con->win, &x, &y);
-	for (l = con->zones; l; l = l->next)
+	EINA_LIST_FOREACH(con->zones, l, zone)
 	  {
-	     E_Zone *zone;
-
-	     zone = l->data;
 	     if (E_INSIDE(x, y, zone->x, zone->y, zone->w, zone->h))
 	       return zone;
 	  }
      }
    if (!con->zones) return NULL;
-   l = con->zones;
-   return (E_Zone *)l->data;
+   return (E_Zone *)eina_list_data_get(con->zones);
 }
 
 EAPI void
@@ -478,12 +469,10 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
 	cx = next_zone->x;
 	cy = next_zone->y;
 	zones = eina_list_next(zones);
-	while (zones)
+	EINA_LIST_FOREACH(eina_list_next(zones), zones, next_zone)
 	  {
-	     next_zone = (E_Zone *)zones->data;
 	     if (next_zone->x != cx) one_col = 0;
 	     if (next_zone->y != cy) one_row = 0;
-	     zones = zones->next;
 	  }
      }
    if (eina_list_count(zone->container->manager->containers) > 1)
@@ -509,8 +498,6 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
      }
    EINA_LIST_FOREACH(e_shelf_list(), l, es)
      {
-	ok = 0;
-
 	if (es->zone != zone) continue;
 	switch(es->gadcon->orient)
 	  {
@@ -534,6 +521,9 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
 	   case E_GADCON_ORIENT_CORNER_RB:
 	      if (edge == E_ZONE_EDGE_RIGHT) ok = 1;
 	      break;
+	   default:
+	      ok = 0;
+	      break;
 	  }
 
 	if (!ok) continue;
@@ -546,7 +536,6 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
 	zone->flip.es = es;
 	e_shelf_toggle(es, 1);
      }
-   ok = 0;
    switch(edge)
      {
       case E_ZONE_EDGE_LEFT:
@@ -561,9 +550,12 @@ e_zone_flip_coords_handle(E_Zone *zone, int x, int y)
       case E_ZONE_EDGE_BOTTOM:
 	 if (E_ZONE_FLIP_DOWN(zone)) ok = 1;
 	 break;
+      default:
+	 ok = 0;
+	 break;
      }
    if (!ok) return;
-   bind = e_bindings_edge_get("desk_flip_in_direction", edge);
+   bind = e_bindings_edge_get("desk_flip_in_direction", edge, 0);
    if (bind)
      {
 	zev = E_NEW(E_Event_Zone_Edge, 1);
@@ -771,18 +763,14 @@ e_zone_flip_win_disable(void)
    Eina_List *l, *ll, *lll;
    E_Manager *man;
    E_Container *con;
+   E_Zone *zone;
 
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     con = ll->data;
-	     for (lll = con->zones; lll; lll = lll->next)
+	     EINA_LIST_FOREACH(con->zones, lll, zone)
 	       {
-		  E_Zone *zone;
-
-		  zone = lll->data;
 		  ecore_x_window_hide(zone->edge.left);
 		  ecore_x_window_hide(zone->edge.right);
 		  ecore_x_window_hide(zone->edge.top);
@@ -806,18 +794,14 @@ e_zone_flip_win_restore(void)
    Eina_List *l, *ll, *lll;
    E_Manager *man;
    E_Container *con;
+   E_Zone *zone;
 
-   for (l = e_manager_list(); l; l = l->next)
+   EINA_LIST_FOREACH(e_manager_list(), l, man)
      {
-	man = l->data;
-	for (ll = man->containers; ll; ll = ll->next)
+	EINA_LIST_FOREACH(man->containers, ll, con)
 	  {
-	     con = ll->data;
-	     for (lll = con->zones; lll; lll = lll->next)
+	     EINA_LIST_FOREACH(con->zones, lll, zone)
 	       {
-		  E_Zone *zone;
-
-		  zone = lll->data;
 		  ecore_x_window_show(zone->edge.left);
 		  ecore_x_window_show(zone->edge.right);
 		  ecore_x_window_show(zone->edge.top);
@@ -835,6 +819,24 @@ e_zone_flip_win_restore(void)
      }
 }
 
+EAPI void
+e_zone_edge_win_layer_set(E_Zone *zone, int layer)
+{
+   e_container_window_raise(zone->container, zone->corner.left_bottom, layer);
+   e_container_window_raise(zone->container, zone->corner.left_top, layer);
+   e_container_window_raise(zone->container, zone->corner.top_left, layer);
+   e_container_window_raise(zone->container, zone->corner.top_right, layer);
+   e_container_window_raise(zone->container, zone->corner.right_top, layer);
+   e_container_window_raise(zone->container, zone->corner.right_bottom, layer);
+   e_container_window_raise(zone->container, zone->corner.bottom_right, layer);
+   e_container_window_raise(zone->container, zone->corner.bottom_left, layer);
+
+   e_container_window_raise(zone->container, zone->edge.left, layer);
+   e_container_window_raise(zone->container, zone->edge.right, layer);
+   e_container_window_raise(zone->container, zone->edge.top, layer);
+   e_container_window_raise(zone->container, zone->edge.bottom, layer);
+}
+
 static void
 _e_zone_useful_geometry_calc(E_Zone *zone)
 {
@@ -946,7 +948,6 @@ static void
 _e_zone_free(E_Zone *zone)
 {
    E_Container *con;
-   Eina_List *l;
    Ecore_Animator *anim;
    void *data;
    int x, y;
@@ -985,15 +986,7 @@ _e_zone_free(E_Zone *zone)
      }
    
    /* remove handlers */
-   for (l = zone->handlers; l; l = l->next)
-     {
-	Ecore_Event_Handler *h;
-
-	h = l->data;
-	ecore_event_handler_del(h);
-     }
-   eina_list_free(zone->handlers);
-   zone->handlers = NULL;
+   E_FREE_LIST(zone->handlers, ecore_event_handler_del);
 
    con = zone->container;
    if (zone->name) eina_stringshare_del(zone->name);
@@ -1187,6 +1180,94 @@ _e_zone_cb_mouse_out(void *data, int type, void *event)
 }
 
 static int
+_e_zone_cb_mouse_down(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Button *ev;
+   E_Event_Zone_Edge *zev;
+   E_Zone_Edge edge;
+   E_Zone *zone;
+
+   ev = event;
+   zone = data;
+
+   if (ev->event_window == zone->edge.left)
+     edge = E_ZONE_EDGE_LEFT;
+   else if (ev->event_window == zone->edge.top)
+     edge = E_ZONE_EDGE_TOP;
+   else if (ev->event_window == zone->edge.right)
+     edge = E_ZONE_EDGE_RIGHT;
+   else if (ev->event_window == zone->edge.bottom)
+     edge = E_ZONE_EDGE_BOTTOM;
+   else if ((ev->event_window == zone->corner.left_top) ||
+	    (ev->event_window == zone->corner.top_left))
+     edge = E_ZONE_EDGE_TOP_LEFT;
+   else if ((ev->event_window == zone->corner.right_top) ||
+	    (ev->event_window == zone->corner.top_right))
+     edge = E_ZONE_EDGE_TOP_RIGHT;
+   else if ((ev->event_window == zone->corner.right_bottom) ||
+	    (ev->event_window == zone->corner.bottom_right))
+     edge = E_ZONE_EDGE_BOTTOM_RIGHT;
+   else if ((ev->event_window == zone->corner.left_bottom) ||
+	    (ev->event_window == zone->corner.bottom_left))
+     edge = E_ZONE_EDGE_BOTTOM_LEFT;
+   else return 1;
+
+   zev = E_NEW(E_Event_Zone_Edge, 1);
+   zev->zone = zone;
+   zev->edge = edge;
+   zev->x = ev->x;
+   zev->y = ev->y;
+   zev->modifiers = ev->modifiers;
+   ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
+   e_bindings_edge_down_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
+   return 1;
+}
+
+static int
+_e_zone_cb_mouse_up(void *data, int type, void *event)
+{
+   Ecore_Event_Mouse_Button *ev;
+   E_Event_Zone_Edge *zev;
+   E_Zone_Edge edge;
+   E_Zone *zone;
+
+   ev = event;
+   zone = data;
+
+   if (ev->event_window == zone->edge.left)
+     edge = E_ZONE_EDGE_LEFT;
+   else if (ev->event_window == zone->edge.top)
+     edge = E_ZONE_EDGE_TOP;
+   else if (ev->event_window == zone->edge.right)
+     edge = E_ZONE_EDGE_RIGHT;
+   else if (ev->event_window == zone->edge.bottom)
+     edge = E_ZONE_EDGE_BOTTOM;
+   else if ((ev->event_window == zone->corner.left_top) ||
+	    (ev->event_window == zone->corner.top_left))
+     edge = E_ZONE_EDGE_TOP_LEFT;
+   else if ((ev->event_window == zone->corner.right_top) ||
+	    (ev->event_window == zone->corner.top_right))
+     edge = E_ZONE_EDGE_TOP_RIGHT;
+   else if ((ev->event_window == zone->corner.right_bottom) ||
+	    (ev->event_window == zone->corner.bottom_right))
+     edge = E_ZONE_EDGE_BOTTOM_RIGHT;
+   else if ((ev->event_window == zone->corner.left_bottom) ||
+	    (ev->event_window == zone->corner.bottom_left))
+     edge = E_ZONE_EDGE_BOTTOM_LEFT;
+   else return 1;
+
+   zev = E_NEW(E_Event_Zone_Edge, 1);
+   zev->zone = zone;
+   zev->edge = edge;
+   zev->x = ev->x;
+   zev->y = ev->y;
+   zev->modifiers = ev->modifiers;
+   ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
+   e_bindings_edge_up_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
+   return 1;
+}
+
+static int
 _e_zone_cb_mouse_move(void *data, int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index ba0f0c4..bff1959 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -143,6 +143,7 @@ EAPI void       e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
 EAPI void       e_zone_desk_linear_flip_to(E_Zone *zone, int x);
 EAPI void       e_zone_flip_win_disable(void);
 EAPI void       e_zone_flip_win_restore(void);
+EAPI void	e_zone_edge_win_layer_set(E_Zone *zone, int layer);
 
 EAPI void       e_zone_useful_geometry_dirty(E_Zone *zone);
 EAPI void       e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h);
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index d3d410e..c548104 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -239,7 +239,7 @@ SUBDIRS += connman
 endif
 
 if USE_MODULE_ILLUME
-SUBDIRS += illume
+SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard illume-indicator
 endif
 
 if USE_MODULE_SYSCON
@@ -316,6 +316,11 @@ gadman \
 mixer \
 connman \
 illume \
+illume2 \
+illume-home \
+illume-softkey \
+illume-keyboard \
+illume-indicator \
 syscon \
 everything \
 systray
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index b980b6b..2bd00c8 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -90,7 +90,7 @@ host_triplet = @host@
 @USE_MODULE_GADMAN_TRUE at am__append_57 = gadman
 @USE_MODULE_MIXER_TRUE at am__append_58 = mixer
 @USE_MODULE_CONNMAN_TRUE at am__append_59 = connman
- at USE_MODULE_ILLUME_TRUE@am__append_60 = illume
+ at USE_MODULE_ILLUME_TRUE@am__append_60 = illume illume2 illume-home illume-softkey illume-keyboard illume-indicator
 @USE_MODULE_SYSCON_TRUE at am__append_61 = syscon
 @USE_MODULE_EVERYTHING_TRUE at am__append_62 = everything
 @USE_MODULE_SYSTRAY_TRUE at am__append_63 = systray
@@ -381,6 +381,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -468,6 +469,11 @@ gadman \
 mixer \
 connman \
 illume \
+illume2 \
+illume-home \
+illume-softkey \
+illume-keyboard \
+illume-indicator \
 syscon \
 everything \
 systray
@@ -479,8 +485,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -586,7 +592,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/battery/Makefile.in b/src/modules/battery/Makefile.in
index 6d837cf..acdf1cd 100644
--- a/src/modules/battery/Makefile.in
+++ b/src/modules/battery/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -351,6 +351,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -396,8 +397,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -543,7 +544,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index 541c620..c7b9a70 100644
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -411,9 +411,12 @@ darwin_check(void)
 /***---***/
 /* 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 */
+#if 0
 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);
+#endif
+static void linux_sys_class_power_supply_init(void);
+
 typedef struct _Sys_Class_Power_Supply_Uevent Sys_Class_Power_Supply_Uevent;
 
 #define BASIS_CHARGE  1
@@ -437,6 +440,8 @@ struct _Sys_Class_Power_Supply_Uevent
 };
 
 static Eina_List *events = NULL;
+
+#if 0
 static Ecore_Timer *sys_class_delay_check = NULL;
 
 static int
@@ -459,9 +464,9 @@ linux_sys_class_power_supply_cb_re_init(void *data)
      {
 	EINA_LIST_FREE(events, sysev)
 	  {
-	     if (sysev->fd_handler)
-	       ecore_main_fd_handler_del(sysev->fd_handler);
-	     if (sysev->fd >= 0) close(sysev->fd);
+//	     if (sysev->fd_handler)
+//	       ecore_main_fd_handler_del(sysev->fd_handler);
+//	     if (sysev->fd >= 0) close(sysev->fd);
 	     free(sysev->name);
 	     free(sysev);
 	  }
@@ -500,9 +505,9 @@ linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd
 	  {
 	     events = eina_list_remove(events, sysev);
 	     
-	     if (sysev->fd_handler)
-	       ecore_main_fd_handler_del(sysev->fd_handler);
-	     if (sysev->fd >= 0) close(sysev->fd);
+//	     if (sysev->fd_handler)
+//	       ecore_main_fd_handler_del(sysev->fd_handler);
+//	     if (sysev->fd >= 0) close(sysev->fd);
 	     free(sysev->name);
 	     free(sysev);
 	     
@@ -517,7 +522,7 @@ linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd
      }
    return 1;
 }
-
+#endif
 static void
 linux_sys_class_power_supply_sysev_init(Sys_Class_Power_Supply_Uevent *sysev)
 {
@@ -645,7 +650,7 @@ linux_sys_class_power_supply_init(void)
      {
 	Eina_List *bats;
 	char *name;
-	char buf[4096];
+//	char buf[4096];
 	
 	bats = ecore_file_ls("/sys/class/power_supply/");
 	if (bats)
@@ -664,14 +669,14 @@ linux_sys_class_power_supply_init(void)
 
 		  sysev = E_NEW(Sys_Class_Power_Supply_Uevent, 1);
 		  sysev->name = 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);
+//		  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);
 		  events = eina_list_append(events, sysev);
 		  linux_sys_class_power_supply_sysev_init(sysev);
 	       }
diff --git a/src/modules/battery/e_mod_config.c b/src/modules/battery/e_mod_config.c
index 08af80f..6a1fff0 100644
--- a/src/modules/battery/e_mod_config.c
+++ b/src/modules/battery/e_mod_config.c
@@ -13,12 +13,12 @@ struct _E_Config_Dialog_Data
 };
 
 /* Protos */
-static void          *_create_data(E_Config_Dialog *cfd);
-static void          _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object   *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int           _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object   *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int           _advanced_apply_data(E_Config_Dialog *cfd, 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 Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 EAPI E_Config_Dialog *
 e_int_config_battery_module(E_Container *con, const char *params __UNUSED__) 
@@ -26,9 +26,8 @@ e_int_config_battery_module(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    char buf[4096];
-   
+
    v = E_NEW(E_Config_Dialog_View, 1);
-   
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
@@ -36,7 +35,8 @@ e_int_config_battery_module(E_Container *con, const char *params __UNUSED__)
    v->advanced.apply_cfdata = _advanced_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
 
-   snprintf(buf, sizeof(buf), "%s/e-module-battery.edj", e_module_dir_get(battery_config->module));
+   snprintf(buf, sizeof(buf), "%s/e-module-battery.edj", 
+            e_module_dir_get(battery_config->module));
    cfd = e_config_dialog_new(con,
 			     _("Battery Monitor Settings"), 
 			     "E", "_e_mod_battery_config_dialog",
@@ -55,11 +55,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->alert_timeout = battery_config->alert_timeout;
    cfdata->force_mode = battery_config->force_mode;
 
-   if (cfdata->alert_time > 0 || cfdata->alert_percent > 0) 
+   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
@@ -70,7 +70,7 @@ static void *
 _create_data(E_Config_Dialog *cfd) 
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
@@ -81,17 +81,18 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    if (!battery_config) return;
    battery_config->config_dialog = NULL;
-   free(cfdata);
+   E_FREE(cfdata);
 }
 
 static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *o, *of, *ob;
-      
+
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_framelist_add(evas, _("Basic Settings"), 0);
-   ob = e_widget_check_add(evas, _("Show alert when battery is low"), &(cfdata->show_alert));
+   ob = e_widget_check_add(evas, _("Show alert when battery is low"), 
+                           &(cfdata->show_alert));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    return o;
@@ -126,37 +127,45 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
-   Evas_Object *o, *ob, *of, *otb;
+   Evas_Object *o, *ob, *otb;
    E_Radio_Group *rg;
 
    otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
-   
+
    /* Use Sliders for both cfg options */
    o = e_widget_table_add(evas, 0);
-   
+
    ob = e_widget_label_add(evas, _("Check every:"));
    e_widget_table_object_append(o, ob, 0, 0, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 256, 4, 0, NULL, &(cfdata->poll_interval), 180);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 256, 4, 0, 
+                            NULL, &(cfdata->poll_interval), 180);
    e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 0, 1, 0);
-   e_widget_toolbook_page_append(otb, NULL, _("Polling"), o, 0, 0, 0, 0, 0.5, 0.0);
+   e_widget_toolbook_page_append(otb, NULL, _("Polling"), o, 0, 0, 0, 0, 
+                                 0.5, 0.0);
 
    o = e_widget_table_add(evas, 0);
-   ob = e_widget_check_add(evas, _("Show alert on low battery"), &(cfdata->show_alert));
+   ob = e_widget_check_add(evas, _("Show alert on low battery"), 
+                           &(cfdata->show_alert));
    e_widget_table_object_append(o, ob, 0, 0, 1, 1, 1, 1, 1, 0);   
    ob = e_widget_label_add(evas, _("Alert when at:"));
    e_widget_table_object_append(o, ob, 0, 1, 1, 1, 1, 0, 1, 1);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f min"), 0, 60, 1, 0, NULL, &(cfdata->alert_time), 180);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f min"), 0, 60, 1, 0, NULL, 
+                            &(cfdata->alert_time), 180);
    e_widget_table_object_append(o, ob, 0, 2, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f %%"), 0, 100, 1, 0, NULL, &(cfdata->alert_percent), 180);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f %%"), 0, 100, 1, 0, NULL, 
+                            &(cfdata->alert_percent), 180);
    e_widget_table_object_append(o, ob, 0, 3, 1, 1, 1, 0, 1, 0);
-   ob = e_widget_check_add(evas, _("Auto dismiss in..."), &(cfdata->dismiss_alert));
+   ob = e_widget_check_add(evas, _("Auto dismiss in..."), 
+                           &(cfdata->dismiss_alert));
    e_widget_table_object_append(o, ob, 0, 4, 1, 1, 1, 1, 1, 0);   
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f sec"), 1, 300, 1, 0, NULL, &(cfdata->alert_timeout), 180);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f sec"), 1, 300, 1, 0, NULL, 
+                            &(cfdata->alert_timeout), 180);
    e_widget_table_object_append(o, ob, 0, 5, 1, 1, 1, 0, 1, 0);
-   e_widget_toolbook_page_append(otb, NULL, _("Alert"), o, 0, 0, 0, 0, 0.5, 0.0);
-   
+   e_widget_toolbook_page_append(otb, NULL, _("Alert"), o, 0, 0, 0, 0, 
+                                 0.5, 0.0);
+
    o = e_widget_list_add(evas, 0, 0);
-   
+
    rg = e_widget_radio_group_new(&(cfdata->force_mode));
    ob = e_widget_radio_add(evas, _("Auto Detect"), 0, rg);
    e_widget_list_object_append(o, ob, 1, 0, 0.0);
@@ -165,7 +174,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_radio_add(evas, _("HAL"), 2, rg);
    e_widget_list_object_append(o, ob, 1, 0, 0.0);
 
-   e_widget_toolbook_page_append(otb, NULL, _("Hardware"), o, 0, 0, 0, 0, 0.5, 0.0);
+   e_widget_toolbook_page_append(otb, NULL, _("Hardware"), o, 0, 0, 0, 0, 
+                                 0.5, 0.0);
 
    e_widget_toolbook_page_show(otb, 0);
    return otb;
@@ -195,7 +205,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
      battery_config->alert_timeout = 0;
 
    battery_config->force_mode = cfdata->force_mode;
-   
+
    _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 5625242..0cf816f 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -589,10 +589,10 @@ _battery_hal_find_battery(void *user_data, void *reply_data, DBusError *error)
 {
    Eina_List *l;
    char *device;
-
    E_Hal_Manager_Find_Device_By_Capability_Return *ret;
    
    ret = reply_data;
+   if (!ret) return;
    if (eina_list_count(ret->strings) < 1) return;
    EINA_LIST_FOREACH(ret->strings, l, device)
      _battery_hal_battery_add(device);
@@ -606,6 +606,7 @@ _battery_hal_find_ac(void *user_data, void *reply_data, DBusError *err)
    E_Hal_Manager_Find_Device_By_Capability_Return *ret;
    
    ret = reply_data;
+   if (!ret) return;
    if (eina_list_count(ret->strings) < 1) return;
    EINA_LIST_FOREACH(ret->strings, l, device)
      _battery_hal_ac_adapter_add(device);
@@ -618,6 +619,7 @@ _battery_hal_is_battery(void *user_data, void *reply_data, DBusError *err)
    E_Hal_Device_Query_Capability_Return *ret;
    
    ret = reply_data;
+   if (!ret) return;
    if (dbus_error_is_set(err))
      {
         dbus_error_free(err);
@@ -635,6 +637,7 @@ _battery_hal_is_ac_adapter(void *user_data, void *reply_data, DBusError *err)
    E_Hal_Device_Query_Capability_Return *ret;
    
    ret = reply_data;
+   if (!ret) return;
    if (dbus_error_is_set(err))
      {
         dbus_error_free(err);
diff --git a/src/modules/clock/Makefile.in b/src/modules/clock/Makefile.in
index a93cba3..1d3468d 100644
--- a/src/modules/clock/Makefile.in
+++ b/src/modules/clock/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -379,8 +380,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,7 +494,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf/Makefile.in b/src/modules/conf/Makefile.in
index fd02afb..0e70efb 100644
--- a/src/modules/conf/Makefile.in
+++ b/src/modules/conf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index ffe91e6..9b58a88 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -66,7 +66,7 @@ e_configure_show(E_Container *con)
    E_Configure *eco;
    E_Manager *man;
    Evas_Coord ew, eh, mw, mh;
-   Evas_Object *o, *of;
+   Evas_Object *o;
    Evas_Modifier_Mask mask;
    Eina_Bool kg;
 
@@ -167,20 +167,20 @@ e_configure_show(E_Container *con)
    e_widget_ilist_selector_set(eco->item_list, 1);
    e_widget_ilist_go(eco->item_list);
    e_widget_on_focus_hook_set(eco->item_list, _e_configure_focus_cb, eco->win);
-   e_widget_min_size_get(eco->item_list, &mw, &mh);
+   e_widget_size_min_get(eco->item_list, &mw, &mh);
    if (mw < (200 * e_scale)) mw = 200 * e_scale;
    if (mh < (120 * e_scale)) mh = 120 * e_scale;
-   e_widget_min_size_set(eco->item_list, mw, mh);
+   e_widget_size_min_set(eco->item_list, mw, mh);
    e_widget_list_object_append(eco->o_list, eco->item_list, 1, 1, 0.5);
 
-   e_widget_min_size_get(eco->o_list, &mw, &mh);
+   e_widget_size_min_get(eco->o_list, &mw, &mh);
    edje_extern_object_min_size_set(eco->o_list, mw, mh);
 
    /* Close Button */
    eco->close = e_widget_button_add(eco->evas, _("Close"), NULL, 
 				    _e_configure_cb_close, eco, NULL);
    e_widget_on_focus_hook_set(eco->close, _e_configure_focus_cb, eco->win);
-   e_widget_min_size_get(eco->close, &mw, &mh);
+   e_widget_size_min_get(eco->close, &mw, &mh);
    edje_extern_object_min_size_set(eco->close, mw, mh);
    edje_object_part_swallow(eco->edje, "e.swallow.button", eco->close);
    edje_object_size_min_calc(eco->edje, &ew, &eh);
@@ -349,8 +349,8 @@ _e_configure_category_cb(void *data, void *data2)
                               _e_configure_item_cb, ci, NULL);
      }
    e_widget_ilist_go(eco->item_list);
-   e_widget_min_size_get(eco->item_list, &w, &h);
-   e_widget_min_size_set(eco->item_list, w, h);
+   e_widget_size_min_get(eco->item_list, &w, &h);
+   e_widget_size_min_set(eco->item_list, w, h);
    e_widget_ilist_thaw(eco->item_list);
    edje_thaw();
    evas_event_thaw(evas_object_evas_get(eco->item_list));
@@ -503,8 +503,8 @@ _e_configure_fill_cat_list(void *data)
 	  }
      }
 
-   e_widget_min_size_get(eco->cat_list, &mw, &mh);
-   e_widget_min_size_set(eco->cat_list, mw, mh);
+   e_widget_size_min_get(eco->cat_list, &mw, &mh);
+   e_widget_size_min_set(eco->cat_list, mw, mh);
    edje_thaw();
    evas_event_thaw(evas_object_evas_get(eco->cat_list));
 }
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index f26f64d..7f9eab0 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -111,10 +111,19 @@ _gc_id_new(E_Gadcon_Client_Class *client_class)
 static void
 _cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {
+   Evas_Event_Mouse_Up *ev;
    E_Action *a;
 
-   a = e_action_find("configuration");
-   if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+   ev = event_info;
+   if (ev->button == 1) 
+     {
+        a = e_action_find("configuration");
+        if ((a) && (a->func.go)) a->func.go(NULL, NULL);
+     }
+   else if (ev->button == 3) 
+     {
+        
+     }
 }
 /**/
 /***************************************************************************/
diff --git a/src/modules/conf_applications/Makefile.in b/src/modules/conf_applications/Makefile.in
index f9d39c0..a14ef18 100644
--- a/src/modules/conf_applications/Makefile.in
+++ b/src/modules/conf_applications/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index 309285b..b4c1ea4 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -27,7 +27,7 @@ static Eina_List *_load_menu(const char *path);
 static Eina_List *_load_order(const char *path);
 static void _fill_apps(E_Config_Dialog_Data *cfdata);
 static void _fill_list(E_Config_Dialog_Data *cfdata);
-static int _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2);
+static int _cb_sort_desks(const void *d1, const void *d2);
 static void _all_list_cb_change(void *data, Evas_Object *obj);
 static void _sel_list_cb_change(void *data, Evas_Object *obj);
 static void _all_list_cb_selected(void *data);
@@ -48,7 +48,7 @@ e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__)
    e_user_dir_concat_static(buf, "applications/menu/favorite.menu");
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("Favorites Menu"));
-   data->dialog = eina_stringshare_add("_config_apps_favs_dialog");
+   data->dialog = eina_stringshare_add("menus/favorites_menu");
    data->icon = eina_stringshare_add("user-bookmarks");
    data->filename = eina_stringshare_add(buf);
 
@@ -102,7 +102,7 @@ e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
    e_user_dir_concat_static(buf, "applications/bar/default/.order");
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("IBar Applications"));
-   data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
+   data->dialog = eina_stringshare_add("applications/ibar_applications");
    data->icon = eina_stringshare_add("preferences-applications-ibar");
    data->filename = eina_stringshare_add(buf);
 
@@ -117,7 +117,7 @@ e_int_config_apps_ibar_other(E_Container *con, const char *path)
    if (!path) return NULL;
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("IBar Applications"));
-   data->dialog = eina_stringshare_add("_config_apps_ibar_dialog");
+   data->dialog = eina_stringshare_add("internal/ibar_other");
    data->icon = eina_stringshare_add("preferences-applications-ibar");
    data->filename = eina_stringshare_add(path);
 
@@ -133,7 +133,7 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
    e_user_dir_concat_static(buf, "applications/startup/.order");
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("Startup Applications"));
-   data->dialog = eina_stringshare_add("_config_apps_startup_dialog");
+   data->dialog = eina_stringshare_add("applications/startup_applications");
    data->icon = eina_stringshare_add("preferences-applications-startup");
    data->filename = eina_stringshare_add(buf);
 
@@ -149,7 +149,7 @@ e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__)
    e_user_dir_concat_static(buf, "applications/restart/.order");
    data = E_NEW(E_Config_Data, 1);
    data->title = eina_stringshare_add(_("Restart Applications"));
-   data->dialog = eina_stringshare_add("_config_apps_restart_dialog");
+   data->dialog = eina_stringshare_add("applications/restart_applications");
    data->icon = eina_stringshare_add("preferences-applications-restart");
    data->filename = eina_stringshare_add(buf);
 
@@ -380,8 +380,8 @@ _fill_apps(E_Config_Dialog_Data *cfdata)
    e_widget_ilist_thaw(cfdata->o_all);
    edje_thaw();
    evas_event_thaw(evas);
-   e_widget_min_size_get(cfdata->o_all, &w, NULL);
-   e_widget_min_size_set(cfdata->o_all, w, 240);
+   e_widget_size_min_get(cfdata->o_all, &w, NULL);
+   e_widget_size_min_set(cfdata->o_all, w, 240);
 }
 
 static void 
@@ -409,8 +409,8 @@ _fill_list(E_Config_Dialog_Data *cfdata)
    
    cfdata->apps = NULL;
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
-   e_widget_min_size_set(cfdata->o_sel, w, 240);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_set(cfdata->o_sel, w, 240);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
@@ -418,8 +418,11 @@ _fill_list(E_Config_Dialog_Data *cfdata)
 }
 
 static int 
-_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2) 
+_cb_sort_desks(const void *data1, const void *data2) 
 {
+   const Efreet_Desktop *d1 = data1;
+   const Efreet_Desktop *d2 = data2;
+   
    if (!d1->name) return 1;
    if (!d2->name) return -1;
    return strcmp(d1->name, d2->name);
@@ -518,8 +521,8 @@ _cb_add(void *data, void *data2)
      }
 
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
-   e_widget_min_size_set(cfdata->o_sel, w, 240);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_set(cfdata->o_sel, w, 240);
    e_widget_ilist_thaw(cfdata->o_sel);
    e_widget_ilist_unselect(cfdata->o_all);
    edje_thaw();
@@ -549,8 +552,8 @@ _cb_del(void *data, void *data2)
      }
    e_widget_ilist_unselect(cfdata->o_sel);
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
-   e_widget_min_size_set(cfdata->o_sel, w, 240);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_set(cfdata->o_sel, w, 240);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
@@ -589,8 +592,8 @@ _cb_up(void *data, void *data2)
 	  }
      }
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
-   e_widget_min_size_set(cfdata->o_sel, w, 240);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_set(cfdata->o_sel, w, 240);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
@@ -629,8 +632,8 @@ _cb_down(void *data, void *data2)
 	  }
      }
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
-   e_widget_min_size_set(cfdata->o_sel, w, 240);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_set(cfdata->o_sel, w, 240);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);
diff --git a/src/modules/conf_borders/Makefile.in b/src/modules/conf_borders/Makefile.in
index 6cf044d..509cfa7 100644
--- a/src/modules/conf_borders/Makefile.in
+++ b/src/modules/conf_borders/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_borders/e_int_config_borders.c b/src/modules/conf_borders/e_int_config_borders.c
index 3bba226..6254b38 100644
--- a/src/modules/conf_borders/e_int_config_borders.c
+++ b/src/modules/conf_borders/e_int_config_borders.c
@@ -28,7 +28,7 @@ e_int_config_borders(E_Container *con, const char *params __UNUSED__)
    v = _config_view_new();
    if (!v) return NULL;
    cfd = e_config_dialog_new(con, _("Default Border Style"), 
-			     "E", "_config_border_style_dialog", 
+			     "E", "appearance/borders", 
 			     "preferences-system-windows", 0, v, con);
    return cfd;
 }
@@ -48,7 +48,7 @@ e_int_config_borders_border(E_Container *con __UNUSED__, const char *params)
    if (!v) return NULL;
    cfd = e_config_dialog_new(bd->zone->container, 
 			     _("Window Border Selection"), 
-			     "E", "_config_border_border_style_dialog", 
+			     "E", "internal/borders_border", 
 			     "preferences-system-windows", 0, v, bd);
    bd->border_border_dialog = cfd;
    return cfd;
@@ -151,17 +151,22 @@ _basic_apply_border(E_Config_Dialog_Data *cfdata)
      }
    if (cfdata->remember_border) 
      {
-	if (!cfdata->border->remember) 
+	E_Remember *rem = cfdata->border->remember;
+
+	if (!rem) 
 	  {
-             cfdata->border->remember = e_remember_new();
-             if (cfdata->border->remember)
-	       e_remember_use(cfdata->border->remember);
+             rem = e_remember_new();
+             if (rem)
+	       e_remember_use(rem);
 	  }
-	if (cfdata->border->remember) 
+	if (rem) 
 	  {
-	     cfdata->border->remember->apply |= E_REMEMBER_APPLY_BORDER;
-             cfdata->border->remember->match = e_remember_default_match(cfdata->border);
-             e_remember_update(cfdata->border->remember, cfdata->border);
+	     rem->apply |= E_REMEMBER_APPLY_BORDER;
+             e_remember_default_match_set(rem, cfdata->border);
+	     if (rem->prop.border) eina_stringshare_del(rem->prop.border);
+	     rem->prop.border = eina_stringshare_add(cfdata->border->bordername);
+	     cfdata->border->remember = rem;
+             e_remember_update(cfdata->border);
 	  }
      }
    else 
@@ -225,8 +230,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	  sel = n;
      }
    
-   e_widget_min_size_get(ol, &w, &h);
-   e_widget_min_size_set(ol, w > 200 ? w : 200, 200);
+   e_widget_size_min_get(ol, &w, &h);
+   e_widget_size_min_set(ol, w > 200 ? w : 200, 200);
 
    e_widget_ilist_go(ol);
    e_widget_ilist_selected_set(ol, sel);
diff --git a/src/modules/conf_clientlist/Makefile.in b/src/modules/conf_clientlist/Makefile.in
index 1f0d442..9582f38 100644
--- a/src/modules/conf_clientlist/Makefile.in
+++ b/src/modules/conf_clientlist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.c b/src/modules/conf_clientlist/e_int_config_clientlist.c
index 763c349..9807da9 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.c
+++ b/src/modules/conf_clientlist/e_int_config_clientlist.c
@@ -38,7 +38,7 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
    v->advanced.create_widgets = NULL;
 
    cfd = e_config_dialog_new(con, _("Client List Settings"), "E", 
-			     "_config_clientlist_dialog",
+			     "menus/client_list_menu",
 			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_colors/Makefile.in b/src/modules/conf_colors/Makefile.in
index b861e13..7cbfdf4 100644
--- a/src/modules/conf_colors/Makefile.in
+++ b/src/modules/conf_colors/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c
index 9057765..12873b6 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.c
+++ b/src/modules/conf_colors/e_int_config_color_classes.c
@@ -116,7 +116,7 @@ e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_color_classes_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/colors")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    
@@ -127,7 +127,7 @@ e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
    v->advanced.apply_cfdata = _adv_apply_data;
    v->advanced.create_widgets = _adv_create_widgets;
    
-   cfd = e_config_dialog_new(con, _("Colors"), "E", "_config_color_classes_dialog",
+   cfd = e_config_dialog_new(con, _("Colors"), "E", "appearance/colors",
 			     "preferences-desktop-color", 0, v, NULL);
    return cfd;
 }
@@ -597,8 +597,8 @@ _load_color_classes(Evas_Object *obj, E_Config_Dialog_Data *cfdata)
 	  }
      }
    e_widget_ilist_go(obj);
-   e_widget_min_size_get(obj, &w, &h);
-   e_widget_min_size_set(obj, w, 300);
+   e_widget_size_min_get(obj, &w, &h);
+   e_widget_size_min_set(obj, w, 300);
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas_object_evas_get(obj));
diff --git a/src/modules/conf_desk/Makefile.in b/src/modules/conf_desk/Makefile.in
index 199ca90..a6d3a88 100644
--- a/src/modules/conf_desk/Makefile.in
+++ b/src/modules/conf_desk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c
index eb8c089..fc0b9b9 100644
--- a/src/modules/conf_desk/e_int_config_desk.c
+++ b/src/modules/conf_desk/e_int_config_desk.c
@@ -33,7 +33,7 @@ e_int_config_desk(E_Container *con, const char *params)
    if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &dx, &dy) != 4)
      return NULL;
    
-   if (e_config_dialog_find("E", "_config_desk_dialog")) return NULL;
+   if (e_config_dialog_find("E", "internal/desk")) return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    
@@ -49,7 +49,7 @@ e_int_config_desk(E_Container *con, const char *params)
    v->basic.create_widgets = _basic_create;
    v->override_auto_apply = 1;
    
-   cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "_config_desk_dialog",
+   cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "internal/desk",
 			     "preferences-desktop", 0, v, cfdata);
    return cfd;
 }
diff --git a/src/modules/conf_desklock/Makefile.in b/src/modules/conf_desklock/Makefile.in
index dd8f3b4..302333a 100644
--- a/src/modules/conf_desklock/Makefile.in
+++ b/src/modules/conf_desklock/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_desklock/e_int_config_desklock.c b/src/modules/conf_desklock/e_int_config_desklock.c
index d5ed026..671c6ce 100644
--- a/src/modules/conf_desklock/e_int_config_desklock.c
+++ b/src/modules/conf_desklock/e_int_config_desklock.c
@@ -79,7 +79,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_desklock_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_lock")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -94,7 +94,7 @@ e_int_config_desklock(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Screen Lock Settings"), "E",
-			     "_config_desklock_dialog", "preferences-desklock",
+			     "screen/screen_lock", "preferences-desklock",
 			     0, v, NULL);
    return cfd;
 }
@@ -345,7 +345,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 					       e_fm2_pan_get,
 					       e_fm2_pan_max_get,
 					       e_fm2_pan_child_size_get);
-   e_widget_min_size_set(cfdata->o_sf, 100, 100);
+   e_widget_size_min_set(cfdata->o_sf, 100, 100);
    e_widget_table_object_append(ft, cfdata->o_sf, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(mt, ft, 0, 0, 1, 3, 1, 1, 1, 1);
 
diff --git a/src/modules/conf_desks/Makefile.in b/src/modules/conf_desks/Makefile.in
index ecb1419..e3a8761 100644
--- a/src/modules/conf_desks/Makefile.in
+++ b/src/modules/conf_desks/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_desks/e_int_config_desks.c b/src/modules/conf_desks/e_int_config_desks.c
index 2177b6d..8fa2a9f 100644
--- a/src/modules/conf_desks/e_int_config_desks.c
+++ b/src/modules/conf_desks/e_int_config_desks.c
@@ -45,7 +45,7 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_desks_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/virtual_desktops")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    /* methods */
@@ -60,7 +60,7 @@ e_int_config_desks(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Virtual Desktops Settings"),
-			    "E", "_config_desks_dialog",
+			     "E", "screen/virtual_desktops",
 			     "preferences-desktop", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_dialogs/Makefile.in b/src/modules/conf_dialogs/Makefile.in
index 2a1bf3c..5072273 100644
--- a/src/modules/conf_dialogs/Makefile.in
+++ b/src/modules/conf_dialogs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
index 530106a..85d68ff 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.c
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -15,6 +15,7 @@ struct _E_Config_Dialog_Data
    int cfgdlg_auto_apply;
    int cfgdlg_default_mode;
    int cfgdlg_normal_wins;
+   int remember_windows;
 };
 
 EAPI E_Config_Dialog *
@@ -23,7 +24,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_config_dialog_dialog")) return NULL;
+   if (e_config_dialog_find("E", "settings/dialogs")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -34,7 +35,7 @@ e_int_config_dialogs(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Dialog Settings"),
-			     "E", "_config_config_dialog_dialog",
+			     "E", "settings/dialogs",
 			     "preferences-dialogs", 0, v, NULL);
    return cfd;
 }
@@ -46,6 +47,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->cfgdlg_auto_apply = e_config->cfgdlg_auto_apply;
    cfdata->cfgdlg_default_mode = e_config->cfgdlg_default_mode;
    cfdata->cfgdlg_normal_wins =  e_config->cfgdlg_normal_wins;
+   cfdata->remember_windows = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS);
 }
 
 static void *
@@ -72,6 +74,11 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    /* (e_config->cfgdlg_auto_apply = cfdata->cfgdlg_auto_apply; */
    e_config->cfgdlg_default_mode = cfdata->cfgdlg_default_mode;
    e_config->cfgdlg_normal_wins = cfdata->cfgdlg_normal_wins;
+   if (cfdata->remember_windows)
+     e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS;
+   else
+     e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS;
+   
    e_config_save_queue();
    return 1;
 }
@@ -105,6 +112,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
+   of = e_widget_framelist_add(evas, _("Remember"), 0);
+   ob = e_widget_check_add(evas, _("Remember size and position of dialogs"), &(cfdata->remember_windows));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   
    return o;
 }
 
diff --git a/src/modules/conf_dialogs/module.desktop b/src/modules/conf_dialogs/module.desktop
index ea5a29f..b0687c0 100644
--- a/src/modules/conf_dialogs/module.desktop
+++ b/src/modules/conf_dialogs/module.desktop
@@ -5,7 +5,7 @@ Name[cs]=Nastavení - dialogy
 Name[de]=
 Name[eo]=Agordo - Dialogoj
 Name[es]=Configuración - Diálogos
-Name[fr]=Configuration - Dialogues
+Name[fr]=Configuration - Boîtes de dialogue
 Name[hu]=Beállítások - Párbeszédablakok
 Name[it]=Configurazione - Finestre di dialogo
 Name[ja]=
@@ -20,7 +20,7 @@ Comment[cs]=<title>E17 applet nastavení</title><br>Volby výchozích vlastnost
 Comment[de]=
 Comment[eo]=<title>Aplikaĵeto de E17-agordo</title><br>Agordi la defaŭltajn ecojn de dialogoj.
 Comment[es]=<title>Applet de configuración de E17</title><br>Configura las propiedades predefinidas de los diálogos.
-Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les propriétés par défaut des boîtes de dialogues.
+Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les propriétés par défaut des boîtes de dialogue.
 Comment[hu]=<title>E17 beállító alkalmazás</title><br>Alapértelmezett bárbeszédablak beállítások.
 Comment[it]=<title>Applet configurazione di E17</title><br>Configura le proprietà predefinite per le finestre di dialogo.
 Comment[ja]=
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index ea5a29f..b0687c0 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -5,7 +5,7 @@ Name[cs]=Nastavení - dialogy
 Name[de]=
 Name[eo]=Agordo - Dialogoj
 Name[es]=Configuración - Diálogos
-Name[fr]=Configuration - Dialogues
+Name[fr]=Configuration - Boîtes de dialogue
 Name[hu]=Beállítások - Párbeszédablakok
 Name[it]=Configurazione - Finestre di dialogo
 Name[ja]=
@@ -20,7 +20,7 @@ Comment[cs]=<title>E17 applet nastavení</title><br>Volby výchozích vlastnost
 Comment[de]=
 Comment[eo]=<title>Aplikaĵeto de E17-agordo</title><br>Agordi la defaŭltajn ecojn de dialogoj.
 Comment[es]=<title>Applet de configuración de E17</title><br>Configura las propiedades predefinidas de los diálogos.
-Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les propriétés par défaut des boîtes de dialogues.
+Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les propriétés par défaut des boîtes de dialogue.
 Comment[hu]=<title>E17 beállító alkalmazás</title><br>Alapértelmezett bárbeszédablak beállítások.
 Comment[it]=<title>Applet configurazione di E17</title><br>Configura le proprietà predefinite per le finestre di dialogo.
 Comment[ja]=
diff --git a/src/modules/conf_display/Makefile.in b/src/modules/conf_display/Makefile.in
index 3dbe14a..a29df57 100644
--- a/src/modules/conf_display/Makefile.in
+++ b/src/modules/conf_display/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index 0d8cff0..26560f6 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -216,7 +216,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
         return NULL;
      }
 
-   if (e_config_dialog_find("E", "_config_display_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_resolution")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
@@ -226,7 +226,7 @@ e_int_config_display(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Screen Resolution Settings"),
-			     "E", "_config_display_dialog",
+			     "E", "screen/screen_resolution",
 			     "preferences-system-screen-resolution", 0, v, NULL);
    return cfd;
 }
@@ -281,7 +281,6 @@ _create_data(E_Config_Dialog *cfd)
 static void
 _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) 
 {
-   Eina_List *l, *ll;
    Resolution *r;
 
    if (cfdata->surebox)
@@ -405,7 +404,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Resolution"), 0);   
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->res_list = ob;
-   e_widget_min_size_set(ob, 170, 215);
+   e_widget_size_min_set(ob, 170, 215);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
 
@@ -416,7 +415,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Refresh"), 0);   
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->rate_list = ob;
-   e_widget_min_size_set(ob, 100, 80);
+   e_widget_size_min_set(ob, 100, 80);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
 
diff --git a/src/modules/conf_dpms/Makefile.in b/src/modules/conf_dpms/Makefile.in
index 982592c..9478a91 100644
--- a/src/modules/conf_dpms/Makefile.in
+++ b/src/modules/conf_dpms/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_dpms/e_int_config_dpms.c b/src/modules/conf_dpms/e_int_config_dpms.c
index ba43967..58a7dda 100644
--- a/src/modules/conf_dpms/e_int_config_dpms.c
+++ b/src/modules/conf_dpms/e_int_config_dpms.c
@@ -95,7 +95,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if ((e_config_dialog_find("E", "_config_dpms_dialog")) ||
+   if ((e_config_dialog_find("E", "screen/power_management")) ||
        (!_e_int_config_dpms_available()) ||
        (!_e_int_config_dpms_capable()))
      return NULL;
@@ -110,7 +110,7 @@ e_int_config_dpms(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Display Power Management Settings"), "E",
-			     "_config_dpms_dialog", "preferences-system-power-management",
+			     "screen/power_management", "preferences-system-power-management",
 			     0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_edgebindings/Makefile.in b/src/modules/conf_edgebindings/Makefile.in
index 69ad237..3437d1f 100644
--- a/src/modules/conf_edgebindings/Makefile.in
+++ b/src/modules/conf_edgebindings/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_edgebindings/e_int_config_edgebindings.c b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
index 7ac0116..48aded6 100644
--- a/src/modules/conf_edgebindings/e_int_config_edgebindings.c
+++ b/src/modules/conf_edgebindings/e_int_config_edgebindings.c
@@ -6,7 +6,8 @@
 #define TEXT_NONE_ACTION_EDGE _("<None>")
 #define TEXT_PRESS_EDGE_SEQUENCE _("Please select an edge,<br>" \
       "or click <hilight>Close</hilight> to abort.<br><br>" \
-      "To change the delay of this action,<br>use the slider:" \
+      "You can either specify a delay of this<br> action using " \
+      "the slider, or make it<br>respond to edge clicks:" \
       )
 
 #define TEXT_NO_PARAMS _("<None>")
@@ -48,6 +49,7 @@ static void _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata);
 static void _edge_grab_wnd_cb_apply(void *data, E_Dialog *dia);
 static void _edge_grab_wnd_cb_close(void *data, E_Dialog *dia);
 static void _edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj);
+static void _edge_grab_wnd_check_changed_cb(void *data, Evas_Object *obj);
 static void _edge_grab_wnd_selected_edge_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _edge_grab_wnd_selection_apply(E_Config_Dialog_Data *cfdata);
 
@@ -64,6 +66,7 @@ struct _E_Config_Dialog_Data
 	char *params;
 	const char *cur;
 	double delay;
+	int click;
 	int cur_act, add;
 	E_Zone_Edge edge;
 	int modifiers;
@@ -74,7 +77,7 @@ struct _E_Config_Dialog_Data
      {
 	Evas_Object *o_add, *o_mod, *o_del, *o_del_all;
 	Evas_Object *o_binding_list, *o_action_list;
-	Evas_Object *o_params, *o_selector, *o_slider;
+	Evas_Object *o_params, *o_selector, *o_slider, *o_check;
      } gui;
 
    const char *params;
@@ -90,7 +93,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_edgebindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/edge_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -100,7 +103,7 @@ e_int_config_edgebindings(E_Container *con, const char *params)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Edge Binding Settings"), "E", 
-			     "_config_edgebindings_dialog",
+			     "keyboard_and_mouse/edge_bindings",
 			     "enlightenment/edges", 0, v, NULL);
    if ((params) && (params[0]))
      {
@@ -123,6 +126,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->locals.cur = NULL;
    cfdata->locals.dia = NULL;
    cfdata->locals.delay = 0.3;
+   cfdata->locals.click = 0;
    cfdata->binding.edge = NULL;
 
    EINA_LIST_FOREACH(e_config->edge_bindings, l, bi)
@@ -180,15 +184,19 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   Eina_List *l = NULL;
+   Eina_List *l, *ll, *lll;
+   E_Manager *man;
+   E_Container *con;
+   E_Zone *zone;
    E_Config_Binding_Edge *bi, *bi2;
+   int layer;
 
    _auto_apply_changes(cfdata);
 
    EINA_LIST_FREE(e_config->edge_bindings, bi)
      {
 	e_bindings_edge_del(bi->context, bi->edge, bi->modifiers, bi->any_mod, 
-			   bi->action, bi->params, bi->delay);
+	      bi->action, bi->params, bi->delay);
 	eina_stringshare_del(bi->action);
 	eina_stringshare_del(bi->params);
 	E_FREE(bi);
@@ -213,6 +221,24 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	e_bindings_edge_add(bi->context, bi->edge, bi->modifiers, bi->any_mod,
 			   bi->action, bi->params, bi->delay);
      }
+
+   if (cfdata->fullscreen_flip != e_config->fullscreen_flip)
+     {
+	if(cfdata->fullscreen_flip)
+	  layer = 250;
+	else
+	  layer = 200;
+
+	EINA_LIST_FOREACH(e_manager_list(), l, man)
+	  {
+	     EINA_LIST_FOREACH(man->containers, ll, con)
+	       {
+		  EINA_LIST_FOREACH(con->zones, lll, zone)
+		     e_zone_edge_win_layer_set(zone, layer);
+	       }
+	  }
+     }
+
    e_config->fullscreen_flip = cfdata->fullscreen_flip;
 
    e_config_save_queue();
@@ -232,7 +258,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_frametable_add(evas, _("Edge Bindings"), 0);
    ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding));
    cfdata->gui.o_binding_list = ob;   
-   e_widget_min_size_set(ob, 200, 160);
+   e_widget_size_min_set(ob, 200, 160);
    e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1);
    ob = e_widget_button_add(evas, _("Add Edge"), NULL, _add_edge_binding_cb, cfdata, NULL);
    cfdata->gui.o_add = ob;
@@ -257,7 +283,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Action"), 0);
    ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action));
    cfdata->gui.o_action_list = ob;
-   e_widget_min_size_set(ob, 200, 240);
+   e_widget_size_min_set(ob, 200, 240);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
    
@@ -356,6 +382,8 @@ _modify_edge_binding_cb(void *data, void *data2)
 	bi = eina_list_nth(cfdata->binding.edge, n);
 	cfdata->locals.edge = bi->edge;
 	cfdata->locals.delay = ((double) bi->delay);
+	if (bi->delay == -1.0) cfdata->locals.click = 1;
+	else cfdata->locals.click = 0;
 	cfdata->locals.modifiers = bi->modifiers;
      }
    else return;
@@ -805,6 +833,7 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
    Evas_Coord minw, minh;
    const char *bgfile;
    int tw, th;
+   char *label = NULL;
    
    if (cfdata->locals.dia != 0) return;
 
@@ -830,11 +859,22 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
    e_widget_on_change_hook_set(os, _edge_grab_wnd_slider_changed_cb, cfdata);
    evas_object_show(os);
 
+   cfdata->gui.o_check = os = e_widget_check_add(evas, _("Clickable edge"), &(cfdata->locals.click));
+   e_widget_size_min_resize(os);
+   edje_object_part_swallow(o, "e.swallow.check", os);
+   e_widget_on_change_hook_set(os, _edge_grab_wnd_check_changed_cb, cfdata);
+   evas_object_show(os);
+   if (cfdata->locals.click)
+     e_widget_disabled_set(cfdata->gui.o_slider, 1);
+
    edje_object_part_text_set(o, "e.text.description", TEXT_PRESS_EDGE_SEQUENCE);
 
    edje_object_size_min_get(o, &minw, &minh);
    if (!minw || !minh)
-     edje_object_size_min_calc(o, &minw, &minh);
+     {
+	edje_object_calc_force(o);
+	edje_object_size_min_calc(o, &minw, &minh);
+     }
 
    e_dialog_content_set(cfdata->locals.dia, o, minw, minh);
    
@@ -848,6 +888,13 @@ _edge_grab_wnd_show(E_Config_Dialog_Data *cfdata)
    e_thumb_icon_begin(obg);
    evas_object_show(obg);
 
+   if (cfdata->locals.edge)
+     {
+	label = _edge_binding_text_get(cfdata->locals.edge, ((float) cfdata->locals.delay), cfdata->locals.modifiers);
+	edje_object_part_text_set(cfdata->gui.o_selector, "e.text.selection", label);
+	if (label) E_FREE(label);
+     }
+
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
                                   _edge_grab_wnd_selected_edge_cb, cfdata);
 
@@ -884,8 +931,7 @@ _edge_grab_wnd_cb_close(void *data, E_Dialog *dia)
 static void
 _edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj)
 {
-   E_Config_Dialog_Data *cfdata;
-   cfdata = data;
+   E_Config_Dialog_Data *cfdata = data;
    char *label = NULL;
 
    if (!cfdata->locals.edge) return;
@@ -895,6 +941,29 @@ _edge_grab_wnd_slider_changed_cb(void *data, Evas_Object *obj)
 }
 
 static void
+_edge_grab_wnd_check_changed_cb(void *data, Evas_Object *obj)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   char *label = NULL;
+
+   if (cfdata->locals.click)
+     {
+	if (cfdata->locals.edge)
+	  label = _edge_binding_text_get(cfdata->locals.edge, -1.0, cfdata->locals.modifiers);
+	e_widget_disabled_set(cfdata->gui.o_slider, 1);
+     }
+   else
+     {
+	if (cfdata->locals.edge)
+	  label = _edge_binding_text_get(cfdata->locals.edge, ((float) cfdata->locals.delay), cfdata->locals.modifiers);
+	e_widget_disabled_set(cfdata->gui.o_slider, 0);
+     }
+
+   edje_object_part_text_set(cfdata->gui.o_selector, "e.text.selection", label);
+   if (label) E_FREE(label);
+}
+
+static void
 _edge_grab_wnd_selected_edge_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *event;
@@ -971,7 +1040,9 @@ stop:
    if (evas_key_modifier_is_set(event->modifiers, "Win"))
      cfdata->locals.modifiers |= E_BINDING_MODIFIER_WIN;
 
-   label = _edge_binding_text_get(cfdata->locals.edge, ((float) cfdata->locals.delay), cfdata->locals.modifiers);
+   label = _edge_binding_text_get(cfdata->locals.edge,
+	 cfdata->locals.click ? -1.0 : ((float) cfdata->locals.delay),
+	 cfdata->locals.modifiers);
    edje_object_part_text_set(cfdata->gui.o_selector, "e.text.selection", label);
    if (label) E_FREE(label);
 }
@@ -984,6 +1055,8 @@ _edge_grab_wnd_selection_apply(E_Config_Dialog_Data *cfdata)
    char *label;
    int found = 0, n = -1;
 
+
+   if (cfdata->locals.click) cfdata->locals.delay = -1.0;
    if (cfdata->locals.add)
      {
 	EINA_LIST_FOREACH(cfdata->binding.edge, l, bi)
@@ -1287,6 +1360,8 @@ _edge_binding_text_get(E_Zone_Edge edge, float delay, int mod)
 	   case E_ZONE_EDGE_BOTTOM_LEFT:
 	      strcat(b, "Bottom Left Edge");
 	      break;
+	   default:
+	      break;
 	  }
      }
 
@@ -1295,7 +1370,10 @@ _edge_binding_text_get(E_Zone_Edge edge, float delay, int mod)
 	char buf[20];
 
 	if (b[0]) strcat(b, " ");
-	snprintf(buf, 20, "%.2fs", delay);
+	if (delay == -1.0)
+	  snprintf(buf, 20, "(clickable)");
+	else
+	  snprintf(buf, 20, "%.2fs", delay);
 	strcat(b, buf);
      }
 
diff --git a/src/modules/conf_edgebindings/module.desktop b/src/modules/conf_edgebindings/module.desktop
index 06c372c..f7eb9f2 100644
--- a/src/modules/conf_edgebindings/module.desktop
+++ b/src/modules/conf_edgebindings/module.desktop
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=Settings - Edge Bindings
+Name[cs]=Nastavení - zkratky okrajù
 Name[eo]=Agordo - Fulmklavoj de ekranrandoj
 Name[fr]=Configuration - Raccourcis des bords de l'écran
 Name[it]=Configurazione - Associazioni a confini schermo
 Name[tr]=Ayarlar - Kenar Bağlayıcıları
 Icon=e-module-conf_edgebindings
-Comment=<title>E17 Settings Applet</title><br>Configure your edgebindings here.
+Comment=<title>E17 Settings Applet</title><br>Configure your edge bindings here.
+Comment[cs]=<title>E17 applet nastavení</title><br>Zde mùžete nastavit zkratky pro okraje a rohy obrazovky.
 Comment[eo]=<title>Aplikaĵeto de agordo por E17</title><br>Agordas la fulmklavoj de ekranrandoj.
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les raccourcis des bords de l'écran.
 Comment[it]=<title>Applet configurazione di E17</title><br>Configurate qui le azioni da associare ai confini dello schermo.
diff --git a/src/modules/conf_edgebindings/module.desktop.in b/src/modules/conf_edgebindings/module.desktop.in
index 06c372c..f7eb9f2 100644
--- a/src/modules/conf_edgebindings/module.desktop.in
+++ b/src/modules/conf_edgebindings/module.desktop.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=Settings - Edge Bindings
+Name[cs]=Nastavení - zkratky okrajù
 Name[eo]=Agordo - Fulmklavoj de ekranrandoj
 Name[fr]=Configuration - Raccourcis des bords de l'écran
 Name[it]=Configurazione - Associazioni a confini schermo
 Name[tr]=Ayarlar - Kenar Bağlayıcıları
 Icon=e-module-conf_edgebindings
-Comment=<title>E17 Settings Applet</title><br>Configure your edgebindings here.
+Comment=<title>E17 Settings Applet</title><br>Configure your edge bindings here.
+Comment[cs]=<title>E17 applet nastavení</title><br>Zde mùžete nastavit zkratky pro okraje a rohy obrazovky.
 Comment[eo]=<title>Aplikaĵeto de agordo por E17</title><br>Agordas la fulmklavoj de ekranrandoj.
 Comment[fr]=<title>Appliquette de configuration pour E17</title><br>Configure les raccourcis des bords de l'écran.
 Comment[it]=<title>Applet configurazione di E17</title><br>Configurate qui le azioni da associare ai confini dello schermo.
diff --git a/src/modules/conf_engine/Makefile.in b/src/modules/conf_engine/Makefile.in
index 967e192..3ab4d7c 100644
--- a/src/modules/conf_engine/Makefile.in
+++ b/src/modules/conf_engine/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_engine/e_int_config_engine.c
index 0bc8a23..08346ae 100644
--- a/src/modules/conf_engine/e_int_config_engine.c
+++ b/src/modules/conf_engine/e_int_config_engine.c
@@ -25,7 +25,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_engine_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/engine")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -36,7 +36,7 @@ e_int_config_engine(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Engine Settings"),
-			    "E", "_config_engine_dialog",
+			     "E", "advanced/engine",
 			     "preferences-engine", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_exebuf/Makefile.in b/src/modules/conf_exebuf/Makefile.in
index 18ab231..d30eebc 100644
--- a/src/modules/conf_exebuf/Makefile.in
+++ b/src/modules/conf_exebuf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_exebuf/e_int_config_exebuf.c b/src/modules/conf_exebuf/e_int_config_exebuf.c
index c396213..2f89346 100644
--- a/src/modules/conf_exebuf/e_int_config_exebuf.c
+++ b/src/modules/conf_exebuf/e_int_config_exebuf.c
@@ -36,7 +36,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_exebuf_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/run_command")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -47,7 +47,7 @@ e_int_config_exebuf(E_Container *con, const char *params __UNUSED__)
    v->advanced.create_widgets = _advanced_create_widgets;
    cfd = e_config_dialog_new(con,
 			     _("Run Command Settings"),
-			    "E", "_config_exebuf_dialog",
+			     "E", "advanced/run_command",
 			     "system-run", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_fonts/Makefile.in b/src/modules/conf_fonts/Makefile.in
index cbf0ca7..682fc75 100644
--- a/src/modules/conf_fonts/Makefile.in
+++ b/src/modules/conf_fonts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index fd4d101..c6a571b 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -60,7 +60,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
      {  NULL,		  N_("Core")},
      { "title_bar",	  N_("Title Bar")},
      { "menu_item",	  N_("Menu Item")},
-     { "menu_title",	  N_("Menu Title")},   
+     { "menu_title",	  N_("Menu Title")},
      { "tb_plain",	  N_("Textblock Plain")},
      { "tb_light",        N_("Textblock Light")},
      { "tb_big",          N_("Textblock Big")},
@@ -78,7 +78,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
      { "init_title",      N_("Splash Title")},
      { "init_text",       N_("Splash Text")},
      { "init_version",    N_("Splash Version")},
-   
+
      {  NULL,		  N_("Widgets")},
      { "entry",           N_("Entry")},
      { "frame",           N_("Frame")},
@@ -103,7 +103,7 @@ const E_Text_Class_Pair text_class_predefined_names[ ] = {
      { "module_small_s",  N_("Small Styled")},
      { "module_normal_s", N_("Normal Styled")},
      { "module_large_s",  N_("Large Styled")},
-   
+
      { NULL, NULL}
 };
 
@@ -127,13 +127,13 @@ struct _E_Config_Dialog_Data
    double	 cur_size;
    int		 cur_enabled;
    int		 cur_index;
-   
+
    /* Font Fallbacks */
    int		 cur_fallbacks_enabled;
-   
+
    /* Font Hinting */
    int           hinting;
-   
+
    struct
      {
 	/* Font Classes */
@@ -155,18 +155,18 @@ e_int_config_fonts(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_fonts_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/fonts")) 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_widgets;
    v->basic.apply_cfdata      = _basic_apply_data;
    v->advanced.create_widgets = _advanced_create_widgets;
    v->advanced.apply_cfdata   = _advanced_apply_data;
-   
+
    cfd = e_config_dialog_new(con, _("Font Settings"),
-			     "E", "_config_fonts_dialog",
+			     "E", "appearance/fonts",
 			     "preferences-desktop-font", 0, v, NULL);
    return cfd;
 }
@@ -180,15 +180,15 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    E_Font_Size_Data *size_data;
    CFText_Class *tc;
    int i;
-   
+
    font_list = e_font_default_list();
-   
+
    /* Fill out the font list */
    for (i = 0; text_class_predefined_names[i].class_description; i++ )
      {
-	tc = E_NEW(CFText_Class, 1);	
+	tc = E_NEW(CFText_Class, 1);
 	tc->class_name = text_class_predefined_names[i].class_name;
-	tc->class_description = 
+	tc->class_description =
           _(text_class_predefined_names[i].class_description);
 	tc->font = NULL;
 	tc->size = 0;
@@ -203,14 +203,14 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 
 		  if (!strcmp(tc->class_name, efd->text_class))
 		    {
-		       if (efd->font) 
+		       if (efd->font)
 			 {
 			    E_Font_Properties *efp;
 
 			    efp = e_font_fontconfig_name_parse(efd->font);
 			    if (efp->name)
 			      tc->font = eina_stringshare_add(efp->name);
-			    if (efp->styles) 
+			    if (efp->styles)
 			      tc->style = eina_stringshare_add(efp->styles->data);
 			    e_font_properties_free(efp);
 			 }
@@ -222,17 +222,17 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	     if (!tc->enabled)
 	       {
 		  /* search with default fallbacks */
-		  efd = e_font_default_get(tc->class_name); 
+		  efd = e_font_default_get(tc->class_name);
 		  if (efd)
-		    { 
-		       if (efd->font) 
+		    {
+		       if (efd->font)
 			 {
 			    E_Font_Properties *efp;
 
 			    efp = e_font_fontconfig_name_parse(efd->font);
 			    if (efp->name)
 			      tc->font = eina_stringshare_add(efp->name);
-			    if (efp->styles) 
+			    if (efp->styles)
 			      tc->style = eina_stringshare_add(efp->styles->data);
 			    e_font_properties_free(efp);
 			 }
@@ -291,9 +291,9 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	str[0] = 0;
 	snprintf(str, sizeof(str), _("%d pixels"), i);
 
-	size_data = E_NEW(E_Font_Size_Data, 1);   
-	size_data->cfdata = cfdata;      
-	size_data->size_str = eina_stringshare_add(str);         
+	size_data = E_NEW(E_Font_Size_Data, 1);
+	size_data->cfdata = cfdata;
+	size_data->size_str = eina_stringshare_add(str);
 	size_data->size = i;
 	cfdata->font_px_list = eina_list_append(cfdata->font_px_list, size_data);
      }
@@ -315,7 +315,6 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
    E_Font_Size_Data *size_data;
    CFText_Class *tc;
-   Eina_List *l;
 
    e_font_available_hash_free(cfdata->font_hash);
    cfdata->font_list =eina_list_free(cfdata->font_list);
@@ -356,7 +355,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 
    for (i = 0; text_class_predefined_names[i].class_description; i++ )
      {
-	if (!text_class_predefined_names[i].class_name) continue; 
+	if (!text_class_predefined_names[i].class_name) continue;
 
 	if (cfdata->cur_enabled)
 	  {
@@ -364,7 +363,7 @@ _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 = 
+	     font_name =
                e_font_fontconfig_name_get(cfdata->cur_font, cfdata->cur_style);
 	     e_font_default_set(class_name, font_name, cfdata->cur_size);
 
@@ -425,7 +424,7 @@ _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"), 
+   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);
@@ -444,11 +443,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->gui.size_list = ob;
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 100, 200);
+   e_widget_size_min_set(ob, 100, 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
 
-   ob = 
+   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);
@@ -489,7 +488,7 @@ _basic_enable_cb_change(void *data, Evas_Object *obj)
 
 /* fill the basic dialog with inital data and select it */
 static void
-_basic_init_data_fill(E_Config_Dialog_Data *cfdata) 
+_basic_init_data_fill(E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *ob;
    E_Font_Default *efd;
@@ -500,10 +499,10 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
    init_size = -100;
 
    /* Get inital basic basic */
-   efd = e_font_default_get("e_basic_font"); 
+   efd = e_font_default_get("e_basic_font");
    if (efd)
-     { 
-	if (efd->font) 
+     {
+	if (efd->font)
 	  {
 	     E_Font_Properties *efp;
 
@@ -511,7 +510,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
 	     init_font = eina_stringshare_add(efp->name);
 	     e_font_properties_free(efp);
 	  }
-	init_size = efd->size;		    
+	init_size = efd->size;
      }
 
    /* Check based on efd */
@@ -520,7 +519,7 @@ _basic_init_data_fill(E_Config_Dialog_Data *cfdata)
      e_widget_check_checked_set(ob, 0);
    else if (!strcmp(efd->text_class, "default"))
      e_widget_check_checked_set(ob, 0);
-   else 
+   else
      e_widget_check_checked_set(ob, 1);
 
    /* Populate font list (Select current font) */
@@ -552,7 +551,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    EINA_LIST_FOREACH(cfdata->text_classes, next, tc)
      {
 	if (!tc->class_name) continue;
-	if (tc->enabled && tc->font) 
+	if (tc->enabled && tc->font)
 	  {
 	     const char *name;
 
@@ -573,7 +572,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 	  {
 	     const char *fallback;
 
-	     fallback = 
+	     fallback =
                e_widget_config_list_nth_get(cfdata->gui.fallback_list, i);
 	     if ((fallback) && (fallback[0]))
 	       e_font_fallback_append(fallback);
@@ -591,8 +590,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object *ot, *ob, *of;
-   Evas_Coord w;
+   Evas_Object *ot, *ob, *of, *otb;
    E_Radio_Group *rg;
    Eina_List *next = NULL;
    int option_enable;
@@ -600,14 +598,15 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->cur_index = -1;
    cfdata->evas = evas;
 
+   otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
+
    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);
    cfdata->gui.class_list = ob;
    _class_list_load(cfdata);
    e_widget_ilist_multi_select_set(ob, 1);
-   e_widget_min_size_get(ob, &w, NULL);
-   e_widget_min_size_set(ob, w, 180);
+   e_widget_size_min_set(ob, 110, 220);
    e_widget_on_change_hook_set(ob, _adv_class_cb_change, cfdata);
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Enable Font Class"), &(cfdata->cur_enabled));
@@ -615,22 +614,23 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_on_change_hook_set(ob, _adv_enabled_font_cb_change, cfdata);
    e_widget_disabled_set(ob, 1);
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
-   e_widget_table_object_append(ot, of, 0, 0, 1, 3, 1, 1, 1, 1);
+   e_widget_table_object_append(ot, of, 0, 0, 1, 2, 1, 1, 1, 1);
 
-   of = e_widget_framelist_add(evas, _("Fonts"), 1);
+   of = e_widget_framelist_add(evas, _("Font"), 1);
    ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_font));
    cfdata->gui.font_list = ob;
    e_widget_on_change_hook_set(ob, _adv_font_cb_change, cfdata);
    _font_list_load(cfdata, NULL);
+   e_widget_size_min_set(ob, 110, 220);
    e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(ot, of, 1, 0, 1, 3, 1, 1, 1, 1);
+   e_widget_table_object_append(ot, of, 1, 0, 1, 2, 1, 1, 1, 1);
 
-   of = e_widget_framelist_add(evas, _("Styles"), 1);
+   of = e_widget_framelist_add(evas, _("Style"), 1);
    ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_style));
    cfdata->gui.style_list = ob;
    e_widget_on_change_hook_set(ob, _adv_style_cb_change, cfdata);
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 90, 90);
+   e_widget_size_min_set(ob, 110, 50);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1);
 
@@ -638,10 +638,18 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->gui.size_list = ob;
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 90, 90);
+   e_widget_size_min_set(ob, 110, 50);
    e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(ot, of, 2, 1, 1, 2, 1, 1, 1, 1);
+   e_widget_table_object_append(ot, of, 2, 1, 1, 1, 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, 2, 3, 1, 1, 0, 1, 0);
+
+   e_widget_toolbook_page_append(otb, NULL, _("General Settings"),
+				 ot, 1, 1, 1, 1, 0.5, 0.0);
+
+   ot = e_widget_table_add(evas, 0);
    of = e_widget_frametable_add(evas, _("Hinting"), 0);
    rg = e_widget_radio_group_new(&(cfdata->hinting));
    option_enable = evas_font_hinting_can_hint(evas, EVAS_FONT_HINTING_BYTECODE);
@@ -656,7 +664,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_radio_add(evas, _("None"), 2, rg);
    e_widget_disabled_set(ob, !option_enable);
    e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 0, 1, 0);
-   e_widget_table_object_append(ot, of, 3, 0, 1, 1, 1, 1, 1, 0);
+   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 0);
 
    of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0);
    ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name"), 2);
@@ -672,25 +680,25 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
      }
    if (next) eina_list_free(next);
    ob = e_widget_check_add(evas, _("Enable Fallbacks"), &(cfdata->cur_fallbacks_enabled));
-   e_widget_config_list_object_append(cfdata->gui.fallback_list, ob, 
+   e_widget_config_list_object_append(cfdata->gui.fallback_list, ob,
 				      0, 0, 2, 1, 1, 0, 1, 0);
    e_widget_on_change_hook_set(ob, _adv_enabled_fallback_cb_change, cfdata);
    e_widget_check_checked_set(ob, option_enable);
    e_widget_change(ob);
    e_widget_framelist_object_append(of, cfdata->gui.fallback_list);
-   e_widget_table_object_append(ot, of, 3, 1, 1, 2, 1, 1, 1, 1);
+   e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 0);
 
-   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);
+   e_widget_toolbook_page_append(otb, NULL, _("Hinting / Fallbacks"),
+				 ot, 1, 0, 1, 0, 0.5, 0.0);
 
+   e_widget_toolbook_page_show(otb, 0);
    e_dialog_resizable_set(cfd->dia, 1);
-   return ot;
+   return otb;
 }
 
 /* Private Font Class Functions */
-static void 
-_class_list_load(E_Config_Dialog_Data *cfdata) 
+static void
+_class_list_load(E_Config_Dialog_Data *cfdata)
 {
    Evas *evas;
    Eina_List *next;
@@ -763,7 +771,7 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
 
    /* If no class is selected unselect all and return */
    indx = e_widget_ilist_selected_get(cfdata->gui.class_list);
-   if (indx < 0) 
+   if (indx < 0)
      {
 	e_widget_disabled_set(cfdata->gui.enabled, 1);
 	e_widget_disabled_set(cfdata->gui.font_list, 1);
@@ -782,16 +790,16 @@ _adv_class_cb_change(void *data, Evas_Object *obj)
    e_widget_disabled_set(cfdata->gui.size_list, !tc->enabled);
    e_widget_check_checked_set(cfdata->gui.enabled, tc->enabled);
 
-   if (cfdata->gui.font_list) 
-     {	
+   if (cfdata->gui.font_list)
+     {
 	/* Select the configured font */
-	for (indx = 0; indx < e_widget_ilist_count(cfdata->gui.font_list); indx++) 
+	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)) 
-	       {  
+	     if (tc->font && !strcasecmp(f, tc->font))
+	       {
 		  e_widget_ilist_selected_set(cfdata->gui.font_list, indx);
 		  break;
 	       }
@@ -811,8 +819,8 @@ _adv_enabled_font_cb_change(void *data, Evas_Object *obj)
    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++) 
+   /* 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++)
      {
 	E_Ilist_Item *i;
 	Evas_Object *icon = NULL;
@@ -853,7 +861,7 @@ _size_cb_change(void *data)
 
    if (!cfdata->gui.class_list) return;
 
-   for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++) 
+   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;
@@ -863,11 +871,11 @@ _size_cb_change(void *data)
 
 	tc = eina_list_nth(cfdata->text_classes, n);
 	tc->size = cfdata->cur_size;
-     }   
+     }
 }
 
-static void 
-_adv_font_cb_change(void *data, Evas_Object *obj) 
+static void
+_adv_font_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
    CFText_Class *tc;
@@ -878,7 +886,7 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
    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++) 
+   for (n = 0, l = e_widget_ilist_items_get(cfdata->gui.class_list); l; l = l->next, n++)
      {
 	E_Ilist_Item *i;
 
@@ -908,7 +916,7 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
 	     const char *style;
 
 	     style = next->data;
-	     e_widget_ilist_append(cfdata->gui.style_list, NULL, style, 
+	     e_widget_ilist_append(cfdata->gui.style_list, NULL, style,
                                    NULL, NULL, style);
 	  }
 
@@ -918,16 +926,16 @@ _adv_font_cb_change(void *data, Evas_Object *obj)
 	evas_event_thaw(evas_object_evas_get(cfdata->gui.style_list));
      }
 
-   /* select configured style from list */ 
-   if (tc && tc->style) 
-     {	
-	for (n = 0; n < e_widget_ilist_count(cfdata->gui.style_list); n++) 
+   /* select configured style from list */
+   if (tc && tc->style)
+     {
+	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)) 
-	       {  
+	     if (!strcasecmp(f, tc->style))
+	       {
 		  e_widget_ilist_selected_set(cfdata->gui.style_list, n);
 		  break;
 	       }
@@ -956,35 +964,35 @@ _size_list_load(E_Config_Dialog_Data *cfdata, Eina_List *size_list, Evas_Font_Si
    ob = cfdata->gui.size_list;
    evas = evas_object_evas_get(ob);
 
-   evas_event_freeze(evas);	
-   edje_freeze();	
+   evas_event_freeze(evas);
+   edje_freeze();
    e_widget_ilist_freeze(ob);
    if (clear) e_widget_ilist_clear(ob);
 
-   for (next = size_list; next; next = next->next)	  
-     {     
+   for (next = size_list; next; next = next->next)
+     {
 	E_Font_Size_Data *size_data;
 
 	size_data = next->data;
-	e_widget_ilist_append(ob, NULL, size_data->size_str, _size_cb_change, 
-			      size_data, NULL);     
+	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);	
+   e_widget_ilist_go(ob);
+   e_widget_ilist_thaw(ob);
    edje_thaw();
    evas_event_thaw(evas);
 
-   for (n = 0; n < e_widget_ilist_count(ob); n++) 	  
+   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); 
+       size_data = e_widget_ilist_nth_data_get(ob, n);
        if (cur_size == size_data->size)
 	  {
 	     e_widget_ilist_selected_set(ob, n);
 	     break;
-	  }     
+	  }
      }
 }
 
@@ -1014,20 +1022,20 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
 	eina_hash_foreach(cfdata->font_hash, _font_hash_cb, cfdata);
 	if (cfdata->font_list)
 	  {
-	     cfdata->font_list = 
-               eina_list_sort(cfdata->font_list, 
-                              eina_list_count(cfdata->font_list), 
+	     cfdata->font_list =
+               eina_list_sort(cfdata->font_list,
+                              eina_list_count(cfdata->font_list),
                               _sort_fonts);
 	  }
 	evas_font_available_list_free(evas, fonts);
      }
 
    /* Load the list */
-   if (cfdata->font_list) 
+   if (cfdata->font_list)
      {
 	Eina_List *next;
 
-	for (next = cfdata->font_list; next; next = next->next) 
+	for (next = cfdata->font_list; next; next = next->next)
 	  {
 	     const char *f;
 
@@ -1037,8 +1045,8 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
      }
 
    e_widget_ilist_go(ob);
-   e_widget_min_size_get(ob, &w, NULL);
-   e_widget_min_size_set(ob, w, 250);
+   e_widget_size_min_get(ob, &w, NULL);
+   e_widget_size_min_set(ob, w, 250);
    e_widget_ilist_thaw(ob);
    edje_thaw();
    evas_event_thaw(evas);
@@ -1047,22 +1055,22 @@ _font_list_load(E_Config_Dialog_Data *cfdata, const char *cur_font)
 
    /* Select Current Font */
    n = 0;
-   for (next = cfdata->font_list; next; next = next->next) 
+   for (next = cfdata->font_list; next; next = next->next)
      {
 	const char *f;
 
 	f = next->data;
 	if ((cur_font) && (!strcasecmp(f, cur_font)))
-	  {  
+	  {
 	     e_widget_ilist_selected_set(ob, n);
 	     break;
-	  }     
-	n++;	  
+	  }
+	n++;
      }
 }
 
-static void 
-_adv_style_cb_change(void *data, Evas_Object *obj) 
+static void
+_adv_style_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
    Eina_List *l;
@@ -1071,7 +1079,7 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
    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++) 
+   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;
@@ -1088,18 +1096,18 @@ _adv_style_cb_change(void *data, Evas_Object *obj)
 }
 
 /* Private Font Fallback Functions */
-static void 
+static void
 _adv_enabled_fallback_cb_change(void *data, Evas_Object *obj)
 {
    E_Config_Dialog_Data *cfdata;
 
    if (!(cfdata = data)) return;
-   e_widget_disabled_set(cfdata->gui.fallback_list, 
-                         !cfdata->cur_fallbacks_enabled); 
+   e_widget_disabled_set(cfdata->gui.fallback_list,
+                         !cfdata->cur_fallbacks_enabled);
 }
 
-static int 
-_sort_fonts(const void *data1, const void *data2) 
+static int
+_sort_fonts(const void *data1, const void *data2)
 {
    if (!data1) return 1;
    if (!data2) return -1;
@@ -1112,10 +1120,10 @@ _font_preview_update(E_Config_Dialog_Data *cfdata)
    /* update preview */
    if (cfdata->cur_font)
      {
-	const char *name;     
+	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, 
+	e_widget_font_preview_font_set(cfdata->gui.preview, name,
                                        cfdata->cur_size);
 	eina_stringshare_del(name);
      }
diff --git a/src/modules/conf_icon_theme/Makefile.in b/src/modules/conf_icon_theme/Makefile.in
index 33552d4..422c631 100644
--- a/src/modules/conf_icon_theme/Makefile.in
+++ b/src/modules/conf_icon_theme/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
index e3f2fc5..3cd31be 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -30,18 +30,18 @@ e_int_config_icon_themes(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_icon_theme_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/icon_theme")) 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_widgets;
-   v->basic.apply_cfdata      = _basic_apply_data;
-   v->basic.check_changed     = _basic_check_changed;
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.create_widgets = _basic_create_widgets;
+   v->basic.apply_cfdata = _basic_apply_data;
+   v->basic.check_changed = _basic_check_changed;
 
    cfd = e_config_dialog_new(con,
 			     _("Icon Theme Settings"),
-			     "E", "_config_icon_theme_dialog",
+			     "E", "appearance/icon_theme",
 			     "preferences-icon-theme", 0, v, NULL);
    return cfd;
 }
@@ -191,7 +191,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->themename));
    cfdata->gui.list = ilist;
 
-   e_widget_min_size_set(ilist, 200, 240);
+   e_widget_size_min_set(ilist, 200, 240);
 
    e_widget_framelist_object_append(of, ilist);
 
diff --git a/src/modules/conf_icon_theme/e_mod_main.c b/src/modules/conf_icon_theme/e_mod_main.c
index 8cd4860..75064fe 100644
--- a/src/modules/conf_icon_theme/e_mod_main.c
+++ b/src/modules/conf_icon_theme/e_mod_main.c
@@ -4,23 +4,10 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-/***************************************************************************/
-/**/
 /* actual module specifics */
 
 static E_Module *conf_module = NULL;
 
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
-
-/**/
-/***************************************************************************/
-
-/***************************************************************************/
-/**/
 /* module setup */
 EAPI E_Module_Api e_modapi =
 {
@@ -42,6 +29,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m)
 {
    E_Config_Dialog *cfd;
+
    while ((cfd = e_config_dialog_get("E", "_config_icon_theme_dialog"))) e_object_del(E_OBJECT(cfd));
    e_configure_registry_item_del("appearance/icon_theme");
    e_configure_registry_category_del("appearance");
diff --git a/src/modules/conf_icon_theme/module.desktop b/src/modules/conf_icon_theme/module.desktop
index 7ee9531..3941a88 100644
--- a/src/modules/conf_icon_theme/module.desktop
+++ b/src/modules/conf_icon_theme/module.desktop
@@ -16,7 +16,7 @@ Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_icon_theme
 Comment=<title>E17 Settings Applet</title><br>Settings applet used to select an icon theme for E17.
-Comment=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org.
+Comment[cs]=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org.
 Comment[de]=
 Comment[eo]=<title>Aplikajeto de E17-agordo</title><br>Elekti piktograman etoson por E17.
 Comment[es]=<title>Applet de configuración de E17</title><br>Applet de configuración usado para seleccionar el tema de íconos para E17.
@@ -29,4 +29,5 @@ Comment[pt_BR]=
 Comment[tr]=<title>E17 Ayarlar Programcığı</title><br>E17 simge temasını seçmek için kullanılan programcık.
 Comment[zh_CN]=
 Comment[zh_TW]=
+
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_icon_theme/module.desktop.in b/src/modules/conf_icon_theme/module.desktop.in
index 7ee9531..3941a88 100644
--- a/src/modules/conf_icon_theme/module.desktop.in
+++ b/src/modules/conf_icon_theme/module.desktop.in
@@ -16,7 +16,7 @@ Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_icon_theme
 Comment=<title>E17 Settings Applet</title><br>Settings applet used to select an icon theme for E17.
-Comment=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org.
+Comment[cs]=<title>E17 applet nastavení</title><br>Určen k výběru tématu ikon freedesktop.org.
 Comment[de]=
 Comment[eo]=<title>Aplikajeto de E17-agordo</title><br>Elekti piktograman etoson por E17.
 Comment[es]=<title>Applet de configuración de E17</title><br>Applet de configuración usado para seleccionar el tema de íconos para E17.
@@ -29,4 +29,5 @@ Comment[pt_BR]=
 Comment[tr]=<title>E17 Ayarlar Programcığı</title><br>E17 simge temasını seçmek için kullanılan programcık.
 Comment[zh_CN]=
 Comment[zh_TW]=
+
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/conf_imc/Makefile.in b/src/modules/conf_imc/Makefile.in
index ee9e837..9665e01 100644
--- a/src/modules/conf_imc/Makefile.in
+++ b/src/modules/conf_imc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,6 +341,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -384,8 +385,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -500,7 +501,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_imc/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
index 6bd4bd9..15fe9c8 100644
--- a/src/modules/conf_imc/e_int_config_imc.c
+++ b/src/modules/conf_imc/e_int_config_imc.c
@@ -95,7 +95,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_imc_dialog")) return NULL;
+   if (e_config_dialog_find("E", "language/input_method_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata           = _create_data;
@@ -107,7 +107,7 @@ e_int_config_imc(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Input Method Settings"),
-			    "E", "_config_imc_dialog",
+			     "E", "language/input_method_settings",
 			     "preferences-imc", 0, v, NULL);
    return cfd;
 }
@@ -309,7 +309,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    /* Input method List */
    ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->imc_current));
    e_widget_on_change_hook_set(ob, _e_imc_list_change_cb, cfdata);
-   e_widget_min_size_set(ob, 175, 175);
+   e_widget_size_min_set(ob, 175, 175);
    cfdata->gui.imc_basic_list = ob;
 
    evas_event_freeze(evas_object_evas_get(ob));
@@ -881,7 +881,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 				     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_size_min_set(of, 160, 160);
    e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1);
 
diff --git a/src/modules/conf_imc/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c
index 7bd2888..4d0b5c3 100644
--- a/src/modules/conf_imc/e_int_config_imc_import.c
+++ b/src/modules/conf_imc/e_int_config_imc_import.c
@@ -104,7 +104,7 @@ e_int_config_imc_import(E_Config_Dialog *parent)
    import->fsel_obj = ofm;
    e_widget_list_object_append(o, ofm, 1, 1, 0.5);
    
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_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);
@@ -123,7 +123,7 @@ e_int_config_imc_import(E_Config_Dialog *parent)
    e_win_centered_set(win, 1);
    
    o = import->box_obj;
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
    
diff --git a/src/modules/conf_interaction/Makefile.in b/src/modules/conf_interaction/Makefile.in
index 4b874cf..4f6fd4e 100644
--- a/src/modules/conf_interaction/Makefile.in
+++ b/src/modules/conf_interaction/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_interaction/e_int_config_interaction.c b/src/modules/conf_interaction/e_int_config_interaction.c
index 44db4b8..fe997f6 100644
--- a/src/modules/conf_interaction/e_int_config_interaction.c
+++ b/src/modules/conf_interaction/e_int_config_interaction.c
@@ -23,7 +23,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_config_interaction_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/interaction")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -35,7 +35,7 @@ e_int_config_interaction(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Interaction Settings"),
-			     "E", "_config_config_interaction_dialog",
+			     "E", "keyboard_and_mouse/interaction",
 			     "preferences-interaction", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_intl/Makefile.in b/src/modules/conf_intl/Makefile.in
index 68985cf..906a9dd 100644
--- a/src/modules/conf_intl/Makefile.in
+++ b/src/modules/conf_intl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_intl/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
index f0909a0..1d507ee 100644
--- a/src/modules/conf_intl/e_int_config_intl.c
+++ b/src/modules/conf_intl/e_int_config_intl.c
@@ -569,7 +569,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_intl_dialog")) return NULL;
+   if (e_config_dialog_find("E", "language/language_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata           = _create_data;
@@ -581,7 +581,7 @@ e_int_config_intl(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Language Settings"),
-			    "E", "_config_intl_dialog",
+			     "E", "language/language_settings",
 			     "preferences-desktop-locale", 0, v, NULL);
    return cfd;
 }
@@ -899,7 +899,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    o = e_widget_table_add(evas, 0);
    of = e_widget_framelist_add(evas, _("Language Selector"), 0);
    ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_blang));
-   e_widget_min_size_set(ob, 175, 175);
+   e_widget_size_min_set(ob, 175, 175);
    e_widget_on_change_hook_set(ob, _ilist_basic_language_cb_change, cfdata);
    cfdata->gui.blang_list = ob;
    e_widget_framelist_object_append(of, ob);
@@ -953,7 +953,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL);
    cfdata->gui.locale_entry = ob;
    e_widget_disabled_set(cfdata->gui.locale_entry, 1);
-   e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25);
+   e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
    e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 
 				     0, 1, 1, 1, 1, 1, 1, 0);
    e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
@@ -993,7 +993,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
      }
 
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 140, 200);
+   e_widget_size_min_set(ob, 140, 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob));
 
@@ -1002,7 +1002,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->gui.reg_list = ob;
 
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 100, 100);
+   e_widget_size_min_set(ob, 100, 100);
    e_widget_framelist_object_append(of, ob);
    e_widget_ilist_selected_set(ob, e_widget_ilist_selected_get(ob));
 
@@ -1011,7 +1011,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->gui.cs_list = ob;
 
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 100, 100);
+   e_widget_size_min_set(ob, 100, 100);
    e_widget_framelist_object_append(of, ob);
    
    /* Modified List */
@@ -1019,7 +1019,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->gui.mod_list = ob;
 
    e_widget_ilist_go(ob);
-   e_widget_min_size_set(ob, 100, 100);
+   e_widget_size_min_set(ob, 100, 100);
    e_widget_framelist_object_append(of, ob);
 
    e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1);
@@ -1031,7 +1031,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_entry_add(evas, &(cfdata->cur_language), NULL, NULL, NULL);
    cfdata->gui.locale_entry = ob;
    e_widget_disabled_set(cfdata->gui.locale_entry, 1);
-   e_widget_min_size_set(cfdata->gui.locale_entry, 100, 25);
+   e_widget_size_min_set(cfdata->gui.locale_entry, 100, 25);
    e_widget_frametable_object_append(of, cfdata->gui.locale_entry, 
 				     0, 1, 1, 1, 1, 1, 1, 0);
    e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 0, 1, 0);
diff --git a/src/modules/conf_keybindings/Makefile.in b/src/modules/conf_keybindings/Makefile.in
index 6adecd3..3440431 100644
--- a/src/modules/conf_keybindings/Makefile.in
+++ b/src/modules/conf_keybindings/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 9bbe21d..d419f8b 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -80,7 +80,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_keybindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/key_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -90,7 +90,7 @@ e_int_config_keybindings(E_Container *con, const char *params)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con, _("Key Binding Settings"), "E", 
-			     "_config_keybindings_dialog",
+			     "keyboard_and_mouse/key_bindings",
 			     "preferences-desktop-keyboard", 0, v, NULL);
    if ((params) && (params[0]))
      {
@@ -223,7 +223,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_frametable_add(evas, _("Key Bindings"), 0);
    ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding));
    cfdata->gui.o_binding_list = ob;   
-   e_widget_min_size_set(ob, 200, 200);
+   e_widget_size_min_set(ob, 200, 200);
    e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 1);
    ob = e_widget_button_add(evas, _("Add Key"), NULL, _add_key_binding_cb, cfdata, NULL);
    cfdata->gui.o_add = ob;
@@ -248,7 +248,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Action"), 0);
    ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action));
    cfdata->gui.o_action_list = ob;
-   e_widget_min_size_set(ob, 200, 280);
+   e_widget_size_min_set(ob, 200, 280);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
    
diff --git a/src/modules/conf_menus/Makefile.in b/src/modules/conf_menus/Makefile.in
index 7338f5f..5b1b608 100644
--- a/src/modules/conf_menus/Makefile.in
+++ b/src/modules/conf_menus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index ef977a8..95a7534 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -30,7 +30,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_menus_dialog")) return NULL;
+   if (e_config_dialog_find("E", "menus/menu_settings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -42,7 +42,7 @@ e_int_config_menus(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Menu Settings"),
-			     "E", "_config_menus_dialog",
+			     "E", "menus/menu_settings",
 			     "preferences-menus", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mime/Makefile.in b/src/modules/conf_mime/Makefile.in
index 2a2b288..06723ad 100644
--- a/src/modules/conf_mime/Makefile.in
+++ b/src/modules/conf_mime/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,6 +341,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -384,8 +385,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -500,7 +501,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_mime/e_int_config_mime.c b/src/modules/conf_mime/e_int_config_mime.c
index b29ddca..b6006bf 100644
--- a/src/modules/conf_mime/e_int_config_mime.c
+++ b/src/modules/conf_mime/e_int_config_mime.c
@@ -54,14 +54,14 @@ e_int_config_mime(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_mime_dialog")) return NULL;
+   if (e_config_dialog_find("E", "fileman/file_icons")) 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, _("File Icons"), "E", "_config_mime_dialog",
+   cfd = e_config_dialog_new(con, _("File Icons"), "E", "fileman/file_icons",
 			     "preferences-file-icons", 0, v, NULL);
    return cfd;
 }
@@ -187,7 +187,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ol = e_widget_ilist_add(evas, 16, 16, NULL);
    cfdata->gui.list = ol;
    e_widget_ilist_go(ol);
-   e_widget_min_size_set(cfdata->gui.list, 250, 200);
+   e_widget_size_min_set(cfdata->gui.list, 250, 200);
    e_widget_frametable_object_append(of, ol, 0, 0, 3, 1, 1, 1, 1, 1);
 
    ob = e_widget_button_add(evas, _("Set"), "configure", _cb_config, cfdata, NULL);
@@ -255,8 +255,8 @@ _fill_list(E_Config_Dialog_Data *cfdata, const char *mtype)
 	e_widget_ilist_append(cfdata->gui.list, icon, m->mime, NULL, NULL, NULL);
      }
    e_widget_ilist_go(cfdata->gui.list);
-   e_widget_min_size_get(cfdata->gui.list, &w, &h);
-   e_widget_min_size_set(cfdata->gui.list, w, 200);
+   e_widget_size_min_get(cfdata->gui.list, &w, &h);
+   e_widget_size_min_set(cfdata->gui.list, w, 200);
    e_widget_ilist_thaw(cfdata->gui.list);
    edje_thaw();
    evas_event_thaw(evas);
@@ -290,8 +290,8 @@ _fill_tlist(E_Config_Dialog_Data *cfdata)
      }
    
    e_widget_ilist_go(cfdata->gui.tlist);
-   e_widget_min_size_get(cfdata->gui.tlist, &w, &h);
-   e_widget_min_size_set(cfdata->gui.tlist, w, 225);
+   e_widget_size_min_get(cfdata->gui.tlist, &w, &h);
+   e_widget_size_min_set(cfdata->gui.tlist, w, 225);
    e_widget_ilist_thaw(cfdata->gui.tlist);
    edje_thaw();
    evas_event_thaw(evas_object_evas_get(cfdata->gui.tlist));
diff --git a/src/modules/conf_mime/e_int_config_mime_edit.c b/src/modules/conf_mime/e_int_config_mime_edit.c
index c4866b8..d6e73c5 100644
--- a/src/modules/conf_mime/e_int_config_mime_edit.c
+++ b/src/modules/conf_mime/e_int_config_mime_edit.c
@@ -138,7 +138,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
    e_widget_entry_readonly_set(ob, 1);
-   e_widget_min_size_set(ob, 100, 1);
+   e_widget_size_min_set(ob, 100, 1);
    e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
       
@@ -168,7 +168,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 	if (icon) 
 	  e_widget_button_icon_set(oi, icon);
      }
-   e_widget_min_size_set(oi, 48, 48);
+   e_widget_size_min_set(oi, 48, 48);
    e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
@@ -277,7 +277,7 @@ _cb_icon_sel(void *data, void *data2)
 
    cfdata->gui.fsel_wid = o;
    evas_object_show(o);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    
    e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
diff --git a/src/modules/conf_mouse/Makefile.in b/src/modules/conf_mouse/Makefile.in
index 831df9f..d954e51 100644
--- a/src/modules/conf_mouse/Makefile.in
+++ b/src/modules/conf_mouse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_mouse/e_int_config_mouse.c b/src/modules/conf_mouse/e_int_config_mouse.c
index dbd8fe6..8aee863 100644
--- a/src/modules/conf_mouse/e_int_config_mouse.c
+++ b/src/modules/conf_mouse/e_int_config_mouse.c
@@ -5,11 +5,12 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static int  _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object  *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
 					   E_Config_Dialog_Data *cfdata);
+static int  _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 
 struct _E_Config_Dialog_Data
 {
    E_Config_Dialog *cfd;
-   
+
    int mouse_hand;
    double numerator;
    double denominator;
@@ -21,20 +22,20 @@ e_int_config_mouse(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   
-   if (e_config_dialog_find("E", "_config_mouse_dialog")) 
+
+   if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_settings"))
      return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+   if (!v) return NULL;
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
    v->basic.create_widgets = _basic_create_widgets;
-   v->override_auto_apply = 1;
-   
-   cfd = e_config_dialog_new(con, _("Mouse Settings"), "E", 
-			     "_config_mouse_dialog", 
+   v->basic.check_changed = _basic_check_changed;
+
+   cfd = e_config_dialog_new(con, _("Mouse Settings"), "E",
+			     "keyboard_and_mouse/mouse_settings",
 			     "preferences-desktop-mouse", 0, v, NULL);
    return cfd;
 }
@@ -60,23 +61,28 @@ _create_data(E_Config_Dialog *cfd)
    return cfdata;
 }
 
-static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+static int
+_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
-   if (!cfdata) return;
+   return !((cfdata->mouse_hand == e_config->mouse_hand) &&
+	    (cfdata->numerator == e_config->mouse_accel_numerator) &&
+	    (cfdata->denominator == e_config->mouse_accel_denominator) &&
+	    (cfdata->threshold == e_config->mouse_accel_threshold));
+}
 
+static void
+_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
+{
    E_FREE(cfdata);
 }
 
 /* advanced window */
 static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
    e_config->mouse_hand = cfdata->mouse_hand;
-
    e_config->mouse_accel_numerator = cfdata->numerator;
-   /* Force denominator to 1 for simplicity. */
-   e_config->mouse_accel_denominator = 1;
+   e_config->mouse_accel_denominator = cfdata->denominator;
    e_config->mouse_accel_threshold = cfdata->threshold;
 
    /* Apply the above settings */
@@ -106,18 +112,18 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 
    ob = e_widget_label_add(evas, _("Acceleration"));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1.0, 0,
 			    &(cfdata->numerator), NULL, 100);
    e_widget_framelist_object_append(of, ob);
-   
+
    ob = e_widget_label_add(evas, _("Threshold"));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1.0, 0, 
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 1.0, 10.0, 1.0, 0,
 			    &(cfdata->threshold), NULL, 100);
    e_widget_framelist_object_append(of, ob);
 
    e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
+
    e_dialog_resizable_set(cfd->dia, 0);
-   return o;   
+   return o;
 }
diff --git a/src/modules/conf_mouse/e_mod_main.c b/src/modules/conf_mouse/e_mod_main.c
index 5bbe5fc..83dcc03 100644
--- a/src/modules/conf_mouse/e_mod_main.c
+++ b/src/modules/conf_mouse/e_mod_main.c
@@ -39,7 +39,7 @@ e_modapi_init(E_Module *m)
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
    while ((cfd = e_config_dialog_get("E", "_config_mouse_dialog"))) e_object_del(E_OBJECT(cfd));
@@ -50,7 +50,7 @@ e_modapi_shutdown(E_Module *m)
 }
 
 EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m __UNUSED__)
 {
    return 1;
 }
diff --git a/src/modules/conf_mouse_cursor/Makefile.in b/src/modules/conf_mouse_cursor/Makefile.in
index 82bf2bd..b365215 100644
--- a/src/modules/conf_mouse_cursor/Makefile.in
+++ b/src/modules/conf_mouse_cursor/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_mouse_cursor/e_int_config_cursor.c b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
index ddfba6f..0e4aa9d 100644
--- a/src/modules/conf_mouse_cursor/e_int_config_cursor.c
+++ b/src/modules/conf_mouse_cursor/e_int_config_cursor.c
@@ -31,7 +31,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_cursor_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/mouse_cursor")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -43,7 +43,7 @@ e_int_config_cursor(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Cursor Settings"),
-			     "E", "_config_cursor_dialog",
+			     "E", "appearance/mouse_cursor",
 			     "preferences-desktop-pointer", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_mousebindings/Makefile.in b/src/modules/conf_mousebindings/Makefile.in
index befbca8..d50d353 100644
--- a/src/modules/conf_mousebindings/Makefile.in
+++ b/src/modules/conf_mousebindings/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index ed9fd7d..939c939 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -99,7 +99,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_mousebindings_dialog")) return NULL;
+   if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_bindings")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -110,7 +110,7 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Mouse Binding Settings"),
-			     "E", "_config_mousebindings_dialog",
+			     "E", "keyboard_and_mouse/mouse_bindings",
 			     "preferences-desktop-mouse", 0, v, NULL);
    return cfd;
 }
@@ -275,7 +275,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ot = e_widget_frametable_add(evas, _("Mouse Bindings"), 0);
    ob = e_widget_ilist_add(evas, 32, 32, &(cfdata->locals.binding));
    cfdata->gui.o_binding_list = ob;
-   e_widget_min_size_set(ob, 200, 200);
+   e_widget_size_min_set(ob, 200, 200);
    e_widget_frametable_object_append(ot, ob, 0, 0, 2, 1, 1, 1, 1, 1);
 
    ob = e_widget_button_add(evas, _("Add Binding"), NULL, _add_mouse_binding_cb, cfdata, NULL);
@@ -301,7 +301,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Action"), 0);
    ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->locals.action));
    cfdata->gui.o_action_list = ob;
-   e_widget_min_size_set(ob, 200, 200);
+   e_widget_size_min_set(ob, 200, 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1);
    
diff --git a/src/modules/conf_paths/Makefile.in b/src/modules/conf_paths/Makefile.in
index cec6862..f108b4a 100644
--- a/src/modules/conf_paths/Makefile.in
+++ b/src/modules/conf_paths/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_paths/e_int_config_paths.c b/src/modules/conf_paths/e_int_config_paths.c
index 14ee063..8131b85 100644
--- a/src/modules/conf_paths/e_int_config_paths.c
+++ b/src/modules/conf_paths/e_int_config_paths.c
@@ -51,7 +51,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_paths_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/search_directories")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata           = _create_data;
@@ -60,7 +60,7 @@ e_int_config_paths(E_Container *con, const char *params __UNUSED__)
    v->basic.apply_cfdata      = _basic_apply_data;
    
    cfd = e_config_dialog_new(con, _("Search Path Settings"),
-			    "E", "_config_paths_dialog",
+			     "E", "advanced/search_directories",
 			     "preferences-directories", 0, v, NULL);
    return cfd;
 }
@@ -168,7 +168,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("E Paths"), 0);
    ob = e_widget_ilist_add(evas, 0, 0, NULL);
    cfdata->gui.path_list = ob;
-   e_widget_min_size_set(ob, 170, 100);
+   e_widget_size_min_set(ob, 170, 100);
 
    evas_event_freeze(evas_object_evas_get(cfdata->gui.path_list));
    edje_freeze();
@@ -199,7 +199,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Default Directories"), 0);
    ob = e_widget_ilist_add(evas, 0, 0, NULL);
    cfdata->gui.default_list = ob;
-   e_widget_min_size_set(ob, 100, 100);
+   e_widget_size_min_set(ob, 100, 100);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1);
 
diff --git a/src/modules/conf_performance/Makefile.in b/src/modules/conf_performance/Makefile.in
index 71beefd..c4a7d5e 100644
--- a/src/modules/conf_performance/Makefile.in
+++ b/src/modules/conf_performance/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_performance/e_int_config_performance.c b/src/modules/conf_performance/e_int_config_performance.c
index d227e7f..1ea07b3 100644
--- a/src/modules/conf_performance/e_int_config_performance.c
+++ b/src/modules/conf_performance/e_int_config_performance.c
@@ -26,7 +26,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_performance_dialog")) return NULL;
+   if (e_config_dialog_find("E", "advanced/performance")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -38,7 +38,7 @@ e_int_config_performance(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Performance Settings"),
-			    "E", "_config_performance_dialog",
+			     "E", "advanced/performance",
 			     "preferences-system-performance", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_profiles/Makefile.in b/src/modules/conf_profiles/Makefile.in
index a69180b..cad6ec0 100644
--- a/src/modules/conf_profiles/Makefile.in
+++ b/src/modules/conf_profiles/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_profiles/e_int_config_profiles.c b/src/modules/conf_profiles/e_int_config_profiles.c
index b4a27fa..9cd410f 100644
--- a/src/modules/conf_profiles/e_int_config_profiles.c
+++ b/src/modules/conf_profiles/e_int_config_profiles.c
@@ -7,7 +7,6 @@ static Evas_Object *_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_D
 static void _ilist_fill(E_Config_Dialog_Data *cfdata);
 static void _ilist_cb_selected(void *data);
 static void _cb_add(void *data, void *data2);
-static void _cb_select(void *data, void *data2);
 static void _cb_delete(void *data, void *data2);
 static void _cb_reset(void *data, void *data2);
 static void _cb_dialog_yes(void *data);
@@ -44,7 +43,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_profiles_dialog")) return NULL;
+   if (e_config_dialog_find("E", "settings/profiles")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    v->create_cfdata = _create_data;
@@ -54,7 +53,7 @@ e_int_config_profiles(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Profile Selector"),
-			    "E", "_config_profiles_dialog",
+			     "E", "settings/profiles",
 			     "preferences-profiles", 0, v, NULL);
    e_config_dialog_changed_auto_set(cfd, 0);
    return cfd;
@@ -106,13 +105,13 @@ _create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 
    of = e_widget_framelist_add(evas, _("Available Profiles"), 0);
    cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->sel_profile));
-   e_widget_min_size_set(cfdata->o_list, 140 * e_scale, 50 * e_scale);
+   e_widget_size_min_set(cfdata->o_list, 140 * e_scale, 50 * e_scale);
    e_widget_framelist_object_append(of, cfdata->o_list);
 
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    ob = e_widget_textblock_add(evas);
-   e_widget_min_size_set(ob, 140 * e_scale, 50 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 50 * e_scale);
    e_widget_textblock_markup_set(ob, _("Select a profile"));
    e_widget_list_object_append(o, ob, 1, 0, 0.5);
    cfdata->o_text = ob;
@@ -206,7 +205,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
    if (profiles) eina_list_free(profiles);
    if (selected >= 0)
      e_widget_ilist_selected_set(cfdata->o_list, selected);   
-   e_widget_min_size_set(cfdata->o_list, 155, 250);
+   e_widget_size_min_set(cfdata->o_list, 155, 250);
    e_widget_ilist_go(cfdata->o_list);
 
    e_widget_ilist_thaw(cfdata->o_list);
@@ -355,11 +354,11 @@ _dia_new_profile(E_Config_Dialog_Data *cfdata)
 				     0, 0, 1, 1,
 				     0, 1, 0, 0);
    ob = e_widget_entry_add(evas, &(cfdata->new_profile), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 100, 1);
+   e_widget_size_min_set(ob, 100, 1);
    e_widget_table_object_append(ot, ob,
 				     1, 0, 1, 1,
 				     1, 1, 1, 0);
-   e_widget_min_size_get(ot, &mw, &mh);
+   e_widget_size_min_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
 
    e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata);
diff --git a/src/modules/conf_scale/Makefile.in b/src/modules/conf_scale/Makefile.in
index 9e53974..9d9da47 100644
--- a/src/modules/conf_scale/Makefile.in
+++ b/src/modules/conf_scale/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_scale/e_int_config_scale.c b/src/modules/conf_scale/e_int_config_scale.c
index 7100fa2..cce7b3f 100644
--- a/src/modules/conf_scale/e_int_config_scale.c
+++ b/src/modules/conf_scale/e_int_config_scale.c
@@ -45,7 +45,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_scale_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/scale")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -59,7 +59,7 @@ e_int_config_scale(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Scaling Settings"),
-			     "E", "_config_scale_dialog",
+			     "E", "appearance/scale",
 			     "preferences-scale", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_scale/module.desktop b/src/modules/conf_scale/module.desktop
index f756e5c..2ad6b6d 100644
--- a/src/modules/conf_scale/module.desktop
+++ b/src/modules/conf_scale/module.desktop
@@ -15,7 +15,7 @@ Name[tr]=Ayarlar - Ölçekleme
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_scale
-Comment=<title>E17 Settings Applet</title><br>Used to configure certain how Display scaling is handled.
+Comment=<title>E17 Settings Applet</title><br>Used to configure how Display scaling is handled.
 Comment[cs]=<title>E17 applet nastavení</title><br>Použit pro nastavení škálování displeje.
 Comment[de]=
 Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Permesas agordi la skaladon.
diff --git a/src/modules/conf_scale/module.desktop.in b/src/modules/conf_scale/module.desktop.in
index f756e5c..2ad6b6d 100644
--- a/src/modules/conf_scale/module.desktop.in
+++ b/src/modules/conf_scale/module.desktop.in
@@ -15,7 +15,7 @@ Name[tr]=Ayarlar - Ölçekleme
 Name[zh_CN]=
 Name[zh_TW]=
 Icon=e-module-conf_scale
-Comment=<title>E17 Settings Applet</title><br>Used to configure certain how Display scaling is handled.
+Comment=<title>E17 Settings Applet</title><br>Used to configure how Display scaling is handled.
 Comment[cs]=<title>E17 applet nastavení</title><br>Použit pro nastavení škálování displeje.
 Comment[de]=
 Comment[eo]=<title>Aplikaĵeto de agordo de E17</title><br>Permesas agordi la skaladon.
diff --git a/src/modules/conf_screensaver/Makefile.in b/src/modules/conf_screensaver/Makefile.in
index b56eedf..7127fd2 100644
--- a/src/modules/conf_screensaver/Makefile.in
+++ b/src/modules/conf_screensaver/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_screensaver/e_int_config_screensaver.c b/src/modules/conf_screensaver/e_int_config_screensaver.c
index 946720e..5b1176f 100644
--- a/src/modules/conf_screensaver/e_int_config_screensaver.c
+++ b/src/modules/conf_screensaver/e_int_config_screensaver.c
@@ -52,7 +52,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_screensaver_dialog")) return NULL;
+   if (e_config_dialog_find("E", "screen/screen_saver")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata = _create_data;
@@ -65,7 +65,7 @@ e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
 
    cfd = e_config_dialog_new(con,_("Screen Saver Settings"),
-			     "E", "_config_screensaver_dialog",
+			     "E", "screen/screen_saver",
 			     "preferences-desktop-screensaver", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_shelves/Makefile.in b/src/modules/conf_shelves/Makefile.in
index 7644fa5..0f0b3fa 100644
--- a/src/modules/conf_shelves/Makefile.in
+++ b/src/modules/conf_shelves/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 8c12efa..e2c1c7f 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -33,7 +33,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_shelf_dialog")) return NULL;
+   if (e_config_dialog_find("E", "extensions/shelves")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL; 
    v->create_cfdata = _create_data;
@@ -41,7 +41,7 @@ e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
 
    cfd = e_config_dialog_new(con, _("Shelf Settings"), "E", 
-			     "_config_shelf_dialog",
+			     "extensions/shelves",
 			     "preferences-desktop-shelf", 0, v, NULL);
    return cfd;
 }
@@ -71,7 +71,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    of = e_widget_framelist_add(evas, _("Configured Shelves"), 0);
    cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_shelf));
    e_widget_ilist_selector_set(cfdata->o_list, 1);
-   e_widget_min_size_set(cfdata->o_list, 155, 250);
+   e_widget_size_min_set(cfdata->o_list, 155, 250);
    e_widget_framelist_object_append(of, cfdata->o_list);   
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
@@ -179,7 +179,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 			      _ilist_cb_selected, cfdata, buf);
      }
 
-   e_widget_min_size_set(cfdata->o_list, 155, 250);
+   e_widget_size_min_set(cfdata->o_list, 155, 250);
    e_widget_ilist_go(cfdata->o_list);
    e_widget_ilist_thaw(cfdata->o_list);
    edje_thaw();
diff --git a/src/modules/conf_startup/Makefile.in b/src/modules/conf_startup/Makefile.in
index b5713aa..15421d6 100644
--- a/src/modules/conf_startup/Makefile.in
+++ b/src/modules/conf_startup/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_startup/e_int_config_startup.c b/src/modules/conf_startup/e_int_config_startup.c
index 34aa377..4de11bf 100644
--- a/src/modules/conf_startup/e_int_config_startup.c
+++ b/src/modules/conf_startup/e_int_config_startup.c
@@ -27,7 +27,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_startup_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/startup")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -37,7 +37,7 @@ e_int_config_startup(E_Container *con, const char *params __UNUSED__)
    
    cfd = e_config_dialog_new(con,
 			     _("Startup Settings"),
-			     "E", "_config_startup_dialog",
+			     "E", "appearance/startup",
 			     "preferences-startup", 0, v, NULL);
    return cfd;
 }
@@ -319,7 +319,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 				     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_size_min_set(of, 160, 160);
    e_widget_table_object_append(ol, of, 0, 2, 1, 1, 1, 1, 1, 1);
    e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1);
    
diff --git a/src/modules/conf_theme/Makefile.in b/src/modules/conf_theme/Makefile.in
index 52668c7..064c255 100644
--- a/src/modules/conf_theme/Makefile.in
+++ b/src/modules/conf_theme/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,6 +341,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -387,8 +388,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -504,7 +505,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index cf61fb7..10bd54c 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -76,7 +76,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_theme_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/theme")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    v->create_cfdata           = _create_data;
@@ -88,7 +88,7 @@ e_int_config_theme(E_Container *con, const char *params __UNUSED__)
    v->override_auto_apply = 1;
    cfd = e_config_dialog_new(con,
 			     _("Theme Selector"),
-			     "E", "_config_theme_dialog",
+			     "E", "appearance/theme",
 			     "preferences-desktop-theme", 0, v, NULL);
    return cfd;
 }
@@ -187,6 +187,8 @@ _cb_files_selection_change(void *data, Evas_Object *obj, void *event_info)
    if (cfdata->o_fm) e_widget_change(cfdata->o_fm);
 }
 
+#if 0
+/* FIXME unused */
 static void
 _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
 {
@@ -194,6 +196,7 @@ _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
 
    cfdata = data;
 }
+#endif
 
 static void
 _cb_files_files_changed(void *data, Evas_Object *obj, void *event_info)
@@ -287,10 +290,10 @@ _cb_import(void *data1, void *data2)
      cfdata->win_import = e_int_config_theme_import(cfdata->cfd);
 }
 
+#ifdef HAVE_EXCHANGE
 static void
 _cb_web(void *data1, void *data2)
 {
-#ifdef HAVE_EXCHANGE
    E_Config_Dialog_Data *cfdata;
 
    cfdata = data1;
@@ -298,8 +301,8 @@ _cb_web(void *data1, void *data2)
      e_win_raise(cfdata->dia_web->win);
    else
      cfdata->dia_web = e_int_config_theme_web(cfdata->cfd);
-#endif
 }
+#endif
 
 static void
 _fill_data(E_Config_Dialog_Data *cfdata)
@@ -421,7 +424,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 				  _cb_files_files_deleted, cfdata);
    e_widget_flist_path_set(o, path, "/");
 
-   e_widget_min_size_set(o, 160, 160);
+   e_widget_size_min_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);
 
@@ -451,7 +454,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 	e_widget_preview_edje_set(o, cfdata->theme, "e/desktop/background");
       e_widget_aspect_child_set(oa, o);
       e_widget_list_object_append(of, oa, 1, 1, 0);
-
+      evas_object_show(o);
+      evas_object_show(oa);
    }
    e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
@@ -540,23 +544,16 @@ _get_theme_categories_list(void)
     */
    EINA_LIST_FOREACH(e_theme_category_list(), g, c)
      {
-	const char *result;
+	int res;
 
 	if (!c) continue;
 
-	cats2 = eina_list_search_sorted_near_list(cats, _cb_sort, c);
-	result = eina_list_data_get(cats2);
-	if (result)
-	  {
-	     int res;
-
-	     res = strcmp(c, result);
-	     if (!res) continue;
-	     if (res < 0)
-	       cats = eina_list_prepend_relative_list(cats, eina_stringshare_ref(c), cats2);
-	     else
-	       cats = eina_list_append_relative_list(cats, eina_stringshare_ref(c), cats2);
-	  }
+	cats2 = eina_list_search_sorted_near_list(cats, _cb_sort, c, &res);
+	if (!res) continue;
+	if (res < 0)
+	  cats = eina_list_prepend_relative_list(cats, eina_stringshare_ref(c), cats2);
+	else
+	  cats = eina_list_append_relative_list(cats, eina_stringshare_ref(c), cats2);
      }
 
    EINA_LIST_FREE(cats, category)
@@ -1006,7 +1003,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_on_change_hook_set(ob, _cb_adv_categories_change, cfdata);
    cfdata->o_categories_ilist = ob;
    e_widget_ilist_multi_select_set(ob, 0);
-   e_widget_min_size_set(ob, 150, 250);
+   e_widget_size_min_set(ob, 150, 250);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 0, 1);
 
@@ -1014,7 +1011,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    ob = e_widget_ilist_add(evas, 16, 16, NULL);
    e_widget_on_change_hook_set(ob, _cb_adv_theme_change, cfdata);
    cfdata->o_files_ilist = ob;
-   e_widget_min_size_set(ob, 150, 250);
+   e_widget_size_min_set(ob, 150, 250);
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c
index 4d4846b..104820b 100644
--- a/src/modules/conf_theme/e_int_config_theme_import.c
+++ b/src/modules/conf_theme/e_int_config_theme_import.c
@@ -105,7 +105,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    import->fsel_obj = ofm;
    e_widget_list_object_append(o, ofm, 1, 1, 0.5);
    
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_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);
@@ -124,7 +124,7 @@ e_int_config_theme_import(E_Config_Dialog *parent)
    e_win_centered_set(win, 1);
    
    o = import->box_obj;
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
    
diff --git a/src/modules/conf_transitions/Makefile.in b/src/modules/conf_transitions/Makefile.in
index bb4621d..439deb6 100644
--- a/src/modules/conf_transitions/Makefile.in
+++ b/src/modules/conf_transitions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_transitions/e_int_config_transitions.c b/src/modules/conf_transitions/e_int_config_transitions.c
index d0cfa24..fbd7573 100644
--- a/src/modules/conf_transitions/e_int_config_transitions.c
+++ b/src/modules/conf_transitions/e_int_config_transitions.c
@@ -32,7 +32,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_transitions_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/transitions")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return NULL;
    
@@ -42,7 +42,7 @@ e_int_config_transitions(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create_widgets;
    
    cfd = e_config_dialog_new(con, _("Transition Settings"),
-			     "E", "_config_transitions_dialog",
+			     "E", "appearance/transitions",
 			     "preferences-transitions", 0, v, NULL);
    return cfd;
 }
@@ -126,7 +126,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Events"), 0);
    il = e_widget_ilist_add(evas, 48, 48, NULL);
    cfdata->event_list = il;
-   e_widget_min_size_set(il, 140, 200);
+   e_widget_size_min_set(il, 140, 200);
    
    evas_event_freeze(evas_object_evas_get(il));
    edje_freeze();
@@ -144,7 +144,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    of = e_widget_framelist_add(evas, _("Transitions"), 0);
    il = e_widget_ilist_add(evas, 48, 48, NULL);
    cfdata->trans_list = il;
-   e_widget_min_size_set(il, 100, 200);
+   e_widget_size_min_set(il, 100, 200);
    
    evas_event_freeze(evas_object_evas_get(il));
    edje_freeze();
diff --git a/src/modules/conf_wallpaper/Makefile.in b/src/modules/conf_wallpaper/Makefile.in
index 070a20e..68919e7 100644
--- a/src/modules/conf_wallpaper/Makefile.in
+++ b/src/modules/conf_wallpaper/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -342,6 +342,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -390,8 +391,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -508,7 +509,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
index 267912d..0f5ea8a 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -83,7 +83,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    E_Config_Dialog_View *v;
    E_Config_Wallpaper *cw;
 
-   if (e_config_dialog_find("E", "_config_wallpaper_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/wallpaper")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    cw = E_NEW(E_Config_Wallpaper, 1);
 
@@ -108,7 +108,7 @@ _e_int_config_wallpaper_desk(E_Container *con, int con_num, int zone_num, int de
    cw->desk_y = desk_y;
 
    cfd = e_config_dialog_new(con, _("Wallpaper Settings"), "E", 
-			     "_config_wallpaper_dialog",
+			     "appearance/wallpaper",
 			     "preferences-desktop-wallpaper", 0, v, cw);
    return cfd;
 }
@@ -538,7 +538,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 				  _cb_files_files_deleted, cfdata);
    e_widget_flist_path_set(ow, path, "/");
 
-   e_widget_min_size_set(ow, 160, 160);
+   e_widget_size_min_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);
 
@@ -574,6 +574,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
      f = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
    e_widget_preview_edje_set(ow, f, "e/desktop/background");
    e_widget_aspect_child_set(oa, ow);
+   evas_object_show(ow);
+   evas_object_show(oa);
    e_widget_table_object_append(ot, oa, 0, 2, 2 + online, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, ot, 1, 1, 0.5);
    e_dialog_resizable_set(cfd->dia, 1);
@@ -666,7 +668,7 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
                                   _cb_files_files_changed, cfdata);
    e_widget_flist_path_set(ow, path, "/");
 
-   e_widget_min_size_set(ow, 160, 160);
+   e_widget_size_min_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);
 
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
index 8d3f59e..4c07623 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
@@ -155,7 +155,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
    o = _preview_widget_add(evas);
    evas_object_show(o);
    evas_object_resize(o, 200, 150);
-   e_widget_min_size_set(o, 200, 150);
+   e_widget_size_min_set(o, 200, 150);
    e_widget_framelist_object_append(of, o);
    e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
    import->preview = o;
@@ -192,7 +192,7 @@ e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
    e_widget_table_object_append(ot, of, 0, 2, 2, 1, 1, 1, 1, 1);
    e_widget_list_object_append(ol, ot, 1, 1, 0.5);
 
-   e_widget_min_size_get(ol, &mw, &mh);
+   e_widget_size_min_get(ol, &mw, &mh);
    e_dialog_content_set(dia, ol, mw, mh);
 
    e_dialog_button_add(dia, _("OK"), NULL, _import_cb_ok, cfdata);
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 b2928d4..45442b4 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -204,7 +204,7 @@ e_int_config_wallpaper_import(void *data, const char *path)
 
    e_widget_list_object_append(o, ot, 0, 0, 0.5);
 
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_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);
@@ -220,7 +220,7 @@ e_int_config_wallpaper_import(void *data, const char *path)
    e_win_centered_set(win, 1);
 
    o = import->box_obj;
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(import->bg_obj, "e.swallow.buttons", o);
 
@@ -250,6 +250,7 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
    Evas_Coord w, h;
    Evas_Modifier_Mask mask;
    const char *fdev, *fpath;
+   char buf[4096];
 
    fsel = E_NEW(FSel, 1);
    if (!fsel) return NULL;
@@ -306,24 +307,30 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
    fsel->content_obj = o;
 
    fdev = e_config->wallpaper_import_last_dev;
-   fpath = e_config->wallpaper_import_last_path;
+   snprintf(buf, sizeof(buf), "%s%s",fdev,e_config->wallpaper_import_last_path);
+
+   if(!ecore_file_exists(ecore_file_realpath(buf)))
+     fpath = "/";
+   else
+     fpath = e_config->wallpaper_import_last_path;
+
    if ((!fdev) && (!fpath))
      {
 	fdev = "~/";
 	fpath = "/";
      }
+
    ofm = e_widget_fsel_add(evas, fdev, fpath, NULL, NULL, NULL, NULL,
 			   NULL, NULL, 1);
    e_widget_fsel_window_object_set(ofm, E_OBJECT(win));
    fsel->fsel_obj = ofm;
    e_widget_list_object_append(o, ofm, 1, 1, 0.5);
 
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(fsel->bg_obj, "e.swallow.content", o);
    evas_object_show(o);
 
-
    fsel->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
 					_fsel_cb_ok, win, NULL);
    e_widget_list_object_append(fsel->box_obj, fsel->ok_obj, 1, 0, 0.5);
@@ -335,11 +342,10 @@ e_int_config_wallpaper_fsel(E_Config_Dialog *parent)
    e_win_centered_set(win, 1);
 
    o = fsel->box_obj;
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    edje_extern_object_min_size_set(o, w, h);
    edje_object_part_swallow(fsel->bg_obj, "e.swallow.buttons", o);
 
-
    edje_object_size_min_calc(fsel->bg_obj, &w, &h);
    evas_object_resize(fsel->bg_obj, w, h);
    e_win_resize(win, w, h);
@@ -615,10 +621,8 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
    e_int_config_wallpaper_import_del(import->win);
    if (fsel)
      {
-	if (r && fsel->parent)
-	  {
-	     e_int_config_wallpaper_update(fsel->parent, fdest);
-	  }
+	if ((r) && (fsel->parent))
+          e_int_config_wallpaper_update(fsel->parent, fdest);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }
    else
@@ -718,7 +722,7 @@ _import_cb_ok(void *data, void *data2)
    e_int_config_wallpaper_import_del(win);
    if (fsel)
      {
-	if (r && fsel->parent)
+	if ((r) && (fsel->parent))
 	  e_int_config_wallpaper_update(fsel->parent, buf);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }
@@ -780,20 +784,18 @@ _fsel_cb_ok(void *data, void *data2)
 	file = ecore_file_file_get(path);
 	e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s", file);
 
-	is_bg = edje_file_group_exists(path,
-	      "e/desktop/background");
+	is_bg = edje_file_group_exists(path, "e/desktop/background");
 	is_theme =
-	   edje_file_group_exists(path,
-		 "e/widgets/border/default/border");
+          edje_file_group_exists(path, "e/widgets/border/default/border");
 
 	if ((is_bg) && (!is_theme))
 	  {
 	     if (!ecore_file_cp(path, buf))
 	       {
 		  e_util_dialog_show(_("Wallpaper Import Error"),
-			_("Enlightenment was unable to "
-			   "import the wallpaper<br>due to a "
-			   "copy error."));
+                                     _("Enlightenment was unable to "
+                                       "import the wallpaper<br>due to a "
+                                       "copy error."));
 	       }
 	     else
 	       r = 1;
@@ -801,13 +803,13 @@ _fsel_cb_ok(void *data, void *data2)
 	else
 	  {
 	     e_util_dialog_show(_("Wallpaper Import Error"),
-		   _("Enlightenment was unable to "
-		      "import the wallpaper.<br><br>"
-		      "Are you sure this is a valid "
-		      "wallpaper?"));
+                                _("Enlightenment was unable to "
+                                  "import the wallpaper.<br><br>"
+                                  "Are you sure this is a valid "
+                                  "wallpaper?"));
 	  }
 
-	if (r && fsel->parent)
+	if ((r) && (fsel->parent))
 	  e_int_config_wallpaper_update(fsel->parent, buf);
 	e_int_config_wallpaper_fsel_del(fsel->win);
      }
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
index 70b04c6..ee83daf 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
@@ -26,7 +26,7 @@ _web_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    evas_object_geometry_get(obj, NULL, NULL, NULL, &vh);
 
    if (y < 0) y = 0;
-   if (y > th - vh) y = th - vh;
+   if (y > vh - th) y = th - vh;
    exchange_smart_object_offset_set(obj, 0, y);
 }
 
@@ -51,10 +51,9 @@ _web_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 static void
 _web_pan_child_size_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
 {
-   Evas_Coord tw, th, vw, vh;
+   Evas_Coord tw, th;
 
    evas_object_size_hint_min_get(obj, &tw, &th);
-   evas_object_geometry_get(obj, NULL, NULL, &vw, &vh);
    if (x) *x = tw;
    if (y) *y = th;
 }
diff --git a/src/modules/conf_wallpaper2/Makefile.in b/src/modules/conf_wallpaper2/Makefile.in
index e6e8093..695b4f7 100644
--- a/src/modules/conf_wallpaper2/Makefile.in
+++ b/src/modules/conf_wallpaper2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -382,8 +383,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -497,7 +498,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
index 10237fd..92c114a 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
@@ -9,7 +9,6 @@
 //   need delete select mode
 //   need after select on delete an ok/cancel if file or "ok to remove whole online source" if online
 //   need to make "exchange" wallpapers have a different look
-//   need signal to emit for popping down slide-up panel
 //   bug: animated wp doesnt workon first show
 //   need to disable "this screen" if multiple containers/zones dont exist
 //   need to disable "this desktop vs all desktops" if only 1 desk exists
@@ -137,7 +136,7 @@ _e_smart_reconfigure_do(void *data)
    Item *it;
    int iw, redo = 0, changed = 0;
    static int recursion = 0;
-   Evas_Coord x, y, xx, yy, ww, hh, cw, ch, mw, mh, ox, oy, dd;
+   Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox, oy, dd;
 
    if (!sd) return 0;
    if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
@@ -236,7 +235,7 @@ _e_smart_reconfigure_do(void *data)
  */
             )
           {
-             double a, d, di;
+             double a, d;
              int sum = 0;
              char *p;
              
@@ -250,7 +249,7 @@ _e_smart_reconfigure_do(void *data)
                   if (dy < 0)
                     a = -atan(-(double)dy / (double)dx);
                   // +--
-                  // |\
+                  /* |\ */
                   else
                     a = atan((double)dy / (double)dx);
                }
@@ -324,7 +323,10 @@ _e_smart_reconfigure_do(void *data)
                          e_theme_edje_object_set(it->frame, "base/theme/widgets",
                                                  "e/conf/wallpaper/main/mini");
                        if (it->hilighted)
-                         edje_object_signal_emit(it->frame, "e,state,selected", "e");
+                         {
+                            edje_object_signal_emit(it->frame, "e,state,selected", "e");
+                            evas_object_raise(it->frame);
+                         }
                        evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_DOWN,
                                                       _item_down, it);
                        evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_UP,
@@ -482,35 +484,35 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
 static void
 _e_smart_show(Evas_Object *obj)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
 //   evas_object_show(sd->child_obj);
 }
 
 static void
 _e_smart_hide(Evas_Object *obj)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
 //   evas_object_hide(sd->child_obj);
 }
 
 static void
 _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
 //   evas_object_color_set(sd->child_obj, r, g, b, a);
 }
 
 static void
 _e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
 //   evas_object_clip_set(sd->child_obj, clip);
 }
 
 static void
 _e_smart_clip_unset(Evas_Object *obj)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
 //   evas_object_clip_unset(sd->child_obj);
 }
 
@@ -630,11 +632,13 @@ _sel_timer(void *data)
 static void
 _pan_unhilight(Evas_Object *obj, Item *it)
 {
-   Smart_Data *sd = evas_object_smart_data_get(obj);
+//   Smart_Data *sd = evas_object_smart_data_get(obj);
    if (!it->hilighted) return;
    it->hilighted = 0;
    if (it->frame)
-     edje_object_signal_emit(it->frame, "e,state,unselected", "e");
+     {
+        edje_object_signal_emit(it->frame, "e,state,unselected", "e");
+     }
 }
 
 static void
@@ -654,7 +658,10 @@ _pan_hilight(Evas_Object *obj, Item *it)
      }
    it->hilighted = 1;
    if (it->frame)
-     edje_object_signal_emit(it->frame, "e,state,selected", "e");
+     {
+        edje_object_signal_emit(it->frame, "e,state,selected", "e");
+        evas_object_raise(it->frame);
+     }
 }
 
 
@@ -664,6 +671,7 @@ _pan_sel(Evas_Object *obj, Item *it)
    Smart_Data *sd = evas_object_smart_data_get(obj);
    if (sd->selmove > 0.0) return;
    edje_object_signal_emit(it->frame, "e,state,selected", "e");
+   evas_object_raise(it->frame); 
    if (!it->selected)
      {
         Eina_List *l;
@@ -731,7 +739,7 @@ _pan_sel_up(Evas_Object *obj)
 static int
 _sort_cb(const void *d1, const void *d2)
 {
-   Item *it1 = d1, *it2 = d2;
+   const Item *it1 = d1, *it2 = d2;
    if ((!it1->sort_id) || (!it2->sort_id)) return 0;
    return strcmp(it1->sort_id, it2->sort_id);
 }
@@ -742,7 +750,6 @@ _item_sort(Item *it)
    Evas_Object *obj = it->obj;
    Smart_Data *sd = evas_object_smart_data_get(obj);
    int num, dosort = 0;
-   Eina_List *l;
    
    sd->id_num++;
    sd->info->scans--;
@@ -767,9 +774,9 @@ _item_sort(Item *it)
                   it2 = NULL;
                }
              if (it2)
-               _pan_set(obj, 
-                        it2->x + (it2->w / 2) - (sd->w / 2), 
-                        it2->y + (it2->h / 2) - (sd->h / 2));
+               e_scrollframe_child_region_show(sd->info->sframe,
+                                               it2->x, it2->y,
+                                               it2->w, it2->h);
              sd->jump2hi = 1;
           }
      }
@@ -811,8 +818,8 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
 static void         
 _item_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   Evas_Event_Mouse_Down *ev = event_info;
-   Item *it = data;
+//   Evas_Event_Mouse_Down *ev = event_info;
+//   Item *it = data;
 //   _pan_sel(it->obj, it);
 }
     
@@ -854,7 +861,10 @@ _pan_file_add(Evas_Object *obj, const char *file, Eina_Bool remote, Eina_Bool th
      e_theme_edje_object_set(it->frame, "base/theme/widgets",
                              "e/conf/wallpaper/main/mini");
    if (it->hilighted)
-     edje_object_signal_emit(it->frame, "e,state,selected", "e");
+     {
+        edje_object_signal_emit(it->frame, "e,state,selected", "e");
+        evas_object_raise(it->frame);
+     }
    evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_DOWN,
                                   _item_down, it);
    evas_object_event_callback_add(it->frame, EVAS_CALLBACK_MOUSE_UP,
@@ -997,12 +1007,21 @@ static void
 _wp_add(void *data, void *data2)
 {
    Info *info = data;
+   edje_object_signal_emit(info->bg, "e,action,panel,hide", "e");
 }
 
 static void
 _wp_delete(void *data, void *data2)
 {
    Info *info = data;
+   edje_object_signal_emit(info->bg, "e,action,panel,hide", "e");
+}
+
+static void
+_wp_changed(void *data, Evas_Object *obj, void *event_info)
+{
+   Info *info = data;
+   edje_object_signal_emit(info->bg, "e,action,panel,hide", "e");
 }
 
 static void _scan(Info *info);
@@ -1011,7 +1030,7 @@ static int
 _idler(void *data)
 {
    struct dirent *dp;
-   char buf[PATH_MAX], *p;
+   char buf[PATH_MAX];
    Info *info = data;
    
    if (!info->dir)
@@ -1055,7 +1074,6 @@ _scan(Info *info)
         if (info->scans <= 0)
           {
              info->scans = 0;
-             printf("START\n");
              edje_object_signal_emit(info->bg, "e,state,busy,on", "e");
              edje_object_part_text_set(info->bg, "e.text.busy_label", _("Loading files..."));
           }
@@ -1131,7 +1149,7 @@ wp_browser_new(E_Container *con)
    info->dirs = eina_list_append(info->dirs, strdup(buf));
    
    e_win_title_set(win, _("Wallpaper Settings"));
-   e_win_name_class_set(win, "E", "_config_wallpaper_dialog");
+   e_win_name_class_set(win, "E", "_config::appearance/wallpaper2");
    e_win_border_icon_set(win, "preferences-desktop-wallpaper");
    e_win_resize_callback_set(win, _resize);
    e_win_delete_callback_set(win, _delete);
@@ -1151,7 +1169,7 @@ wp_browser_new(E_Container *con)
    evas_object_show(info->button);
    e_widget_list_object_append(info->box, info->button, 1, 0, 0.5);
    
-   e_widget_min_size_get(info->box, &mw, &mh);
+   e_widget_size_min_get(info->box, &mw, &mh);
    edje_extern_object_min_size_set(info->box, mw, mh);
    edje_object_part_swallow(info->bg, "e.swallow.buttons", info->box);
    evas_object_show(info->box);
@@ -1196,14 +1214,17 @@ wp_browser_new(E_Container *con)
    
    rg = e_widget_radio_group_new(&(info->mode));
    o2 = e_widget_radio_add(info->win->evas, _("All Desktops"), 0, rg);
+   evas_object_smart_callback_add(o2, "changed", _wp_changed, info);
    e_widget_list_object_append(o, o2, 1, 0, 0.5);
    evas_object_show(o2);
    
    o2 = e_widget_radio_add(info->win->evas, _("This Desktop"), 1, rg);
+   evas_object_smart_callback_add(o2, "changed", _wp_changed, info);
    e_widget_list_object_append(o, o2, 1, 0, 0.5);
    evas_object_show(o2);
    
    o2 = e_widget_radio_add(info->win->evas, _("This Screen"), 2, rg);
+   evas_object_smart_callback_add(o2, "changed", _wp_changed, info);
    e_widget_list_object_append(o, o2, 1, 0, 0.5);
    evas_object_show(o2);
    
@@ -1225,7 +1246,7 @@ wp_browser_new(E_Container *con)
    e_widget_list_object_append(ob, o, 1, 0, 0.5);
    evas_object_show(o);
    
-   e_widget_min_size_get(ob, &mw, &mh);
+   e_widget_size_min_get(ob, &mw, &mh);
    edje_extern_object_min_size_set(ob, mw, mh);
    edje_object_part_swallow(info->bg, "e.swallow.extras", ob);
    evas_object_show(ob);
@@ -1266,7 +1287,7 @@ wp_broser_free(Info *info)
    info = NULL;
 }
 
-void
+E_Config_Dialog *
 wp_conf_show(E_Container *con, const char *params __UNUSED__)
 {
    if (global_info)
@@ -1275,6 +1296,8 @@ wp_conf_show(E_Container *con, const char *params __UNUSED__)
         e_win_raise(global_info->win);
      }
    global_info = wp_browser_new(con);
+
+   return NULL;
 }
 
 void
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.h b/src/modules/conf_wallpaper2/e_int_config_wallpaper.h
index 6074a8a..53ad2ff 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.h
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.h
@@ -7,7 +7,7 @@
 #ifndef E_INT_CONFIG_WALLPAPER_H
 #define E_INT_CONFIG_WALLPAPER_H
 
-void wp_conf_show(E_Container *con, const char *params);
+E_Config_Dialog *wp_conf_show(E_Container *con, const char *params);
 void wp_conf_hide(void);
 
 #endif
diff --git a/src/modules/conf_wallpaper2/e_mod_main.c b/src/modules/conf_wallpaper2/e_mod_main.c
index 29e0a42..3d5be4e 100644
--- a/src/modules/conf_wallpaper2/e_mod_main.c
+++ b/src/modules/conf_wallpaper2/e_mod_main.c
@@ -13,7 +13,7 @@ static void  _e_mod_menu_add(void *data, E_Menu *m);
 
 static E_Module *conf_module = NULL;
 static E_Int_Menu_Augmentation *maug = NULL;
-static E_Fm2_Mime_Handler *import_hdl = NULL;
+//static E_Fm2_Mime_Handler *import_hdl = NULL;
 
 /* module setup */
 EAPI E_Module_Api e_modapi =
@@ -26,7 +26,7 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("appearance", 10, _("Look"), NULL, "preferences-appearance");
-   e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper",wp_conf_show);
+   e_configure_registry_item_add("appearance/wallpaper2", 10, _("Wallpaper 2"), NULL, "preferences-desktop-wallpaper", wp_conf_show);
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
 //   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper 2"), NULL, "preferences-system-windows", e_int_config_wallpaper_desk);
    maug = e_int_menus_menu_augmentation_add_sorted
@@ -49,7 +49,7 @@ e_modapi_init(E_Module *m)
 EAPI int
 e_modapi_shutdown(E_Module *m)
 {
-   E_Config_Dialog *cfd;
+//   E_Config_Dialog *cfd;
    /* remove module-supplied menu additions */
    if (maug)
      {
diff --git a/src/modules/conf_window_display/Makefile.in b/src/modules/conf_window_display/Makefile.in
index 8316926..6e0f29b 100644
--- a/src/modules/conf_window_display/Makefile.in
+++ b/src/modules/conf_window_display/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_display/e_int_config_window_display.c
index d1db644..50afeb8 100644
--- a/src/modules/conf_window_display/e_int_config_window_display.c
+++ b/src/modules/conf_window_display/e_int_config_window_display.c
@@ -31,7 +31,7 @@ struct _E_Config_Dialog_Data
    int border_shade_transition;
    double border_shade_speed;
    int use_app_icon;
-   int remember_internal_windows;
+   /* int remember_internal_windows; */
 };
 
 Eina_List *shading_list = NULL;
@@ -43,7 +43,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_display_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_display")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -56,7 +56,7 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Display"),
-			     "E", "_config_window_display_dialog",
+			     "E", "windows/window_display",
 			     "preferences-system-windows", 0, v, NULL);
    return cfd;
 }
@@ -77,7 +77,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
        cfdata->resize_info_visible) cfdata->move_resize_info = 1;
    if (cfdata->border_shade_animate) cfdata->animate_shading = 1;
    cfdata->use_app_icon = e_config->use_app_icon;
-   cfdata->remember_internal_windows = e_config->remember_internal_windows;
+   /* cfdata->remember_internal_windows = e_config->remember_internal_windows; */
    cfdata->desk_auto_switch = e_config->desk_auto_switch;
 }
 
@@ -143,7 +143,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    e_config->border_shade_transition = cfdata->border_shade_transition;
    e_config->border_shade_speed = cfdata->border_shade_speed;
    e_config->use_app_icon = cfdata->use_app_icon;
-   e_config->remember_internal_windows = cfdata->remember_internal_windows;
+   /* e_config->remember_internal_windows = cfdata->remember_internal_windows; */
    e_config->desk_auto_switch = cfdata->desk_auto_switch;
    e_config_save_queue();
    return 1; /* Apply was OK */
@@ -275,11 +275,11 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_framelist_object_append(of, ob);
    e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
 
-   of = e_widget_framelist_add(evas, _("Internal Windows"), 0);
-   e_widget_framelist_content_align_set(of, 0.0, 0.0);
-   ob = e_widget_check_add(evas, _("Always remember internal windows"), &(cfdata->remember_internal_windows));
-   e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(ot, of, 1, 2, 1, 1, 1, 1, 1, 1);
+   /* of = e_widget_framelist_add(evas, _("Internal Windows"), 0);
+    * e_widget_framelist_content_align_set(of, 0.0, 0.0);
+    * ob = e_widget_check_add(evas, _("Always remember internal windows"), &(cfdata->remember_internal_windows));
+    * e_widget_framelist_object_append(of, ob);
+    * e_widget_table_object_append(ot, of, 1, 2, 1, 1, 1, 1, 1, 1); */
 
    return ot;
 }
diff --git a/src/modules/conf_window_focus/Makefile.in b/src/modules/conf_window_focus/Makefile.in
index 6c7a611..4432a0d 100644
--- a/src/modules/conf_window_focus/Makefile.in
+++ b/src/modules/conf_window_focus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_focus/e_int_config_focus.c
index e0b1d93..4f39be3 100644
--- a/src/modules/conf_window_focus/e_int_config_focus.c
+++ b/src/modules/conf_window_focus/e_int_config_focus.c
@@ -35,7 +35,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_focus_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_focus")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    /* methods */
@@ -48,7 +48,7 @@ e_int_config_focus(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Focus Settings"),
-			     "E", "_config_focus_dialog",
+			     "E", "windows/window_focus",
 			     "preferences-focus", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_manipulation/Makefile.in b/src/modules/conf_window_manipulation/Makefile.in
index 7aeb704..1216de5 100644
--- a/src/modules/conf_window_manipulation/Makefile.in
+++ b/src/modules/conf_window_manipulation/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -342,6 +342,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -385,8 +386,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -502,7 +503,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
index d94fef5..ce6f960 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c
@@ -41,7 +41,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_geometry_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_geometry")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -52,7 +52,7 @@ e_int_config_window_geometry(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Geometry"),
-			     "E", "_config_window_geometry_dialog",
+			     "E", "windows/window_geometry",
 			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
index e48f407..bcfd5ea 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
@@ -29,7 +29,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_maxpolicy_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_maxpolicy")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -42,7 +42,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Maximize Policy"),
-			     "E", "_config_window_maxpolicy_dialog",
+			     "E", "windows/window_maxpolicy",
 			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
@@ -118,8 +118,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    e_widget_list_object_append(o, ob, 1, 1, 0.5);
    ob = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
    e_widget_list_object_append(o, ob, 1, 1, 0.5);
-   ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
-   e_widget_list_object_append(o, ob, 1, 1, 0.5);
+   /* ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
+    * e_widget_list_object_append(o, ob, 1, 1, 0.5); */
    ob = e_widget_radio_add(evas, _("Fill available space"), E_MAXIMIZE_FILL, rg);
    e_widget_list_object_append(o, ob, 1, 1, 0.5);
 
@@ -139,10 +139,11 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    rg = e_widget_radio_group_new(&(cfdata->maximize_policy));
    ob = e_widget_radio_add(evas, _("Fullscreen"), E_MAXIMIZE_FULLSCREEN, rg);
    e_widget_framelist_object_append(of, ob);
+   /* FIXME smart is nothing else than expand - dont confuse users */
    ob = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
-   e_widget_framelist_object_append(of, ob);
+   /* ob = e_widget_radio_add(evas, _("Expand the window"), E_MAXIMIZE_EXPAND, rg);
+    * e_widget_framelist_object_append(of, ob); */
    ob = e_widget_radio_add(evas, _("Fill available space"), E_MAXIMIZE_FILL, rg);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -158,8 +159,14 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    of = e_widget_framelist_add(evas, _("Miscellaneous Options"), 0);
-   ob = e_widget_check_add(evas, _("Allow window manipulation"), &(cfdata->allow_manip));
+   /* FIXME this should be default imho. no big deal if one resizes
+      a maximized window by mistake and then it's not maximized
+      anymore.. people will rather wonder why they cant shade
+      their window (hannes) */
+   ob = e_widget_check_add(evas, _("Allow manipulation of maximized windows"), &(cfdata->allow_manip));
    e_widget_framelist_object_append(of, ob);
+   /* FIXME: does this option make any sense? use a shelf that is
+      above windows in this case! */
    ob = e_widget_check_add(evas, _("Automatically move/resize windows on shelf autohide"), &(cfdata->border_fix_on_shelf_toggle));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
index 0311070..0fc22b6 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
@@ -33,7 +33,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_stacking_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_stacking")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
    /* methods */
@@ -46,7 +46,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con,
 			     _("Window Stacking"),
-			     "E", "_config_window_stacking_dialog",
+			     "E", "windows/window_stacking",
 			     "preferences-window-stacking", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_remembers/Makefile.in b/src/modules/conf_window_remembers/Makefile.in
index 79d36be..91c4018 100644
--- a/src/modules/conf_window_remembers/Makefile.in
+++ b/src/modules/conf_window_remembers/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_window_remembers/e_int_config_remembers.c b/src/modules/conf_window_remembers/e_int_config_remembers.c
index 8cdb450..4230125 100644
--- a/src/modules/conf_window_remembers/e_int_config_remembers.c
+++ b/src/modules/conf_window_remembers/e_int_config_remembers.c
@@ -3,6 +3,7 @@
 /* function protos */
 static void *_create_data(E_Config_Dialog *cfd);
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static int  _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create(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);
@@ -11,6 +12,8 @@ static void _cb_list_change(void *data, Evas_Object *obj);
 struct _E_Config_Dialog_Data 
 {
    Evas_Object *list, *btn, *name, *class, *title, *role;
+   int remember_dialogs;
+   int remember_fm_wins;
 };
 
 EAPI E_Config_Dialog *
@@ -19,15 +22,16 @@ 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;
+   if (e_config_dialog_find("E", "windows/window_remembers")) return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply_data;
    v->basic.create_widgets = _basic_create;
 
    cfd = e_config_dialog_new(con, _("Window Remembers"), "E", 
-                             "_config_remembers_dialog", 
+                             "windows/window_remembers", 
                              "preferences-desktop-window-remember", 0, v, NULL);
    e_dialog_resizable_set(cfd->dia, 1);
    return cfd;
@@ -75,6 +79,9 @@ _create_data(E_Config_Dialog *cfd)
    E_Config_Dialog_Data *cfdata;
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+   cfdata->remember_dialogs = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_DIALOGS);
+   cfdata->remember_fm_wins = (e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
+   
    return cfdata;
 }
 
@@ -84,6 +91,23 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
    E_FREE(cfdata);
 }
 
+static int
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (cfdata->remember_dialogs)
+     e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS;
+   else
+     e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS;
+
+   if (cfdata->remember_fm_wins)
+     e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_FM_WINS;
+   else
+     e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_FM_WINS;
+
+   e_config_save_queue();
+   return 1;
+}
+
 static Evas_Object *
 _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
@@ -92,6 +116,11 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    o = e_widget_list_add(evas, 0, 0);
    of = e_widget_frametable_add(evas, _("Window Remembers"), 0);
 
+   ow = e_widget_check_add(evas, _("Remember internal dialogs"), &(cfdata->remember_dialogs));
+   e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 1, 0);
+   ow = e_widget_check_add(evas, _("Remember fileman windows"),  &(cfdata->remember_fm_wins));
+   e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 1, 1, 0);
+
    ow = e_widget_button_add(evas, _("Delete Remember(s)"), "list-remove",
 			    _cb_delete, cfdata, NULL);
    cfdata->btn = ow;
@@ -124,12 +153,11 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    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_frametable_object_append(of, cfdata->list, 0, 2, 1, 1, 1, 1, 1, 1);
+   e_widget_frametable_object_append(of, of2, 0, 3, 1, 1, 1, 1, 1, 0);
+   e_widget_frametable_object_append(of, cfdata->btn, 0, 4, 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;
 }
@@ -166,7 +194,7 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
         if ((rem->name) && (!strcmp(rem->name, "E"))) continue;
         /* Filter out the module config remembers */
         if ((rem->class) && (rem->class[0] == '_')) continue;
-
+	
         if (rem->name)
           e_widget_ilist_append(cfdata->list, NULL, rem->name, NULL, rem, NULL);
         else if (rem->class)
@@ -187,8 +215,8 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
         if (!(rem = l->data)) continue;
 
         /* Garuntee we add only E's internal remembers */
-        if ((rem->name) && (strcmp(rem->name, "E"))) continue;
-
+        if ((!rem->name) || (strcmp(rem->name, "E"))) continue;
+	
         e_widget_ilist_append(cfdata->list, NULL, rem->class, NULL, rem, NULL);
      }
 
@@ -202,20 +230,20 @@ _fill_remembers(E_Config_Dialog_Data *cfdata)
         if (!(rem = l->data)) continue;
 
         /* Filter out E's own remember */
-        if ((rem->name) && (!strcmp(rem->name, "E"))) continue;
+        if ((!rem->name) || (!strcmp(rem->name, "E"))) continue;
         /* Filter out everything except the module config remembers */
-        if ((rem->name) && (rem->class[0] != '_')) continue;
+        if ((!rem->class) || (rem->class[0] != '_')) continue;
 
         e_widget_ilist_append(cfdata->list, NULL, rem->name, NULL, rem, NULL);
      }
 
    e_widget_ilist_go(cfdata->list);
-   e_widget_min_size_get(cfdata->list, &w, NULL);
+   e_widget_size_min_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, 400, 200);
+   e_widget_size_min_set(cfdata->list, 400, 200);
    e_widget_ilist_thaw(cfdata->list);
    edje_thaw();
    evas_event_thaw(evas);
diff --git a/src/modules/conf_winlist/Makefile.in b/src/modules/conf_winlist/Makefile.in
index 6495792..2ad3bb5 100644
--- a/src/modules/conf_winlist/Makefile.in
+++ b/src/modules/conf_winlist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
index 456cbc8..7e29a76 100644
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/conf_winlist/e_int_config_winlist.c
@@ -6,7 +6,7 @@ static int         _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static int         _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void        _cb_disable_check(void *data, Evas_Object *obj);
+//static void        _cb_disable_check(void *data, Evas_Object *obj);
 static void        _cb_enable_check(void *data, Evas_Object *obj);
 static void        _cb_disable_check_list(void *data, Evas_Object *obj);
 
@@ -48,7 +48,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_winlist_dialog")) return NULL;
+   if (e_config_dialog_find("E", "windows/window_list")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -60,7 +60,7 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
 
    cfd = e_config_dialog_new(con,
 			     _("Window List Settings"),
-			     "E", "_config_winlist_dialog",
+			     "E", "windows/window_list",
 			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
@@ -321,12 +321,15 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
  * @param data A Evas_Object to chain together with the checkbox
  * @param obj A Evas_Object checkbox created with e_widget_check_add()
  */
+#if 0
+/* FIXME unused */
 static void
 _cb_disable_check(void *data, Evas_Object *obj)
 {
    e_widget_disabled_set((Evas_Object *) data, 
                          !e_widget_check_checked_get(obj));
 }
+#endif
 
 /*!
  * If the check is disabled then enable the chained object.
diff --git a/src/modules/connman/Makefile.in b/src/modules/connman/Makefile.in
index 33353ea..bef9adb 100644
--- a/src/modules/connman/Makefile.in
+++ b/src/modules/connman/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/connman/e_iface.c b/src/modules/connman/e_iface.c
index 00866bd..b34a854 100644
--- a/src/modules/connman/e_iface.c
+++ b/src/modules/connman/e_iface.c
@@ -1303,7 +1303,7 @@ main(int argc, char **argv)
      }
 
    ecore_init();
-   eina_stringshare_init();
+   eina_init();
    ecore_app_args_set(argc, (const char **)argv);
    e_dbus_init();
    evas_init();
@@ -1327,7 +1327,7 @@ main(int argc, char **argv)
    e_dbus_connection_close(c);
    evas_shutdown();
    e_dbus_shutdown();
-   eina_stringshare_shutdown();
+   eina_shutdown();
    ecore_shutdown();
 
    return 0;
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 7a591b3..1b73d79 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -448,9 +448,9 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet)
    o = e_widget_label_add(evas, "Personal Name");
    e_widget_table_object_append(table, o, 0, row, 1, 1, 1, 1, 0, 0);
    o = e_widget_entry_add(evas, &(cfnet->name), NULL, NULL, NULL);
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    mw = 160;
-   e_widget_min_size_set(o, mw, mh);
+   e_widget_size_min_set(o, mw, mh);
    e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0);
    row++;
 
@@ -470,9 +470,9 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet)
 	o = e_widget_label_add(evas, "Password");
 	e_widget_table_object_append(table, o, 0, row, 1, 1, 1, 1, 0, 0);
 	o = e_widget_entry_add(evas, &(cfnet->password), NULL, NULL, NULL);
-	e_widget_min_size_get(o, &mw, &mh);
+	e_widget_size_min_get(o, &mw, &mh);
 	mw = 160;
-	e_widget_min_size_set(o, mw, mh);
+	e_widget_size_min_set(o, mw, mh);
 	e_widget_table_object_append(table, o, 1, row, 1, 1, 1, 1, 0, 0);
 	row++;
 
@@ -487,7 +487,7 @@ net_dialog_show(Instance *inst, Conf_Network *cfnet)
    e_widget_table_object_append(table, button, 0, row, 2, 1, 0, 0, 0, 0);
    row++;
 
-   e_widget_min_size_get(table, &mw, &mh);
+   e_widget_size_min_get(table, &mw, &mh);
    e_dialog_content_set(dialog, table, mw, mh);
 
    e_win_delete_callback_set(dialog->win, net_dialog_cb_del);
@@ -760,7 +760,7 @@ if_dialog_show(Instance *inst)
    e_widget_ilist_go(ilist);
    e_widget_ilist_thaw(ilist);
 
-   e_widget_min_size_set(ilist, 240, 180);
+   e_widget_size_min_set(ilist, 240, 180);
    e_widget_framelist_object_append(flist, ilist);
 
    e_widget_list_object_append(list, flist, 1, 0, 0.5);
@@ -770,7 +770,7 @@ if_dialog_show(Instance *inst)
 				inst, NULL);
    e_widget_list_object_append(list, button, 1, 0, 0.5);
 
-   e_widget_min_size_get(list, &mw, &mh);
+   e_widget_size_min_get(list, &mw, &mh);
    e_dialog_content_set(dialog, list, mw, mh);
 
    e_win_delete_callback_set(dialog->win, if_dialog_cb_del);
@@ -1070,7 +1070,7 @@ popup_show(Instance *inst)
    e_widget_ilist_go(ilist);
    e_widget_ilist_thaw(ilist);
 
-   e_widget_min_size_set(ilist, 240, 320);
+   e_widget_size_min_set(ilist, 240, 320);
    e_widget_table_object_append(base, ilist,
 			       0, 0, 1, 1, 1, 1, 1, 1);
 
@@ -1079,10 +1079,10 @@ popup_show(Instance *inst)
    e_widget_table_object_append(base, button,
 			       0, 1, 1, 1, 0, 0, 0, 0);
 
-   e_widget_min_size_get(base, &mw, &mh);
+   e_widget_size_min_get(base, &mw, &mh);
    if (mh < 188) mh = 188;
    if (mw < 168) mw = 168;
-   e_widget_min_size_set(base, mw, mh);
+   e_widget_size_min_set(base, mw, mh);
 
    edje_thaw();
 
diff --git a/src/modules/cpufreq/Makefile.in b/src/modules/cpufreq/Makefile.in
index 9a8d489..d6e9ba7 100644
--- a/src/modules/cpufreq/Makefile.in
+++ b/src/modules/cpufreq/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -348,6 +348,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -391,8 +392,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -537,7 +538,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index b7518f2..683a447 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -293,7 +293,7 @@ _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	       {
 		  int frequency;
 		  
-		  frequency = (int)l->data;
+		  frequency = (long)l->data;
 		  mi = e_menu_item_new(mn);
 		  if (frequency < 1000000)
 		    snprintf(buf, sizeof(buf), _("%i MHz"), frequency / 1000);
@@ -502,8 +502,8 @@ _cpufreq_cb_sort(const void *item1, const void *item2)
 {
    int a, b;
 
-   a = (int)item1;
-   b = (int)item2;
+   a = (long)item1;
+   b = (long)item2;
    if (a < b) return -1;
    else if (a > b) return 1;
    return 0;
@@ -579,7 +579,7 @@ _cpufreq_status_check_available(Status *s)
 	     if (atoi(freq) != 0) 
 	       {
 		  s->frequencies = eina_list_append(s->frequencies,	
-						    (void *) atoi(freq));
+						    (void *) (long)atoi(freq));
 	       }
 	     freq = strtok(NULL, " ");
 	  }
@@ -719,7 +719,7 @@ _cpufreq_face_update_available(Instance *inst)
    frequency_msg = malloc(sizeof(Edje_Message_Int_Set) + (count - 1) * sizeof(int));
    frequency_msg->count = count;
    for (l = cpufreq_config->status->frequencies, i = 0; l; l = l->next, i++) 
-     frequency_msg->val[i] = (int)l->data;
+     frequency_msg->val[i] = (long)l->data;
    edje_object_message_send(inst->o_cpu, EDJE_MESSAGE_INT_SET, 1, frequency_msg);
    free(frequency_msg);
 
@@ -764,16 +764,16 @@ _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emissio
 
    for (l = cpufreq_config->status->frequencies; l; l = l->next)
      {
-	if (cpufreq_config->status->cur_frequency == (int)l->data)
+	if (cpufreq_config->status->cur_frequency == (long)l->data)
 	  {
 	     if (!strcmp(emission, "e,action,frequency,increase"))
 	       {
-		  if (l->next) next_frequency = (int)l->next->data;
+		  if (l->next) next_frequency = (long)l->next->data;
 		  break;
 	       }
 	     else if (!strcmp(emission, "e,action,frequency,decrease"))
 	       {
-		  if (l->prev) next_frequency = (int)l->prev->data;
+		  if (l->prev) next_frequency = (long)l->prev->data;
 		  break;
 	       }
 	     else
@@ -963,7 +963,7 @@ _cpufreq_menu_frequency(void * data, E_Menu *m, E_Menu_Item *mi)
 {
    int frequency;
    
-   frequency = (int)data;
+   frequency = (long)data;
    if (frequency > 0) _cpufreq_set_frequency(frequency);
 }
 
diff --git a/src/modules/dropshadow/Makefile.in b/src/modules/dropshadow/Makefile.in
index ff3dc8c..6840f2f 100644
--- a/src/modules/dropshadow/Makefile.in
+++ b/src/modules/dropshadow/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/dropshadow/e_mod_config.c b/src/modules/dropshadow/e_mod_config.c
index e7c4710..7ee0d99 100644
--- a/src/modules/dropshadow/e_mod_config.c
+++ b/src/modules/dropshadow/e_mod_config.c
@@ -27,7 +27,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
    Dropshadow *ds;
 
    ds = dropshadow_mod->data;
-   if (e_config_dialog_find("E", "_e_mod_dropshadow_config_dialog")) return NULL;
+   if (e_config_dialog_find("E", "appearance/dropshadow")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    
    v->create_cfdata = _create_data;
@@ -38,7 +38,7 @@ e_int_config_dropshadow_module(E_Container *con, const char *params __UNUSED__)
    snprintf(buf, sizeof(buf), "%s/e-module-dropshadow.edj", e_module_dir_get(ds->module));
    cfd = e_config_dialog_new(con,
 			     _("Dropshadow Settings"),
-			     "E", "_e_mod_dropshadow_config_dialog",
+			     "E", "appearance/dropshadow",
 			     buf, 0, v, ds);
    ds->config_dialog = cfd;
    return cfd;
diff --git a/src/modules/everything/Evry.h b/src/modules/everything/Evry.h
new file mode 100644
index 0000000..71639c4
--- /dev/null
+++ b/src/modules/everything/Evry.h
@@ -0,0 +1,281 @@
+#include "e.h"
+
+#define EVRY_ACTION_OTHER 0
+#define EVRY_ACTION_FINISHED 1
+#define EVRY_ACTION_CONTINUE 2
+
+#define EVRY_ASYNC_UPDATE_ADD 0
+#define EVRY_ASYNC_UPDATE_CLEAR 1
+
+
+typedef struct _Evry_Plugin    Evry_Plugin;
+typedef struct _Evry_Item      Evry_Item;
+typedef struct _Evry_Item_App  Evry_Item_App;
+typedef struct _Evry_Item_File Evry_Item_File;
+typedef struct _Evry_Action    Evry_Action;
+typedef struct _Evry_State     Evry_State;
+typedef struct _Evry_View      Evry_View;
+typedef struct _Plugin_Config  Plugin_Config;
+
+#define EVRY_ITEM(_item) ((Evry_Item *)_item)
+#define EVRY_PLUGIN(_plugin) ((Evry_Plugin *) _plugin)
+#define EVRY_VIEW(_view) ((Evry_View *) _view)
+#define ITEM_FILE(_file, _item) Evry_Item_File *_file = (Evry_Item_File *) _item
+#define ITEM_APP(_app, _item)   Evry_Item_App *_app = (Evry_Item_App *) _item
+#define PLUGIN(_p, _plugin) Plugin *_p = (Plugin*) _plugin
+#define VIEW(_v, _view) View *_v = (View*) _view
+
+#define EVRY_PLUGIN_ITEMS_CLEAR(_p)       		\
+  if (EVRY_PLUGIN(_p)->items)				\
+    eina_list_free(EVRY_PLUGIN(_p)->items); 		\
+  EVRY_PLUGIN(_p)->items = NULL;
+
+#define EVRY_PLUGIN_ITEMS_FREE(_p)			\
+  Evry_Item *evryitem;					\
+  EINA_LIST_FREE(EVRY_PLUGIN(_p)->items, evryitem)	\
+    evry_item_free(evryitem);
+
+#define EVRY_PLUGIN_ITEMS_SORT(_p, _sortcb)		\
+  EVRY_PLUGIN(_p)->items = eina_list_sort		\
+    (EVRY_PLUGIN(_p)->items,				\
+     eina_list_count(EVRY_PLUGIN(_p)->items), _sortcb);	\
+
+#define EVRY_PLUGIN_ITEM_APPEND(_p, _item)			\
+  EVRY_PLUGIN(_p)->items =					\
+    eina_list_append(EVRY_PLUGIN(_p)->items, EVRY_ITEM(_item))	\
+
+#define EVRY_PLUGIN_FREE(_p)			\
+  evry_plugin_free(EVRY_PLUGIN(_p), 0);		\
+  E_FREE(_p);
+
+struct _Plugin_Config
+{
+  const char *name;
+
+  int loaded;
+  int enabled;
+
+  /* minimum input chars to query this source */
+  int min_query;
+
+  int priority;
+
+  const char *trigger;
+};
+
+
+struct _Evry_Item
+{
+  /* label to show for this item */
+  const char *label;
+  const char *icon;
+
+  /* context provided by item. e.g. to remember which action
+   * was performed on a file with a specific mimetype */
+  const char *context;
+
+  /* item can be browsed, e.g. folders */
+  Eina_Bool browseable;
+
+  /* for internally use by plugins */
+  void *data;
+
+  /* priority hints for sorting */
+  int priority;
+
+  /* store value of fuzzy match with input */
+  int fuzzy_match;
+
+  /* optional: plugin can set id to identify
+   * it in history otherwise label is used */
+  const char *id;
+
+  /* if transient item is removed from history
+   * on shutdown */
+  Eina_Bool transient;
+  
+  /* do not set by plugin! */
+  Evry_Item   *next;
+  Evry_Plugin *plugin;
+  int ref;
+  void (*free) (Evry_Item *item);
+  double usage;
+};
+
+struct _Evry_Item_App
+{
+  Evry_Item base;
+  const char *file;
+  Efreet_Desktop *desktop;
+};
+
+struct _Evry_Item_File
+{
+  Evry_Item base;
+  const char *uri;
+  const char *mime;
+};
+
+
+struct _Evry_Plugin
+{
+  const char *name;
+  const char *icon;
+
+  enum { type_subject, type_action, type_object } type;
+
+  const char *type_in;
+  const char *type_out;
+
+  const char *trigger;
+
+  /* whether the plugin uses evry_async_update to add new items */
+  int async_fetch;
+
+  /* list of items visible for everything */
+  Eina_List *items;
+
+  /* run when plugin is activated. when returns positve it is added
+     to the list of current plugins and queried for results */
+  Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item);
+
+  /* get candidates matching string, fill 'items' list */
+  int  (*fetch) (Evry_Plugin *p, const char *input);
+
+  /* run when state is removed in which this plugin is active */
+  void (*cleanup) (Evry_Plugin *p);
+
+  Evas_Object *(*icon_get) (Evry_Plugin *p, const Evry_Item *it, Evas *e);
+  /* provide more information for a candidate */
+  /* int (*candidate_info) (Evas *evas, Evry_Item *item); */
+
+  /* optional: default action for this plugins items */
+  int  (*action) (Evry_Plugin *p, const Evry_Item *item);
+
+  Evas_Object *(*config_page) (Evry_Plugin *p);
+  void (*config_apply) (Evry_Plugin *p);
+
+  /* not to be set by plugin! */
+  Plugin_Config *config;
+};
+
+
+struct _Evry_State
+{
+  char *input;
+  /* all available plugins for current state */
+  Eina_List   *plugins;
+
+  /* currently active plugins, i.e. those that provide items */
+  Eina_List   *cur_plugins;
+
+  /* active plugin */
+  Evry_Plugin *plugin;
+
+  /* selected item */
+  Evry_Item   *cur_item;
+
+  Eina_List   *sel_items;
+  
+  /* this is for the case when the current plugin was not selected
+     manually and a higher priority (async) plugin retrieves
+     candidates, the higher priority plugin is made current */
+  Eina_Bool plugin_auto_selected;
+  Eina_Bool item_auto_selected;
+
+  Evry_View *view;
+};
+
+struct _Evry_View
+{
+  Evry_View  *id;
+  const char *name;
+  const char *trigger;
+  int active;
+  Evas_Object *o_list;
+  Evas_Object *o_bar;
+
+  Evry_View *(*create) (Evry_View *view, const Evry_State *s, const Evas_Object *swallow);
+  void (*destroy)      (Evry_View *view);
+  int  (*cb_key_down)  (Evry_View *view, const Ecore_Event_Key *ev);
+  int  (*update)       (Evry_View *view);
+  void (*clear)        (Evry_View *view);
+
+  int priority;
+};
+
+struct _Evry_Action
+{
+  const char *name;
+
+  const char *type_in1;
+  const char *type_in2;
+  const char *type_out;
+
+  const Evry_Item *item1;
+  const Evry_Item *item2;
+
+  int  (*action)     (Evry_Action *act);
+  int  (*check_item) (Evry_Action *act, const Evry_Item *it);
+  int  (*intercept)  (Evry_Action *act);
+  void (*cleanup)    (Evry_Action *act);
+  Evas_Object *(*icon_get) (Evry_Action *act, Evas *e);
+
+  /* use icon name from theme */
+  const char *icon;
+
+  int priority;
+};
+
+/* evry.c */
+EAPI void evry_item_select(const Evry_State *s, Evry_Item *it);
+EAPI void evry_item_mark(const Evry_State *state, Evry_Item *it, Eina_Bool mark);
+EAPI void evry_plugin_select(const Evry_State *s, Evry_Plugin *p);
+EAPI int  evry_list_win_show(void);
+EAPI void evry_list_win_hide(void);
+EAPI Evry_Item *evry_item_new(Evry_Item *base, Evry_Plugin *p, const char *label, void (*cb_free) (Evry_Item *item));
+EAPI void evry_item_free(Evry_Item *it);
+EAPI void evry_item_ref(Evry_Item *it);
+EAPI void evry_plugin_async_update(Evry_Plugin *plugin, int state);
+EAPI void evry_clear_input(void);
+
+/* evry_util.c */
+EAPI Evas_Object *evry_icon_mime_get(const char *mime, Evas *e);
+EAPI Evas_Object *evry_icon_theme_get(const char *icon, Evas *e);
+EAPI int  evry_fuzzy_match(const char *str, const char *match);
+EAPI Eina_List *evry_fuzzy_match_sort(Eina_List *items);
+EAPI int evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file);
+
+/* e_mod_main.c */
+EAPI void evry_plugin_register(Evry_Plugin *p, int priority);
+EAPI void evry_plugin_unregister(Evry_Plugin *p);
+EAPI void evry_action_register(Evry_Action *act, int priority);
+EAPI void evry_action_unregister(Evry_Action *act);
+EAPI void evry_view_register(Evry_View *view, int priority);
+EAPI void evry_view_unregister(Evry_View *view);
+
+EAPI Evry_Plugin *evry_plugin_new(Evry_Plugin *base, const char *name, int type,
+				  const char *type_in, const char *type_out,
+				  int async_fetch, const char *icon, const char *trigger,
+				  Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
+				  void (*cleanup) (Evry_Plugin *p),
+				  int  (*fetch)   (Evry_Plugin *p, const char *input),
+				  int  (*action)  (Evry_Plugin *p, const Evry_Item *item),
+				  Evas_Object *(*icon_get) (Evry_Plugin *p, const Evry_Item *it, Evas *e),
+				  Evas_Object *(*config_page) (Evry_Plugin *p),
+				  void (*config_apply) (Evry_Plugin *p));
+
+EAPI void evry_plugin_free(Evry_Plugin *p, int free_pointer);
+
+
+EAPI Evry_Action *evry_action_new(const char *name, const char *type_in1,
+				  const char *type_in2, const char *type_out,
+				  const char *icon,
+				  int  (*action)     (Evry_Action *act),
+				  int  (*check_item) (Evry_Action *act, const Evry_Item *it),
+				  void (*cleanup)    (Evry_Action *act),
+				  int  (*intercept)  (Evry_Action *act),
+				  Evas_Object *(*icon_get) (Evry_Action *act, Evas *e));
+
+EAPI void evry_action_free(Evry_Action *act);
+
diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am
index 3c693b0..5d28146 100644
--- a/src/modules/everything/Makefile.am
+++ b/src/modules/everything/Makefile.am
@@ -1,12 +1,14 @@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in everything.pc
 MODULE = everything
 
+SUBDIRS = sources actions views
+
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
 e-module-$(MODULE).edj module.desktop
 
-EXTRA_DIST = $(files_DATA)
+EXTRA_DIST = $(files_DATA) $(EVRYHEADERS) everything.pc.in
 
 # the module .so file
 INCLUDES               = -I. \
@@ -16,25 +18,35 @@ INCLUDES               = -I. \
                          -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 \
+
+
+EVRYHEADERS = Evry.h
+
+module_la_SOURCES      = $(EVRYHEADERS) \
+			 e_mod_main.c \
                          e_mod_main.h \
 			 evry.c \
                          evry_config.c \
-			 evry_plug_config.c \
-			 evry_plug_dir_browse.c \
-			 evry_plug_apps.c \
-			 evry_plug_tracker.c \
-			 evry_plug_calc.c \
-			 evry_plug_border.c \
-			 evry_plug_border_act.c 
+	                 evry_util.c \
+	                 evry_history.c \
+			 evry_plug_aggregator.c \
+			 evry_plug_actions.c \
+			 evry_view_plugin_tabs.c
 
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
+installed_headersdir = $(prefix)/include/@PACKAGE@
+installed_headers_DATA = $(EVRYHEADERS)
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = everything.pc
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/everything_plugins/core/
diff --git a/src/modules/everything/Makefile.in b/src/modules/everything/Makefile.in
index 4a41490..6d9f935 100644
--- a/src/modules/everything/Makefile.in
+++ b/src/modules/everything/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35,7 +35,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = src/modules/everything
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/module.desktop.in
+	$(srcdir)/everything.pc.in $(srcdir)/module.desktop.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
 	$(top_srcdir)/m4/ac_attribute.m4 $(top_srcdir)/m4/gettext.m4 \
@@ -50,20 +50,23 @@ 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
+CONFIG_CLEAN_FILES = module.desktop everything.pc
 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)"
+am__installdirs = "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" \
+	"$(DESTDIR)$(installed_headersdir)" \
+	"$(DESTDIR)$(pkgconfigdir)"
 pkgLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pkg_LTLIBRARIES)
-am_module_la_OBJECTS = e_mod_main.lo evry.lo evry_config.lo \
-	evry_plug_config.lo evry_plug_dir_browse.lo evry_plug_apps.lo \
-	evry_plug_tracker.lo evry_plug_calc.lo evry_plug_border.lo \
-	evry_plug_border_act.lo
+am__objects_1 =
+am_module_la_OBJECTS = $(am__objects_1) e_mod_main.lo evry.lo \
+	evry_config.lo evry_util.lo evry_history.lo \
+	evry_plug_aggregator.lo evry_plug_actions.lo \
+	evry_view_plugin_tabs.lo
 module_la_OBJECTS = $(am_module_la_OBJECTS)
 module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -82,10 +85,22 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(module_la_SOURCES)
 DIST_SOURCES = $(module_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 filesDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(files_DATA)
+installed_headersDATA_INSTALL = $(INSTALL_DATA)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA) $(installed_headers_DATA) $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -343,19 +358,21 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
 x_libs = @x_libs@
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in everything.pc
 MODULE = everything
+SUBDIRS = sources actions views
 
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
 e-module-$(MODULE).edj module.desktop
 
-EXTRA_DIST = $(files_DATA)
+EXTRA_DIST = $(files_DATA) $(EVRYHEADERS) everything.pc.in
 
 # the module .so file
 INCLUDES = -I. \
@@ -368,22 +385,26 @@ INCLUDES = -I. \
 
 pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
+EVRYHEADERS = Evry.h
+module_la_SOURCES = $(EVRYHEADERS) \
+			 e_mod_main.c \
                          e_mod_main.h \
 			 evry.c \
                          evry_config.c \
-			 evry_plug_config.c \
-			 evry_plug_dir_browse.c \
-			 evry_plug_apps.c \
-			 evry_plug_tracker.c \
-			 evry_plug_calc.c \
-			 evry_plug_border.c \
-			 evry_plug_border_act.c 
+	                 evry_util.c \
+	                 evry_history.c \
+			 evry_plug_aggregator.c \
+			 evry_plug_actions.c \
+			 evry_view_plugin_tabs.c
 
 module_la_LIBADD = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
-all: all-am
+installed_headersdir = $(prefix)/include/@PACKAGE@
+installed_headers_DATA = $(EVRYHEADERS)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = everything.pc
+all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -391,8 +412,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -418,6 +439,8 @@ $(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)/$@
+everything.pc: $(top_builddir)/config.status $(srcdir)/everything.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)"
@@ -457,13 +480,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_config.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_apps.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_border.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_border_act.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_calc.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_config.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_dir_browse.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_tracker.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_history.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_actions.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_aggregator.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_util.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_view_plugin_tabs.Plo at am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -508,21 +529,138 @@ uninstall-filesDATA:
 	  echo " rm -f '$(DESTDIR)$(filesdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(filesdir)/$$f"; \
 	done
+install-installed_headersDATA: $(installed_headers_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(installed_headersdir)" || $(MKDIR_P) "$(DESTDIR)$(installed_headersdir)"
+	@list='$(installed_headers_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(installed_headersDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(installed_headersdir)/$$f'"; \
+	  $(installed_headersDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(installed_headersdir)/$$f"; \
+	done
+
+uninstall-installed_headersDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(installed_headers_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(installed_headersdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(installed_headersdir)/$$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.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -535,7 +673,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	    $$tags $$unique; \
 	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -582,21 +720,40 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 check-am: all-am
-check: check-am
+check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)" "$(DESTDIR)$(installed_headersdir)" "$(DESTDIR)$(pkgconfigdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -613,85 +770,93 @@ 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: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
 	mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
-info: info-am
+info: info-recursive
 
 info-am:
 
-install-data-am: install-filesDATA install-pkgLTLIBRARIES
+install-data-am: install-filesDATA install-installed_headersDATA \
+	install-pkgLTLIBRARIES install-pkgconfigDATA
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-filesDATA uninstall-pkgLTLIBRARIES
+uninstall-am: uninstall-filesDATA uninstall-installed_headersDATA \
+	uninstall-local uninstall-pkgLTLIBRARIES \
+	uninstall-pkgconfigDATA
 
-.MAKE: install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkgLTLIBRARIES ctags distclean \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES ctags ctags-recursive 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-dvi \
 	install-dvi-am install-exec install-exec-am install-filesDATA \
 	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-installed_headersDATA install-man install-pdf \
+	install-pdf-am install-pkgLTLIBRARIES install-pkgconfigDATA \
 	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	installcheck-am installdirs installdirs-am 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-pkgLTLIBRARIES
+	tags tags-recursive uninstall uninstall-am uninstall-filesDATA \
+	uninstall-installed_headersDATA uninstall-local \
+	uninstall-pkgLTLIBRARIES uninstall-pkgconfigDATA
 
 
-uninstall:
+uninstall-local:
 	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/everything_plugins/core/
 # 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/everything/actions/Makefile.am b/src/modules/everything/actions/Makefile.am
new file mode 100644
index 0000000..31370c2
--- /dev/null
+++ b/src/modules/everything/actions/Makefile.am
@@ -0,0 +1,34 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+
+evry_plug_border_actdir = $(plugindir)
+evry_plug_border_act_LTLIBRARIES = evry_plug_border_act.la
+evry_plug_border_act_la_SOURCES =  evry_plug_border_act.c
+evry_plug_border_act_la_LIBADD       = @e_libs@
+evry_plug_border_act_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_border_act_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_clipboarddir = $(plugindir)
+evry_plug_clipboard_LTLIBRARIES = evry_plug_clipboard.la
+evry_plug_clipboard_la_SOURCES =  evry_plug_clipboard.c
+evry_plug_clipboard_la_LIBADD       = @e_libs@
+evry_plug_clipboard_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_clipboard_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_wallpaperdir = $(plugindir)
+evry_plug_wallpaper_LTLIBRARIES = evry_plug_wallpaper.la
+evry_plug_wallpaper_la_SOURCES =  evry_plug_wallpaper.c
+evry_plug_wallpaper_la_LIBADD       = @e_libs@
+evry_plug_wallpaper_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_wallpaper_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/everything/actions/Makefile.in b/src/modules/everything/actions/Makefile.in
new file mode 100644
index 0000000..f028c8b
--- /dev/null
+++ b/src/modules/everything/actions/Makefile.in
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/everything/actions
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+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)$(evry_plug_border_actdir)" \
+	"$(DESTDIR)$(evry_plug_clipboarddir)" \
+	"$(DESTDIR)$(evry_plug_wallpaperdir)"
+evry_plug_border_actLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_clipboardLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_wallpaperLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(evry_plug_border_act_LTLIBRARIES) \
+	$(evry_plug_clipboard_LTLIBRARIES) \
+	$(evry_plug_wallpaper_LTLIBRARIES)
+evry_plug_border_act_la_DEPENDENCIES =
+am_evry_plug_border_act_la_OBJECTS =  \
+	evry_plug_border_act_la-evry_plug_border_act.lo
+evry_plug_border_act_la_OBJECTS =  \
+	$(am_evry_plug_border_act_la_OBJECTS)
+evry_plug_border_act_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_border_act_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_border_act_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_clipboard_la_DEPENDENCIES =
+am_evry_plug_clipboard_la_OBJECTS =  \
+	evry_plug_clipboard_la-evry_plug_clipboard.lo
+evry_plug_clipboard_la_OBJECTS = $(am_evry_plug_clipboard_la_OBJECTS)
+evry_plug_clipboard_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_clipboard_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_clipboard_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_wallpaper_la_DEPENDENCIES =
+am_evry_plug_wallpaper_la_OBJECTS =  \
+	evry_plug_wallpaper_la-evry_plug_wallpaper.lo
+evry_plug_wallpaper_la_OBJECTS = $(am_evry_plug_wallpaper_la_OBJECTS)
+evry_plug_wallpaper_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_wallpaper_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_wallpaper_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(evry_plug_border_act_la_SOURCES) \
+	$(evry_plug_clipboard_la_SOURCES) \
+	$(evry_plug_wallpaper_la_SOURCES)
+DIST_SOURCES = $(evry_plug_border_act_la_SOURCES) \
+	$(evry_plug_clipboard_la_SOURCES) \
+	$(evry_plug_wallpaper_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+plugindir = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+evry_plug_border_actdir = $(plugindir)
+evry_plug_border_act_LTLIBRARIES = evry_plug_border_act.la
+evry_plug_border_act_la_SOURCES = evry_plug_border_act.c
+evry_plug_border_act_la_LIBADD = @e_libs@
+evry_plug_border_act_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_border_act_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_clipboarddir = $(plugindir)
+evry_plug_clipboard_LTLIBRARIES = evry_plug_clipboard.la
+evry_plug_clipboard_la_SOURCES = evry_plug_clipboard.c
+evry_plug_clipboard_la_LIBADD = @e_libs@
+evry_plug_clipboard_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_clipboard_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_wallpaperdir = $(plugindir)
+evry_plug_wallpaper_LTLIBRARIES = evry_plug_wallpaper.la
+evry_plug_wallpaper_la_SOURCES = evry_plug_wallpaper.c
+evry_plug_wallpaper_la_LIBADD = @e_libs@
+evry_plug_wallpaper_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_wallpaper_la_LIBTOOLFLAGS = --tag=disable-static
+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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/everything/actions/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/everything/actions/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
+install-evry_plug_border_actLTLIBRARIES: $(evry_plug_border_act_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_border_actdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_border_actdir)"
+	@list='$(evry_plug_border_act_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_border_actLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_border_actdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_border_actLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_border_actdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_border_actLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_border_act_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_border_actdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_border_actdir)/$$p"; \
+	done
+
+clean-evry_plug_border_actLTLIBRARIES:
+	-test -z "$(evry_plug_border_act_LTLIBRARIES)" || rm -f $(evry_plug_border_act_LTLIBRARIES)
+	@list='$(evry_plug_border_act_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
+install-evry_plug_clipboardLTLIBRARIES: $(evry_plug_clipboard_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_clipboarddir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_clipboarddir)"
+	@list='$(evry_plug_clipboard_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_clipboardLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_clipboarddir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_clipboardLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_clipboarddir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_clipboardLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_clipboard_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_clipboarddir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_clipboarddir)/$$p"; \
+	done
+
+clean-evry_plug_clipboardLTLIBRARIES:
+	-test -z "$(evry_plug_clipboard_LTLIBRARIES)" || rm -f $(evry_plug_clipboard_LTLIBRARIES)
+	@list='$(evry_plug_clipboard_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
+install-evry_plug_wallpaperLTLIBRARIES: $(evry_plug_wallpaper_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_wallpaperdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_wallpaperdir)"
+	@list='$(evry_plug_wallpaper_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_wallpaperLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_wallpaperdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_wallpaperLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_wallpaperdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_wallpaperLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_wallpaper_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_wallpaperdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_wallpaperdir)/$$p"; \
+	done
+
+clean-evry_plug_wallpaperLTLIBRARIES:
+	-test -z "$(evry_plug_wallpaper_LTLIBRARIES)" || rm -f $(evry_plug_wallpaper_LTLIBRARIES)
+	@list='$(evry_plug_wallpaper_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
+evry_plug_border_act.la: $(evry_plug_border_act_la_OBJECTS) $(evry_plug_border_act_la_DEPENDENCIES) 
+	$(evry_plug_border_act_la_LINK) -rpath $(evry_plug_border_actdir) $(evry_plug_border_act_la_OBJECTS) $(evry_plug_border_act_la_LIBADD) $(LIBS)
+evry_plug_clipboard.la: $(evry_plug_clipboard_la_OBJECTS) $(evry_plug_clipboard_la_DEPENDENCIES) 
+	$(evry_plug_clipboard_la_LINK) -rpath $(evry_plug_clipboarddir) $(evry_plug_clipboard_la_OBJECTS) $(evry_plug_clipboard_la_LIBADD) $(LIBS)
+evry_plug_wallpaper.la: $(evry_plug_wallpaper_la_OBJECTS) $(evry_plug_wallpaper_la_DEPENDENCIES) 
+	$(evry_plug_wallpaper_la_LINK) -rpath $(evry_plug_wallpaperdir) $(evry_plug_wallpaper_la_OBJECTS) $(evry_plug_wallpaper_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_border_act_la-evry_plug_border_act.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_clipboard_la-evry_plug_clipboard.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_wallpaper_la-evry_plug_wallpaper.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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 $@ $<
+
+evry_plug_border_act_la-evry_plug_border_act.lo: evry_plug_border_act.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_border_act_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_border_act_la-evry_plug_border_act.lo -MD -MP -MF $(DEPDIR)/evry_plug_border_act_la-evry_plug_border_act.Tpo -c -o evry_plug_border_act_la-evry_plug_border_act.lo `test -f 'evry_plug_border_act.c' || echo '$(srcdir)/'`evry_plug_border_act.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_border_act_la-evry_plug_border_act.Tpo $(DEPDIR)/evry_plug_border_act_la-evry_plug_border_act.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_border_act.c' object='evry_plug_border_act_la-evry_plug_border_act.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_border_act_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_border_act_la-evry_plug_border_act.lo `test -f 'evry_plug_border_act.c' || echo '$(srcdir)/'`evry_plug_border_act.c
+
+evry_plug_clipboard_la-evry_plug_clipboard.lo: evry_plug_clipboard.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_clipboard_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_clipboard_la-evry_plug_clipboard.lo -MD -MP -MF $(DEPDIR)/evry_plug_clipboard_la-evry_plug_clipboard.Tpo -c -o evry_plug_clipboard_la-evry_plug_clipboard.lo `test -f 'evry_plug_clipboard.c' || echo '$(srcdir)/'`evry_plug_clipboard.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_clipboard_la-evry_plug_clipboard.Tpo $(DEPDIR)/evry_plug_clipboard_la-evry_plug_clipboard.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_clipboard.c' object='evry_plug_clipboard_la-evry_plug_clipboard.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_clipboard_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_clipboard_la-evry_plug_clipboard.lo `test -f 'evry_plug_clipboard.c' || echo '$(srcdir)/'`evry_plug_clipboard.c
+
+evry_plug_wallpaper_la-evry_plug_wallpaper.lo: evry_plug_wallpaper.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_wallpaper_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_wallpaper_la-evry_plug_wallpaper.lo -MD -MP -MF $(DEPDIR)/evry_plug_wallpaper_la-evry_plug_wallpaper.Tpo -c -o evry_plug_wallpaper_la-evry_plug_wallpaper.lo `test -f 'evry_plug_wallpaper.c' || echo '$(srcdir)/'`evry_plug_wallpaper.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_wallpaper_la-evry_plug_wallpaper.Tpo $(DEPDIR)/evry_plug_wallpaper_la-evry_plug_wallpaper.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_wallpaper.c' object='evry_plug_wallpaper_la-evry_plug_wallpaper.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_wallpaper_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_wallpaper_la-evry_plug_wallpaper.lo `test -f 'evry_plug_wallpaper.c' || echo '$(srcdir)/'`evry_plug_wallpaper.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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)
+installdirs:
+	for dir in "$(DESTDIR)$(evry_plug_border_actdir)" "$(DESTDIR)$(evry_plug_clipboarddir)" "$(DESTDIR)$(evry_plug_wallpaperdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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-evry_plug_border_actLTLIBRARIES \
+	clean-evry_plug_clipboardLTLIBRARIES \
+	clean-evry_plug_wallpaperLTLIBRARIES clean-generic \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-evry_plug_border_actLTLIBRARIES \
+	install-evry_plug_clipboardLTLIBRARIES \
+	install-evry_plug_wallpaperLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-evry_plug_border_actLTLIBRARIES \
+	uninstall-evry_plug_clipboardLTLIBRARIES \
+	uninstall-evry_plug_wallpaperLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-evry_plug_border_actLTLIBRARIES \
+	clean-evry_plug_clipboardLTLIBRARIES \
+	clean-evry_plug_wallpaperLTLIBRARIES clean-generic \
+	clean-libtool 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-dvi install-dvi-am \
+	install-evry_plug_border_actLTLIBRARIES \
+	install-evry_plug_clipboardLTLIBRARIES \
+	install-evry_plug_wallpaperLTLIBRARIES install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am 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-evry_plug_border_actLTLIBRARIES \
+	uninstall-evry_plug_clipboardLTLIBRARIES \
+	uninstall-evry_plug_wallpaperLTLIBRARIES
+
+# 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/everything/actions/evry_plug_border_act.c b/src/modules/everything/actions/evry_plug_border_act.c
new file mode 100644
index 0000000..1779de2
--- /dev/null
+++ b/src/modules/everything/actions/evry_plug_border_act.c
@@ -0,0 +1,276 @@
+#include "Evry.h"
+
+
+typedef struct _Inst Inst;
+
+struct _Inst
+{
+  E_Border *border;
+};
+
+static Evry_Plugin *plugin = NULL;
+static Inst *inst = NULL;
+static Evry_Action *act = NULL;
+
+static void
+_act_cb_border_switch_to(E_Border *bd)
+{
+   E_Zone *zone;
+
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   if (bd->desk != (e_desk_current_get(zone)))
+     e_desk_show(bd->desk);
+
+   if (bd->shaded)
+     e_border_unshade(bd, E_DIRECTION_UP);
+
+   if (bd->iconic)
+     e_border_uniconify(bd);
+   else
+     e_border_raise(bd);
+
+   /* e_border_focus_set(bd, 1, 1); */
+   e_border_focus_set_with_pointer(bd);
+}
+
+static void
+_act_cb_border_to_desktop(E_Border *bd)
+{
+   E_Zone *zone;
+   E_Desk *desk;
+   zone = e_util_zone_current_get(e_manager_current_get());
+   desk = e_desk_current_get(zone);
+
+   e_border_desk_set(bd, desk);
+
+   if (bd->shaded)
+     e_border_unshade(bd, E_DIRECTION_UP);
+
+   if (bd->iconic)
+     e_border_uniconify(bd);
+   else
+     e_border_raise(bd);
+
+   /* e_border_focus_set(bd, 1, 1); */
+   e_border_focus_set_with_pointer(bd);
+}
+
+static void
+_act_cb_border_fullscreen(E_Border *bd)
+{
+   if (!bd->fullscreen)
+     e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
+   else
+     e_border_unfullscreen(bd);
+}
+
+static void
+_act_cb_border_close(E_Border *bd)
+{
+   if (!bd->lock_close) e_border_act_close_begin(bd);
+}
+
+static void
+_act_cb_border_minimize(E_Border *bd)
+{
+   if (!bd->lock_user_iconify) e_border_iconify(bd);
+}
+
+static void
+_act_cb_border_unminimize(E_Border *bd)
+{
+   if (!bd->lock_user_iconify) e_border_uniconify(bd);
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *p __UNUSED__, const Evry_Item *item)
+{
+   E_Border *bd;
+
+   bd = item->data;
+   /* e_object_ref(E_OBJECT(bd)); */
+   inst->border = bd;
+
+   return p;
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   return (it1->fuzzy_match - it2->fuzzy_match);
+}
+
+static void
+_item_add(Evry_Plugin *p, const char *label, void (*action_cb) (E_Border *bd), const char *icon, const char *input)
+{
+   Evry_Item *it;
+   int match = 1;
+
+   if (input)
+     match = evry_fuzzy_match(label, input);
+
+   if (!match) return;
+
+   it = evry_item_new(NULL, p, label, NULL);
+   it->icon = eina_stringshare_add(icon);
+   it->data = action_cb;
+   it->fuzzy_match = match;
+
+   p->items = eina_list_prepend(p->items, it);
+}
+
+static void
+_cleanup(Evry_Plugin *p)
+{
+   EVRY_PLUGIN_ITEMS_FREE(p);
+}
+
+static int
+_fetch(Evry_Plugin *p, const char *input)
+{
+   E_Zone *zone;
+   E_Desk *desk;
+
+   zone = e_util_zone_current_get(e_manager_current_get());
+   desk = e_desk_current_get(zone);
+
+   _cleanup(p);
+
+   _item_add(p, _("Switch to Window"),
+	     _act_cb_border_switch_to,
+	     "go-next", input);
+
+   if (desk != inst->border->desk)
+     _item_add(p, _("Send to Deskop"),
+	       _act_cb_border_to_desktop,
+	       "go-previous", input);
+
+   if (inst->border->iconic)
+     _item_add(p, _("Uniconify"),
+	       _act_cb_border_unminimize,
+	       "window-minimize", input);
+   else
+     _item_add(p, _("Iconify"),
+	       _act_cb_border_minimize,
+	       "window-minimize", input);
+
+   if (!inst->border->fullscreen)
+     _item_add(p, _("Fullscreen"),
+	       _act_cb_border_fullscreen,
+	       "view-fullscreen", input);
+   else
+     _item_add(p, _("Unfullscreen"),
+	       _act_cb_border_fullscreen,
+	       "view-restore", input);
+
+   _item_add(p, _("Close"),
+	     _act_cb_border_close,
+	     "window-close", input);
+
+   if (!p->items) return 0;
+
+   EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+
+   return 1;
+}
+
+static int
+_action(Evry_Plugin *p __UNUSED__, const Evry_Item *item)
+{
+   void (*border_action) (E_Border *bd);
+   border_action = item->data;
+   border_action(inst->border);
+
+   return EVRY_ACTION_FINISHED;
+}
+
+static Evas_Object *
+_item_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   Evas_Object *o;
+
+   o = evry_icon_theme_get(it->icon, e);
+
+   return o;
+}
+
+
+static int
+_exec_border_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   E_Border *bd = it->data;
+   E_OBJECT_CHECK_RETURN(bd, 0);
+   E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, 0);
+
+   if ((bd->desktop && bd->desktop->exec) &&
+       ((strstr(bd->desktop->exec, "%u")) ||
+	(strstr(bd->desktop->exec, "%U")) ||
+	(strstr(bd->desktop->exec, "%f")) ||
+	(strstr(bd->desktop->exec, "%F"))))
+     return 1;
+
+   return 0;
+}
+
+static int
+_exec_border_action(Evry_Action *act)
+{
+   return evry_util_exec_app(act->item1, act->item2);
+}
+
+static int
+_exec_border_intercept(Evry_Action *act)
+{
+   Evry_Item_App *app = E_NEW(Evry_Item_App, 1);
+   E_Border *bd = act->item1->data;
+
+   app->desktop = bd->desktop;
+   act->item1 = EVRY_ITEM(app);
+
+   return 1;
+}
+
+
+static void
+_exec_border_cleanup(Evry_Action *act)
+{
+   ITEM_APP(app, act->item1);
+   E_FREE(app);
+}
+
+
+
+static Eina_Bool
+_init(void)
+{
+   plugin = evry_plugin_new(NULL, "Window Action", type_action, "BORDER", NULL, 0, NULL, NULL,
+		       _begin, _cleanup, _fetch, _action, _item_icon_get, NULL, NULL);
+
+   evry_plugin_register(plugin, 1);
+   inst = E_NEW(Inst, 1);
+
+   act = evry_action_new("Open File...", "BORDER", "FILE", "APPLICATION",
+			  "everything-launch",
+			  _exec_border_action, _exec_border_check_item,
+			  _exec_border_cleanup, _exec_border_intercept, NULL);
+   evry_action_register(act, 10);
+   
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(plugin);
+   E_FREE(inst);
+   
+   evry_action_free(act);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/actions/evry_plug_clipboard.c b/src/modules/everything/actions/evry_plug_clipboard.c
new file mode 100644
index 0000000..24d7cc6
--- /dev/null
+++ b/src/modules/everything/actions/evry_plug_clipboard.c
@@ -0,0 +1,49 @@
+#include "Evry.h"
+
+
+static Evry_Action *act;
+static Ecore_X_Window clipboard_win = 0;
+
+static int
+_action(Evry_Action *act)
+{
+   const Evry_Item *it = act->item1;
+   
+   ecore_x_selection_primary_set(clipboard_win, it->label, strlen(it->label));
+   ecore_x_selection_clipboard_set(clipboard_win, it->label, strlen(it->label));
+
+   return 1;
+}
+
+static int
+_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   return (it && it->label && (strlen(it->label) > 0));
+}
+
+static Eina_Bool
+_init(void)
+{
+   Ecore_X_Window win = ecore_x_window_new(0, 0, 0, 1, 1);
+   if (!win) return EINA_FALSE;
+
+   act = evry_action_new("Copy to Clipboard", "TEXT", NULL, NULL, "edit-copy",
+			 _action, _check_item, NULL, NULL, NULL);
+
+   evry_action_register(act, 10);
+
+   clipboard_win = win;
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   ecore_x_window_free(clipboard_win);
+   evry_action_free(act);
+}
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
+
diff --git a/src/modules/everything/actions/evry_plug_wallpaper.c b/src/modules/everything/actions/evry_plug_wallpaper.c
new file mode 100644
index 0000000..4af8831
--- /dev/null
+++ b/src/modules/everything/actions/evry_plug_wallpaper.c
@@ -0,0 +1,448 @@
+#include "Evry.h"
+
+#define IMPORT_STRETCH 0
+#define IMPORT_TILE 1
+#define IMPORT_CENTER 2
+#define IMPORT_SCALE_ASPECT_IN 3
+#define IMPORT_SCALE_ASPECT_OUT 4
+
+typedef struct _Plugin Plugin;
+typedef struct _Import Import;
+typedef struct _Item Item;
+
+struct _Plugin
+{
+  Evry_Plugin base;
+  Plugin *prev;
+  Eina_List *items;
+  const Evry_Item_File *file;
+};
+
+struct _Import
+{
+  const char *file;
+  int method;
+  int external;
+  int quality;
+
+  Ecore_Exe *exe;
+  Ecore_Event_Handler *exe_handler;
+  char *tmpf;
+  char *fdest;
+};
+
+struct _Item
+{
+  Evry_Item base;
+  const char *icon;
+  int method;
+};
+
+
+static void _import_edj_gen(Import *import);
+static int _import_cb_edje_cc_exit(void *data, int type, void *event);
+static Import *import = NULL;
+
+static Evry_Plugin *plugin;
+
+static void
+_item_free(Evry_Item *item)
+{
+   Item *it = (Item*) item;
+   E_FREE(it);
+}
+
+static void
+_item_add(Plugin *p, const char *name, int method, const char *icon)
+{
+   Item *item = E_NEW(Item, 1);
+   evry_item_new(EVRY_ITEM(item), EVRY_PLUGIN(p), name, _item_free);
+
+   item->icon = icon;
+   item->method = method;
+
+   p->items = eina_list_append(p->items, EVRY_ITEM(item));
+}
+
+static Evas_Object *
+_item_icon_get(Evry_Plugin *plugin, const Evry_Item *item, Evas *e)
+{
+   return evry_icon_theme_get(((Item*)item)->icon, e);
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *plugin, const Evry_Item *it, Evas *e)
+{
+   return evry_icon_theme_get("preferences-desktop-wallpaper", e);
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *plugin, const Evry_Item *item)
+{
+   PLUGIN(p, plugin);
+
+   if (!item) return NULL;
+   
+   /* is FILE ? */
+   if (item->plugin->type_out == plugin->type_in)
+     {
+	Evry_Item *it;
+	ITEM_FILE(file, item);
+
+	if (!file->mime || (strncmp(file->mime, "image/", 6)))
+	  return NULL;
+
+	p = E_NEW(Plugin, 1);
+	p->base = *plugin;
+	p->base.items = NULL;
+	p->file = file;
+
+	it = evry_item_new(NULL, EVRY_PLUGIN(p), _("Set as Wallpaper"), NULL);
+	it->browseable = EINA_TRUE;
+
+	p->items = eina_list_append(p->items, it);
+
+	return EVRY_PLUGIN(p);
+     }
+   else if (item->plugin->type_out == plugin->type_out)
+     {
+	p = E_NEW(Plugin, 1);
+	p->base = *plugin;
+	p->base.items = NULL;
+	p->base.icon_get = &_item_icon_get;
+	p->prev = (Plugin*) item->plugin;
+
+	_item_add(p, _("Stretch"), IMPORT_STRETCH,
+		  "enlightenment/wallpaper_stretch");
+	_item_add(p, _("Center"), IMPORT_CENTER,
+		  "enlightenment/wallpaper_center");
+	_item_add(p, _("Tile"), IMPORT_TILE,
+		  "enlightenment/wallpaper_tile");
+	_item_add(p, _("Within"), IMPORT_SCALE_ASPECT_IN,
+		  "enlightenment/wallpaper_scale_aspect_in");
+	_item_add(p, _("Fill"), IMPORT_SCALE_ASPECT_OUT,
+		  "enlightenment/wallpaper_stretch");
+
+	return EVRY_PLUGIN(p);
+     }
+
+   return NULL;
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+   Evry_Item *it;
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   EINA_LIST_FREE(p->items, it)
+     evry_item_free(it);
+
+   E_FREE(p);
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   PLUGIN(p, plugin);
+   Evry_Item *it = NULL;
+   Eina_List *l;
+   int match = 0;
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   EINA_LIST_FOREACH(p->items, l, it)
+     if (!input || (match = evry_fuzzy_match(it->label, input)))
+       {
+	  it->fuzzy_match = match;
+	  EVRY_PLUGIN_ITEM_APPEND(p, it);
+       }
+
+   if (input)
+     plugin->items = evry_fuzzy_match_sort(plugin->items);
+
+   return 1;
+}
+
+static int
+_action(Evry_Plugin *plugin, const Evry_Item *item)
+{
+   PLUGIN(p, plugin);
+
+   if (p->prev && p->prev->file)
+     {
+	if (import)
+	  {
+	     if (import->exe_handler)
+	       ecore_event_handler_del(import->exe_handler);
+	     E_FREE(import);
+	  }
+
+	Item *it = (Item*) item;
+	import = E_NEW(Import, 1);
+	import->method = it->method;
+	import->file = p->prev->file->uri;
+	import->quality = 100;
+	import->external = 0;
+	_import_edj_gen(import);
+
+	return 1;
+     }
+
+   return 0;
+}
+
+static Eina_Bool
+_init(void)
+{
+   plugin = evry_plugin_new(NULL, "Wallpaper", type_action, "FILE", "",
+			    0, "preferences-desktop-wallpaper", NULL,
+			    _begin, _cleanup, _fetch, _action, _icon_get,
+			    NULL, NULL);
+
+   evry_plugin_register(plugin, 10);
+
+   
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(plugin);
+
+   if (import)
+     {
+	if (import->exe_handler)
+	  ecore_event_handler_del(import->exe_handler);
+	E_FREE(import);
+     }
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
+
+
+
+/* taken from e_int_config_wallpaper_import.c */
+static void
+_import_edj_gen(Import *import)
+{
+   Ecore_Evas *ee = ecore_evas_buffer_new(100, 100);
+   Evas *evas = ecore_evas_get(ee);
+   Evas_Object *img;
+   int fd, num = 1;
+   int w = 0, h = 0;
+   const char *file, *locale;
+   char buf[4096], cmd[4096], tmpn[4096], ipart[4096], enc[128];
+   char *imgdir = NULL, *fstrip;
+   int cr = 255, cg = 255, cb = 255, ca = 255;
+   FILE *f;
+   size_t len, off;
+
+   file = ecore_file_file_get(import->file);
+   fstrip = ecore_file_strip_ext(file);
+   if (!fstrip) return;
+   len = e_user_dir_snprintf(buf, sizeof(buf), "backgrounds/%s.edj", fstrip);
+   if (len >= sizeof(buf)) return;
+   off = len - (sizeof(".edj") - 1);
+   while (ecore_file_exists(buf))
+     {
+	snprintf(buf + off, sizeof(buf) - off, "-%d.edj", num);
+	num++;
+     }
+   free(fstrip);
+   strcpy(tmpn, "/tmp/e_bgdlg_new.edc-tmp-XXXXXX");
+   fd = mkstemp(tmpn);
+   if (fd < 0)
+     {
+	printf("Error Creating tmp file: %s\n", strerror(errno));
+	return;
+     }
+   close(fd);
+
+   f = fopen(tmpn, "w");
+   if (!f)
+     {
+	printf("Cannot open %s for writing\n", tmpn);
+	return;
+     }
+
+   imgdir = ecore_file_dir_get(import->file);
+   if (!imgdir) ipart[0] = '\0';
+   else
+     {
+	snprintf(ipart, sizeof(ipart), "-id %s", e_util_filename_escape(imgdir));
+	free(imgdir);
+     }
+
+   img = evas_object_image_add(evas);
+   evas_object_image_file_set(img, import->file, NULL);
+   evas_object_image_size_get(img, &w, &h);
+   evas_object_del(img);
+   ecore_evas_free(ee);
+
+   printf("w%d h%d\n", w, h);
+   
+   if (import->external)
+     {
+	fstrip = strdup(e_util_filename_escape(import->file));
+	snprintf(enc, sizeof(enc), "USER");
+     }
+   else
+     {
+	fstrip = strdup(e_util_filename_escape(file));
+	if (import->quality == 100)
+	  snprintf(enc, sizeof(enc), "COMP");
+	else
+	  snprintf(enc, sizeof(enc), "LOSSY %i", import->quality);
+     }
+   switch (import->method)
+     {
+      case IMPORT_STRETCH:
+	 fprintf(f,
+		 "images { image: \"%s\" %s; }\n"
+		 "collections {\n"
+		 "group { name: \"e/desktop/background\";\n"
+		 "data { item: \"style\" \"0\"; }\n"
+		 "max: %i %i;\n"
+		 "parts {\n"
+		 "part { name: \"bg\"; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "image { normal: \"%s\"; scale_hint: STATIC; }\n"
+		 "} } } } }\n"
+		 , fstrip, enc, w, h, fstrip);
+	 break;
+      case IMPORT_TILE:
+	 fprintf(f,
+		 "images { image: \"%s\" %s; }\n"
+		 "collections {\n"
+		 "group { name: \"e/desktop/background\";\n"
+		 "data { item: \"style\" \"1\"; }\n"
+		 "max: %i %i;\n"
+		 "parts {\n"
+		 "part { name: \"bg\"; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "image { normal: \"%s\"; }\n"
+		 "fill { size {\n"
+		 "relative: 0.0 0.0;\n"
+		 "offset: %i %i;\n"
+		 "} } } } } } }\n"
+		 , fstrip, enc, w, h, fstrip, w, h);
+	 break;
+      case IMPORT_CENTER:
+	 fprintf(f,
+		 "images { image: \"%s\" %s; }\n"
+		 "collections {\n"
+		 "group { name: \"e/desktop/background\";\n"
+		 "data { item: \"style\" \"2\"; }\n"
+		 "max: %i %i;\n"
+		 "parts {\n"
+		 "part { name: \"col\"; type: RECT; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "color: %i %i %i %i;\n"
+		 "} }\n"
+		 "part { name: \"bg\"; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "min: %i %i; max: %i %i;\n"
+		 "image { normal: \"%s\"; }\n"
+		 "} } } } }\n"
+		 , fstrip, enc, w, h, cr, cg, cb, ca, w, h, w, h, fstrip);
+	 break;
+      case IMPORT_SCALE_ASPECT_IN:
+	 locale = e_intl_language_get();
+	 setlocale(LC_NUMERIC, "C");
+	 fprintf(f,
+		 "images { image: \"%s\" %s; }\n"
+		 "collections {\n"
+		 "group { name: \"e/desktop/background\";\n"
+		 "data { item: \"style\" \"3\"; }\n"
+		 "max: %i %i;\n"
+		 "parts {\n"
+		 "part { name: \"col\"; type: RECT; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "color: %i %i %i %i;\n"
+		 "} }\n"
+		 "part { name: \"bg\"; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "aspect: %1.9f %1.9f; aspect_preference: BOTH;\n"
+		 "image { normal: \"%s\";  scale_hint: STATIC; }\n"
+		 "} } } } }\n"
+		 , fstrip, enc, w, h, cr, cg, cb, ca, (double)w / (double)h, (double)w / (double)h, fstrip);
+	 setlocale(LC_NUMERIC, locale);
+	 break;
+      case IMPORT_SCALE_ASPECT_OUT:
+	 locale = e_intl_language_get();
+	 setlocale(LC_NUMERIC, "C");
+	 fprintf(f,
+		 "images { image: \"%s\" %s; }\n"
+		 "collections {\n"
+		 "group { name: \"e/desktop/background\";\n"
+		 "data { item: \"style\" \"4\"; }\n"
+		 "max: %i %i;\n"
+		 "parts {\n"
+		 "part { name: \"bg\"; mouse_events: 0;\n"
+		 "description { state: \"default\" 0.0;\n"
+		 "aspect: %1.9f %1.9f; aspect_preference: NONE;\n"
+		 "image { normal: \"%s\";  scale_hint: STATIC; }\n"
+		 "} } } } }\n"
+		 , fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
+	 setlocale(LC_NUMERIC, locale);
+	 break;
+      default:
+	 /* won't happen */
+	 break;
+     }
+   free(fstrip);
+
+   fclose(f);
+
+   snprintf(cmd, sizeof(cmd), "edje_cc -v %s %s %s",
+	    ipart, tmpn, e_util_filename_escape(buf));
+
+   import->tmpf = strdup(tmpn);
+   import->fdest = strdup(buf);
+   import->exe_handler =
+     ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
+			     _import_cb_edje_cc_exit, import);
+   import->exe = ecore_exe_run(cmd, NULL);
+}
+
+static int
+_import_cb_edje_cc_exit(void *data, int type, void *event)
+{
+   Import *import;
+   Ecore_Exe_Event_Del *ev;
+   char *fdest;
+   int r = 1;
+
+   ev = event;
+   import = data;
+
+   if (!ev->exe) return 1;
+     
+   if (ev->exe != import->exe) return 1;
+
+   if (ev->exit_code != 0)
+     {
+	e_util_dialog_show(_("Picture Import Error"),
+			   _("Enlightenment was unable to import the picture<br>"
+			     "due to conversion errors."));
+	r = 0;
+     }
+
+
+   fdest = strdup(import->fdest);
+   if (r)
+     {
+	e_bg_default_set(fdest);
+	e_bg_update();
+     }
+
+   E_FREE(fdest);
+
+   return 0;
+}
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 724d7fe..6e2b33d 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -2,21 +2,32 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
+/* TODO
+   - watch plugin directories
+   - get plugins from ~/.e/e/everything_plugins
+ */
+
 #include "e_mod_main.h"
 
+#define CONFIG_VERSION 7
+
 /* actual module specifics */
-static void  _e_mod_action_exebuf_cb(E_Object *obj, const char *params);
-static int   _e_mod_run_defer_cb(void *data);
-static void  _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
-static void  _e_mod_menu_add(void *data, E_Menu *m);
+static void _e_mod_action_cb(E_Object *obj, const char *params);
+static int  _e_mod_run_defer_cb(void *data);
+static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_mod_menu_add(void *data, E_Menu *m);
+static void _config_init(void);
+static void _config_free(void);
 
-/* static E_Module *conf_module = NULL; */
-static E_Action *act = NULL;
 static E_Int_Menu_Augmentation *maug = NULL;
+static E_Action *act = NULL;
 
+static Eina_Array  *plugins = NULL;
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_item_edd = NULL;
-Config *evry_conf = NULL;
+
+EAPI Config *evry_conf = NULL;
+
 
 /* module setup */
 EAPI E_Module_Api e_modapi =
@@ -25,77 +36,69 @@ EAPI E_Module_Api e_modapi =
     "Everything"
   };
 
+static Eina_Bool list_cb(Eina_Module *m, void *data)
+{
+   if (eina_module_load(m))
+     return EINA_TRUE;
+
+   return EINA_FALSE;
+}
+
 EAPI void *
 e_modapi_init(E_Module *m)
 {
-   char buf[4096];
-   snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/module.everything",
-	    e_user_homedir_get(), e_config_profile_get());
-   ecore_file_mkdir(buf);
+   Eina_List *files;
+   char buf[4096], dir[4096];
+   char *file;
+   E_Action *act;
 
-   conf_item_edd = E_CONFIG_DD_NEW("Plugin_Config", Plugin_Config);
-#undef T
-#undef D
-#define T Plugin_Config
-#define D conf_item_edd
-   E_CONFIG_VAL(D, T, name, STR);
-   E_CONFIG_VAL(D, T, trigger, STR);
-   E_CONFIG_VAL(D, T, min_query, INT);
-   E_CONFIG_VAL(D, T, loaded, INT);
-   E_CONFIG_VAL(D, T, enabled, INT);
-   E_CONFIG_VAL(D, T, priority, INT);
-   conf_edd = E_CONFIG_DD_NEW("Config", Config);
-#undef T
-#undef D
-#define T Config
-#define D conf_edd
-   E_CONFIG_VAL(D, T, width, INT);
-   E_CONFIG_VAL(D, T, height, INT);
-   E_CONFIG_VAL(D, T, rel_x, DOUBLE);
-   E_CONFIG_VAL(D, T, rel_y, DOUBLE);
-   E_CONFIG_VAL(D, T, scroll_animate, INT);
-   E_CONFIG_VAL(D, T, scroll_speed, DOUBLE);
-   E_CONFIG_LIST(D, T, plugins_conf, conf_item_edd);
-#undef T
-#undef D
-   evry_conf = e_config_domain_load("module.everything", conf_edd);
+   /* snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/module.everything",
+    * 	    e_user_homedir_get(), e_config_profile_get());
+    * ecore_file_mkdir(buf); */
 
-   if (!evry_conf)
+   _config_init();
+   evry_history_init();
+      
+   /* search for plugins */
+   eina_init();
+
+   snprintf(dir, sizeof(dir), "%s/enlightenment/everything_plugins",
+	    e_prefix_lib_get());
+   files = ecore_file_ls(dir);
+
+   EINA_LIST_FREE(files, file)
      {
-	evry_conf = E_NEW(Config, 1);
-	evry_conf->rel_x = 50.0;
-	evry_conf->rel_y = 50.0;
-	evry_conf->width = 400;
-	evry_conf->height = 350;
-	evry_conf->scroll_animate = 1;
-	evry_conf->scroll_speed = 0.08;
-     }
-   
-   /* conf_module = m; */
-   evry_init();
+	snprintf(buf, sizeof(buf), "%s/%s/%s", dir, file, MODULE_ARCH);
 
-   evry_plug_config_init();
-   evry_plug_dir_browse_init();
-   evry_plug_apps_init();
-   evry_plug_tracker_init();
-   evry_plug_border_init();
-   evry_plug_border_act_init();
-   evry_plug_calc_init();
+	if (ecore_file_is_dir(buf))
+	  plugins = eina_module_list_get(plugins, buf, 1, &list_cb, NULL);
+
+	free(file);
+     }
 
    /* add module supplied action */
    act = e_action_add("everything");
    if (act)
      {
-	act->func.go = _e_mod_action_exebuf_cb;
-	e_action_predef_name_set(_("Launch"), _("Run Everything Dialog"), "everything",
-				 NULL, NULL, 0);
+	act->func.go = _e_mod_action_cb;
+	e_action_predef_name_set(_("Everything"),
+				 _("Show Everything Dialog"),
+				 "everything", "", NULL, 0);
      }
 
-   maug = e_int_menus_menu_augmentation_add("main/1", _e_mod_menu_add, NULL, NULL, NULL);
+   maug = e_int_menus_menu_augmentation_add("main/1",
+					    _e_mod_menu_add,
+					    NULL, NULL, NULL);
+
+   e_configure_registry_category_add("extensions", 80, _("Extensions"),
+				     NULL, "preferences-extensions");
+
+   e_configure_registry_item_add("extensions/run_everything", 40,
+				 _("Run Everything"),
+				 NULL, "system-run",
+				 evry_config_dialog);
+   evry_init();
 
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
-   e_configure_registry_item_add("advanced/run_everything", 40, _("Run Everything"), NULL, "system-run", evry_config_dialog);
-   
    e_module_delayed_set(m, 1);
 
    return m;
@@ -106,6 +109,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
    
+   evry_shutdown();
+
    /* remove module-supplied menu additions */
    if (maug)
      {
@@ -115,25 +120,27 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
    /* remove module-supplied action */
    if (act)
      {
-	e_action_predef_name_del(_("Launch"), _("Run Everything Dialog"));
+	e_action_predef_name_del(_("Everything"), _("Show Everything Dialog"));
 	e_action_del("everything");
-	act = NULL;
      }
 
-   evry_plug_config_shutdown();
-   evry_plug_dir_browse_shutdown();
-   evry_plug_apps_shutdown();
-   evry_plug_tracker_shutdown();
-   evry_plug_border_shutdown();
-   evry_plug_border_act_shutdown();
-   evry_plug_calc_shutdown();
+   if (plugins)
+     {
+	eina_module_list_unload(plugins);
+	eina_module_list_flush(plugins);
+	eina_array_free(plugins);
+     }
 
-   evry_shutdown();
-   /* conf_module = NULL; */
+   eina_shutdown();
 
-   while ((cfd = e_config_dialog_get("E", "_config_everything_dialog"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/run_everything");
-   e_configure_registry_category_del("advanced");
+   while ((cfd = e_config_dialog_get("E", "_config_everything_dialog")))
+     e_object_del(E_OBJECT(cfd));
+
+   e_configure_registry_item_del("extensions/run_everything");
+   e_configure_registry_category_del("extensions");
+
+   _config_free();
+   evry_history_free();
 
    /* Clean EET */
    E_CONFIG_DD_FREE(conf_item_edd);
@@ -145,12 +152,129 @@ EAPI int
 e_modapi_save(E_Module *m __UNUSED__)
 {
    e_config_domain_save("module.everything", conf_edd, evry_conf);
+
    return 1;
 }
 
+static void
+_config_init()
+{
+#undef T
+#undef D
+#define T Plugin_Config
+#define D conf_item_edd
+   conf_item_edd = E_CONFIG_DD_NEW("Plugin_Config", Plugin_Config);
+   E_CONFIG_VAL(D, T, name, STR);
+   E_CONFIG_VAL(D, T, trigger, STR);
+   E_CONFIG_VAL(D, T, min_query, INT);
+   E_CONFIG_VAL(D, T, loaded, INT);
+   E_CONFIG_VAL(D, T, enabled, INT);
+   E_CONFIG_VAL(D, T, priority, INT);
+#undef T
+#undef D
+   
+#define T Config
+#define D conf_edd
+   conf_edd = E_CONFIG_DD_NEW("Config", Config);
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, width, INT);
+   E_CONFIG_VAL(D, T, height, INT);
+   E_CONFIG_VAL(D, T, rel_x, DOUBLE);
+   E_CONFIG_VAL(D, T, rel_y, DOUBLE);
+   E_CONFIG_VAL(D, T, scroll_animate, INT);
+   E_CONFIG_VAL(D, T, scroll_speed, DOUBLE);
+   E_CONFIG_VAL(D, T, hide_input, INT);
+   E_CONFIG_VAL(D, T, hide_list, INT);
+   E_CONFIG_VAL(D, T, quick_nav, INT);
+   E_CONFIG_VAL(D, T, cmd_terminal, STR);
+   E_CONFIG_VAL(D, T, cmd_sudo, STR);
+   E_CONFIG_VAL(D, T, view_mode, INT);
+   E_CONFIG_VAL(D, T, view_zoom, INT);
+   E_CONFIG_VAL(D, T, cycle_mode, INT);
+   E_CONFIG_VAL(D, T, history_sort_mode, INT);
+   E_CONFIG_LIST(D, T, conf_subjects, conf_item_edd);
+   E_CONFIG_LIST(D, T, conf_actions, conf_item_edd);
+   E_CONFIG_LIST(D, T, conf_objects, conf_item_edd);
+   E_CONFIG_LIST(D, T, conf_views,   conf_item_edd);
+#undef T
+#undef D
+   evry_conf = e_config_domain_load("module.everything", conf_edd);
+   
+   if (evry_conf && evry_conf->version != CONFIG_VERSION)
+     {
+	_config_free();
+	evry_conf = NULL;
+     }
+   
+   if (!evry_conf)
+     {
+	evry_conf = E_NEW(Config, 1);
+	evry_conf->version = CONFIG_VERSION;
+	evry_conf->rel_x = 0.5;
+	evry_conf->rel_y = 0.33;
+	evry_conf->width = 0;
+	evry_conf->height = 0;
+	evry_conf->scroll_animate = 0;
+	evry_conf->scroll_speed = 0.08;
+	evry_conf->hide_input = 0;
+	evry_conf->hide_list = 1;
+	evry_conf->quick_nav = 1;
+	evry_conf->conf_subjects = NULL;
+	evry_conf->conf_actions = NULL;
+	evry_conf->conf_objects = NULL;
+	evry_conf->conf_views   = NULL;
+	evry_conf->cmd_terminal = eina_stringshare_add("/usr/bin/xterm");
+	evry_conf->cmd_sudo = eina_stringshare_add("/usr/bin/gksudo --preserve-env");
+	evry_conf->view_mode = 0;
+	evry_conf->view_zoom = 0;
+	evry_conf->cycle_mode = 0;
+	evry_conf->history_sort_mode = 0;
+     }
+
+   /* TODO: remove - fix old configs */
+   if ((evry_conf->rel_x > 1.0) ||
+       (evry_conf->rel_x < 0.0))
+     evry_conf->rel_x = 0.5;
+
+   if ((evry_conf->rel_y > 1.0) ||
+       (evry_conf->rel_y < 0.0))
+     evry_conf->rel_y = 0.3;
+}
+
+
+static void
+_config_free(void)
+{
+   Plugin_Config *pc;
+
+   /* free config */
+   if (evry_conf->cmd_terminal)
+     eina_stringshare_del(evry_conf->cmd_terminal);
+   EINA_LIST_FREE(evry_conf->conf_subjects, pc)
+     {
+	if (pc->name) eina_stringshare_del(pc->name);
+	if (pc->trigger) eina_stringshare_del(pc->trigger);
+	E_FREE(pc);
+     }
+   EINA_LIST_FREE(evry_conf->conf_actions, pc)
+     {
+	if (pc->name) eina_stringshare_del(pc->name);
+	if (pc->trigger) eina_stringshare_del(pc->trigger);
+	E_FREE(pc);
+     }
+   EINA_LIST_FREE(evry_conf->conf_objects, pc)
+     {
+	if (pc->name) eina_stringshare_del(pc->name);
+	if (pc->trigger) eina_stringshare_del(pc->trigger);
+	E_FREE(pc);
+     }
+   E_FREE(evry_conf);
+}
+
+
 /* action callback */
 static void
-_e_mod_action_exebuf_cb(E_Object *obj, const char *params __UNUSED__)
+_e_mod_action_cb(E_Object *obj, const char *params)
 {
    E_Zone *zone = NULL;
 
@@ -167,9 +291,12 @@ _e_mod_action_exebuf_cb(E_Object *obj, const char *params __UNUSED__)
      }
    if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
 
-   printf("zone %d %d\n", zone->x, zone->y);
+   if (!zone) return;
 
-   if (zone) evry_show(zone);
+   if (params && params[0])
+     evry_show(zone, params);
+   else
+     evry_show(zone, NULL);
 }
 
 /* menu item callback(s) */
@@ -179,7 +306,7 @@ _e_mod_run_defer_cb(void *data)
    E_Zone *zone;
 
    zone = data;
-   if (zone) evry_show(zone);
+   if (zone) evry_show(zone, NULL);
    return 0;
 }
 
@@ -200,3 +327,219 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
    e_util_menu_item_theme_icon_set(mi, "system-run");
    e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
 }
+
+
+static int
+_evry_cb_plugin_sort(const void *data1, const void *data2)
+{
+   const Evry_Plugin *p1 = data1;
+   const Evry_Plugin *p2 = data2;
+   return p1->config->priority - p2->config->priority;
+}
+
+Evry_Plugin *
+evry_plugin_new(Evry_Plugin *base, const char *name, int type,
+		const char *type_in, const char *type_out,
+		int async_fetch, const char *icon, const char *trigger,
+		Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
+		void (*cleanup) (Evry_Plugin *p),
+		int  (*fetch) (Evry_Plugin *p, const char *input),
+		int  (*action) (Evry_Plugin *p, const Evry_Item *item),
+		Evas_Object *(*icon_get) (Evry_Plugin *p, const Evry_Item *it, Evas *e),
+		Evas_Object *(*config_page) (Evry_Plugin *p),
+		void (*config_apply) (Evry_Plugin *p))
+{
+   Evry_Plugin *p;
+
+   if (base)
+     p = base;
+   else
+     p = E_NEW(Evry_Plugin, 1);
+
+   p->name = eina_stringshare_add(name);
+   p->type = type;
+   p->type_in  = (type_in  ? eina_stringshare_add(type_in)  : NULL);
+   p->type_out = (type_out ? eina_stringshare_add(type_out) : NULL);
+   p->trigger  = (trigger  ? eina_stringshare_add(trigger)  : NULL);
+   p->icon     = (icon     ? eina_stringshare_add(icon)     : NULL);
+   p->async_fetch = async_fetch;
+   p->begin    = begin;
+   p->cleanup  = cleanup;
+   p->fetch    = fetch;
+   p->icon_get = icon_get;
+   p->action   = action;
+   p->config_page  = config_page;
+   p->config_apply = config_apply;
+
+   return p;
+}
+
+void
+evry_plugin_free(Evry_Plugin *p, int free_pointer)
+{
+   evry_plugin_unregister(p);
+
+   if (p->name)     eina_stringshare_del(p->name);
+   if (p->type_in)  eina_stringshare_del(p->type_in);
+   if (p->type_out) eina_stringshare_del(p->type_out);
+   if (p->trigger)  eina_stringshare_del(p->trigger);
+   if (p->icon)     eina_stringshare_del(p->icon);
+
+   if (free_pointer)
+     E_FREE(p);
+}
+
+Evry_Action *
+evry_action_new(const char *name, const char *type_in1, const char *type_in2,
+		const char *type_out, const char *icon,
+		int  (*action) (Evry_Action *act),
+		int (*check_item) (Evry_Action *act, const Evry_Item *it),
+		void (*cleanup)    (Evry_Action *act),
+		int  (*intercept)  (Evry_Action *act),
+		Evas_Object *(*icon_get) (Evry_Action *act, Evas *e))
+{
+   Evry_Action *act = E_NEW(Evry_Action, 1);
+   act->name = eina_stringshare_add(name);
+   act->type_in1 = (type_in1 ? eina_stringshare_add(type_in1) : NULL);
+   act->type_in2 = (type_in2 ? eina_stringshare_add(type_in2) : NULL);
+   act->type_out = (type_out ? eina_stringshare_add(type_out) : NULL);
+   act->action = action;
+   act->check_item = check_item;
+   act->intercept = intercept;
+   act->cleanup = cleanup;
+   act->icon = (icon ? eina_stringshare_add(icon) : NULL);
+
+   return act;
+}
+
+void
+evry_action_free(Evry_Action *act)
+{
+   evry_action_unregister(act);
+
+   if (act->name)     eina_stringshare_del(act->name);
+   if (act->type_in1) eina_stringshare_del(act->type_in1);
+   if (act->type_in2) eina_stringshare_del(act->type_in2);
+   if (act->type_out) eina_stringshare_del(act->type_out);
+   if (act->icon)     eina_stringshare_del(act->icon);
+
+   E_FREE(act);
+}
+
+void
+evry_plugin_register(Evry_Plugin *p, int priority)
+{
+   Eina_List *l, *confs = NULL;
+   Plugin_Config *pc;
+
+   evry_conf->plugins = eina_list_append(evry_conf->plugins, p);
+
+   if (p->type == type_subject)
+     confs = evry_conf->conf_subjects;
+   else if (p->type == type_action)
+     confs = evry_conf->conf_actions;
+   else if (p->type == type_object)
+     confs = evry_conf->conf_objects;
+
+   EINA_LIST_FOREACH(confs, l, pc)
+     if (pc->name && p->name && !strcmp(pc->name, p->name))
+       break;
+
+   if (!pc)
+     {
+	pc = E_NEW(Plugin_Config, 1);
+	pc->name = eina_stringshare_add(p->name);
+	pc->enabled = 1;
+	pc->priority = priority ? priority : 100;;
+
+	confs = eina_list_append(confs, pc);
+     }
+
+   /* if (plugin->trigger && !pc->trigger)
+    *   pc->trigger = eina_stringshare_add(plugin->trigger); */
+
+   p->config = pc;
+   evry_conf->plugins = eina_list_sort(evry_conf->plugins,
+				       eina_list_count(evry_conf->plugins),
+				       _evry_cb_plugin_sort);
+
+   if (p->type == type_subject)
+     evry_conf->conf_subjects = confs;
+   else if (p->type == type_action)
+     evry_conf->conf_actions = confs;
+   else if (p->type == type_object)
+     evry_conf->conf_objects = confs;
+
+   if (p->type == type_subject)
+     {
+	char buf[256];
+	snprintf(buf, sizeof(buf), "Show %s Plugin", p->name);
+
+	e_action_predef_name_set(_("Everything"), buf,
+				 "everything", p->name, NULL, 1);
+     }
+}
+
+void
+evry_plugin_unregister(Evry_Plugin *p)
+{
+   evry_conf->plugins = eina_list_remove(evry_conf->plugins, p);
+
+   if (p->type == type_subject)
+     {
+	char buf[256];
+	snprintf(buf, sizeof(buf), "Show %s Plugin", p->name);
+
+	e_action_predef_name_del(_("Everything"), buf);
+     }
+   /* cleanup */
+}
+
+void
+evry_action_register(Evry_Action *action, int priority)
+{
+   action->priority = priority;
+   evry_conf->actions = eina_list_append(evry_conf->actions, action);
+   /* TODO sorting, initialization, etc */
+}
+
+void
+evry_action_unregister(Evry_Action *action)
+{
+   evry_conf->actions = eina_list_remove(evry_conf->actions, action);
+   /* cleanup */
+}
+
+
+static int
+_evry_cb_view_sort(const void *data1, const void *data2)
+{
+   const Evry_View *v1 = data1;
+   const Evry_View *v2 = data2;
+   return v1->priority - v2->priority;
+}
+
+
+void
+evry_view_register(Evry_View *view, int priority)
+{
+   /* XXX remove: ignore old list view, some people might
+      forget to do make uninstall */
+   if (!strcmp(view->name, "List View")) return;
+
+   view->priority = priority;
+
+   evry_conf->views = eina_list_append(evry_conf->views, view);
+
+   evry_conf->views = eina_list_sort(evry_conf->views,
+				     eina_list_count(evry_conf->views),
+				     _evry_cb_view_sort);
+}
+
+void
+evry_view_unregister(Evry_View *view)
+{
+   evry_conf->views = eina_list_remove(evry_conf->views, view);
+}
+
+
diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h
index 87f0fd0..81a07ca 100644
--- a/src/modules/everything/e_mod_main.h
+++ b/src/modules/everything/e_mod_main.h
@@ -1,172 +1,127 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
-#include "e.h"
+#include "Evry.h"
 
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
-typedef struct _Evry_Plugin Evry_Plugin;
-typedef struct _Evry_Item   Evry_Item;
-typedef struct _Evry_Action Evry_Action;
-typedef struct _Evry_Config Evry_Config;
-typedef struct _Evry_App Evry_App;
-#undef E_TYPEDEFS
 
 typedef struct _Config Config;
-typedef struct _Plugin_Config Plugin_Config;
-
-
-#define EVRY_ACTION_OTHER 0
-#define EVRY_ACTION_FINISHED 1
-#define EVRY_ACTION_CONTINUE 2
-
-#define EVRY_ASYNC_UPDATE_ADD 0
-#define EVRY_ASYNC_UPDATE_CLEAR 1
-
+typedef struct _Evry_Selector Evry_Selector;
+typedef struct _Tab_View Tab_View;
+typedef struct _History History;
+typedef struct _History_Entry History_Entry;
+typedef struct _History_Item History_Item;
 
 struct _Config
 {
+  int version;
   /* position */
   double rel_x, rel_y;
   /* size */
   int width, height;
 
   /* generic plugin config */
-  Eina_List *plugins_conf;
+  Eina_List *conf_subjects;
+  Eina_List *conf_actions;
+  Eina_List *conf_objects;
+  Eina_List *conf_views;
 
   int scroll_animate;
   double scroll_speed;
 
-  int auto_select_first;
+  int hide_input;
+  int hide_list;
 
-  Eina_Hash *key_bindings;
-  
-  /**/
-  Eina_List *plugins;
-  
-};
+  int quick_nav;
 
-struct _Plugin_Config
-{
-  const char *name;
-  
-  int loaded;
-  int enabled;
+  const char *cmd_terminal;
+  const char *cmd_sudo;
+
+  int view_mode;
+  int view_zoom;
+
+  int history_sort_mode;
   
-  /* minimum input chars to query this source */
-  int min_query;
+  /* use up/down keys for prev/next in thumb view */
+  int cycle_mode;
 
-  int priority;
+  /* not saved data */
+  Eina_List *plugins;
+  Eina_List *actions;
+  Eina_List *views;
 
-  const char *trigger;
+  int min_w, min_h;
 };
 
 
-struct _Evry_Item
-{
-  const char *label;
-
-  const char *uri;
-  const char *mime;
-  
-  /* these are only for internally use by plugins */
-  /* used e.g. as pointer for item data (Efreet_Desktop) or */
-  /* for internal stuff, like priority hints for sorting, etc */
-  void *data[4];
-  int priority;
 
-  /* not to be set by plugin! */
-  Evas_Object *o_icon;
-  Evas_Object *o_bg;  
-};
-  
-struct _Evry_Plugin
+struct _History_Item
 {
-  const char *name;
+  const char *plugin;
+  const char *context;
+  const char *input;
+  double last_used;
+  double usage;
+  int count;
+  int transient;
+};
 
-  const char *type_in;
-  const char *type_out;
+struct _History_Entry
+{
+  Eina_List *items;
+};
 
-  const char *trigger;
+struct _History
+{
+  int version;
+  Eina_Hash *subjects;
+  Eina_Hash *actions;
+  double begin;
+};
   
-  /* sync/async ?*/
-  Eina_Bool async_query;
 
-  /* whether candidates can be shown without input
-   * e.g.  borders, app history */
-  Eina_Bool need_query; 
+struct _Evry_Selector
+{
+  Evas_Object *o_main;
+  Evas_Object *o_icon;
 
-  /* run when plugin is activated. */
-  int (*begin) (Evry_Plugin *p, Evry_Item *item);
+  /* current state */
+  Evry_State  *state;
 
-  /* get candidates matching string, fills 'candidates' list */
-  int  (*fetch) (Evry_Plugin *p, const char *input);
+  /* stack of states (for browseable plugins) */
+  Eina_List   *states;
 
-  /* default action for this plugins items */
-  int  (*action) (Evry_Plugin *p, Evry_Item *item, const char *input);
+  /* provides collection of items from other plugins */
+  Evry_Plugin *aggregator;
 
-  /* run before new query and when hiding 'everything' */
-  void (*cleanup) (Evry_Plugin *p);
+  /* */
+  Eina_List   *actions;
 
-  /* TODO return icon */
-  void (*icon_get) (Evry_Plugin *p, Evry_Item *it, Evas *e);  
-  /* provide more information for a candidate */
-  /* int (*candidate_info) (Evas *evas, Evry_Item *item); */
+  /* all plugins that belong to this selector*/
+  Eina_List   *plugins;
 
-  /* optional */
-  void (*realize_items) (Evry_Plugin *p, Evas *e);
-  
-  Eina_List *items;
-  
-  Evas_Object *(*config_page) (void);
-  void (*config_apply) (void);
+  Evry_View   *view;
 
-  /* for internal use by plugin */
-  void *priv;
+  Evas_Object *o_thumb;
+  Eina_Bool    do_thumb;
 
-  /* not to be set by plugin! */
-  Evas_Object *tab;
-  Plugin_Config *config;
-};  
+  Eina_Hash   *history;
+};
 
-struct _Evry_Action
+struct _Tab_View
 {
-  const char *name;
-  
-  const char *type_in1;
-  const char *type_in2;
-  const char *type_out;
-
-  Evry_Item *thing1;
-  Evry_Item *thing2;
-  
-  int  (*action) (Evry_Action *act);
-
-  int (*check_item) (Evry_Action *act, Evry_Item *it);  
-
-  void (*icon_get) (Evry_Action *act, Evry_Item *it, Evas *e);  
-  
-  void *priv;
+  Evas *evas;
+  const Evry_State *state;
 
-  /* not to be set by plugin! */
-  Evas_Object *o_icon;
-};  
+  Evas_Object *o_tabs;
+  Eina_List *tabs;
 
-struct _Evry_Config
-{
-  Eina_List *plugin_order;
+  void (*update) (Tab_View *tv);
+  void (*clear) (Tab_View *tv);
+  int (*key_down) (Tab_View *tv, const Ecore_Event_Key *ev);
   
 };
 
 
-struct _Evry_App
-{
-  const char *file;
-  Efreet_Desktop *desktop;
-};
 
 EAPI extern E_Module_Api e_modapi;
 
@@ -175,38 +130,32 @@ EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);
 EAPI E_Config_Dialog *evry_config_dialog(E_Container *con, const char *params);
 
-EAPI int evry_init(void);
-EAPI int evry_shutdown(void);
-EAPI int  evry_show(E_Zone *zone);
-EAPI void evry_hide(void);
-EAPI void evry_plugin_register(Evry_Plugin *p);
-EAPI void evry_plugin_unregister(Evry_Plugin *p);
-EAPI void evry_action_register(Evry_Action *act);
-EAPI void evry_action_unregister(Evry_Action *act);
-EAPI void evry_plugin_async_update(Evry_Plugin *plugin, int state);
-EAPI void evry_clear_input(void);
-
-EAPI int  evry_plug_apps_init(void);
-EAPI int  evry_plug_apps_shutdown(void);
-
-EAPI int  evry_plug_border_init(void);
-EAPI int  evry_plug_border_shutdown(void);
-
-EAPI int  evry_plug_border_act_init(void);
-EAPI int  evry_plug_border_act_shutdown(void);
+EAPI Tab_View *evry_tab_view_new(const Evry_State *s, Evas *e);
+EAPI void evry_tab_view_free(Tab_View *v);
 
-EAPI int  evry_plug_config_init(void);
-EAPI int  evry_plug_config_shutdown(void);
+int  evry_init(void);
+int  evry_shutdown(void);
+int  evry_show(E_Zone *zone, const char *params);
+void evry_hide(void);
 
-EAPI int  evry_plug_tracker_init(void);
-EAPI int  evry_plug_tracker_shutdown(void);
+EAPI Evry_Plugin *evry_plug_aggregator_new(Evry_Selector *selector);
+EAPI void evry_plug_aggregator_free(Evry_Plugin *plugin);
 
-EAPI int  evry_plug_dir_browse_init(void);
-EAPI int  evry_plug_dir_browse_shutdown(void);
+EAPI Evry_Plugin *evry_plug_actions_new(void);
+EAPI void evry_plug_actions_free(Evry_Plugin *plugin);
 
-EAPI int  evry_plug_calc_init(void);
-EAPI int  evry_plug_calc_shutdown(void);
+void evry_history_init(void);
+void evry_history_free(void);
+EAPI void evry_history_load(void);
+EAPI void evry_history_unload(void);
+EAPI void evry_history_add(Eina_Hash *hist, Evry_State *s, const char *ctxt);
+int  evry_history_item_usage_set(Eina_Hash *hist, Evry_Item *it, const char *input, const char *ctxt);
 
-extern Config *evry_conf;
+EAPI int  evry_browse_item(Evry_Selector *sel);
+void evry_browse_back(Evry_Selector *sel);
 
+EAPI extern Config *evry_conf;
+EAPI extern History *evry_hist;
+extern Evry_Selector **selectors;
+extern Evry_Plugin *action_selector;
 #endif
diff --git a/src/modules/everything/everything.pc.in b/src/modules/everything/everything.pc.in
new file mode 100644
index 0000000..fc9711b
--- /dev/null
+++ b/src/modules/everything/everything.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/@PACKAGE@
+
+Name: e17-everything
+Description: Everything Module for E17
+Requires: enlightenment
+Version: @VERSION@
+Libs: -L${libdir}
+Libs.private: 
+Cflags: -I${includedir}
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 082541d..b2113bf 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -1,1526 +1,1751 @@
 #include "e.h"
 #include "e_mod_main.h"
 
+/* TODO */
+/* - animations
+ * - mouse handlers
+ * - show item descriptions
+ * - keybinding configuration
+ * - shortcuts for plugins
+ */
 #define INPUTLEN 40
 #define MATCH_LAG 0.33
 
 
-typedef struct _Evry_State Evry_State;
 
-struct _Evry_State
+typedef struct _Evry_Window Evry_Window;
+typedef struct _Evry_List_Window Evry_List_Window;
+
+
+struct _Evry_Window
 {
-  Eina_List *cur_items;
-  Eina_List *cur_plugins;
-  Eina_List *plugins;
-  Evry_Plugin *cur_plugin;
-  Evry_Item *sel_item;
+  E_Popup *popup;
+  Evas_Object *o_main;
 
-  Eina_List *cur_actions;
-  Evry_Action *cur_action;
+  Eina_Bool request_selection;
+  Eina_Bool plugin_dedicated;
+};
 
-  /* Eina_List *sel_items; */
-  char *input;
-  const char *request_type;
+struct _Evry_List_Window
+{
+  E_Popup     *popup;
+  Evas_Object *o_main;
+  Eina_Bool    visible;
+};
 
-  Eina_Bool initial;
 
-  /* this is for the case when the current plugin was not selected
-     manually and a higher priority (async) plugin retrieves
-     candidates, the higher priority plugin is made current */
-  Eina_Bool plugin_auto_selected;
+static void _evry_matches_update(Evry_Selector *sel, int async);
+static void _evry_plugin_action(Evry_Selector *sel, int finished);
+static void _evry_plugin_select(Evry_State *s, Evry_Plugin *p);
+static void _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p);
+static int  _evry_backspace(Evry_State *s);
+static void _evry_update(Evry_State *s, int fetch);
+static void _evry_update_text_label(Evry_State *s);
+static int  _evry_clear(Evry_State *s);
+static int  _evry_update_timer(void *data);
 
-};
+static Evry_State *_evry_state_new(Evry_Selector *sel, Eina_List *plugins);
+static void _evry_state_pop(Evry_Selector *sel);
+
+static Evry_Selector *_evry_selector_new(int type);
+static void _evry_selector_free(Evry_Selector *sel);
+static void _evry_selector_activate(Evry_Selector *sel);
+static void _evry_selectors_switch(void);
+static void _evry_selector_update(Evry_Selector *sel);
+static void _evry_selector_icon_set(Evry_Selector *sel);
+static int  _evry_selector_subjects_get(const char *plugin_name);
+static int  _evry_selector_actions_get(Evry_Item *it);
+static int  _evry_selector_objects_get(Evry_Action *act);
+
+static Evry_Window *_evry_window_new(E_Zone *zone);
+static void _evry_window_free(Evry_Window *win);
+
+static Evry_List_Window *_evry_list_win_new(E_Zone *zone);
+static void _evry_list_win_free(Evry_List_Window *win);
+static void _evry_list_win_show(void);
+static void _evry_list_win_update(Evry_State *s);
+static void _evry_list_win_clear(int hide);
+
+static void _evry_view_clear(Evry_State *s);
+static void _evry_view_update(Evry_State *s, Evry_Plugin *plugin);
+static int  _evry_view_key_press(Evry_State *s, Ecore_Event_Key *ev);
+static int  _evry_view_toggle(Evry_State *s, const char *trigger);
+static void _evry_view_show(Evry_View *v);
+static void _evry_view_hide(Evry_View *v);
+
+static void _evry_item_desel(Evry_State *s, Evry_Item *it);
+static void _evry_item_sel(Evry_State *s, Evry_Item *it);
 
 static int  _evry_cb_key_down(void *data, int type, void *event);
-static int  _evry_cb_key_down(void *data, int type, void *event);
-static int  _evry_cb_mouse_down(void *data, int type, void *event);
-static int  _evry_cb_mouse_up(void *data, int type, void *event);
-static int  _evry_cb_mouse_move(void *data, int type, void *event);
-static int  _evry_cb_mouse_wheel(void *data, int type, void *event);
-static void _evry_cb_item_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static void _evry_cb_item_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static void _evry_backspace(void);
-static void _evry_update(void);
-static void _evry_list_clear(void);
-static void _evry_show_items(Evry_Plugin *plugin);
-static int  _evry_update_timer(void *data);
-static void _evry_matches_update(Evry_Plugin *cur_plugin);
-static void _evry_clear(void);
-static void _evry_item_next(void);
-static void _evry_item_prev(void);
-static void _evry_plugin_next(void);
-static void _evry_plugin_prev(void);
-static void _evry_scroll_to(int i);
-static void _evry_tab_scroll_to(Evry_Plugin *p);
-static void _evry_item_desel(Evry_Item *it);
-static void _evry_item_sel(Evry_Item *it);
-static void _evry_plugin_action(int finished);
-static int  _evry_animator(void *data);
-static int  _evry_scroll_timer(void *data);
-static int  _evry_push_state(void);
-static int  _evry_pop_state(void);
-static void _evry_plugin_selector_show(Evry_Plugin *p);
-static int  _evry_cb_plugin_sort(const void *data1, const void *data2);
-static int  _evry_cb_plugin_sort_by_trigger(const void *data1, const void *data2);
-
-static int  _evry_plug_act_select_init(void);
-static int  _evry_plug_act_select_begin(Evry_Plugin *p, Evry_Item *it);
-static int  _evry_plug_act_select_fetch(Evry_Plugin *p, const char *input);
-static int  _evry_plug_act_select_action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _evry_plug_act_select_cleanup(Evry_Plugin *p);
-static void _evry_plug_act_select_item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
+static int  _evry_cb_selection_notify(void *data, int type, void *event);
 
 /* local subsystem globals */
-static E_Popup     *popup = NULL;
+static Evry_Window *win = NULL;
+static Evry_List_Window *list = NULL;
 static Ecore_X_Window input_window = 0;
 static Eina_List   *handlers = NULL;
 static Ecore_Timer *update_timer = NULL;
-static Evas_Object *o_list = NULL;
-static Evas_Object *o_main = NULL;
-static Evas_Object *o_selector = NULL;
-static int          ev_last_is_mouse;
-static Evry_Item   *item_mouseover = NULL;
-static Ecore_Animator *scroll_animator = NULL;
-static Ecore_Timer *scroll_timer = NULL;
-static double       scroll_align_to;
-static double       scroll_align;
-/* static Eina_List   *plugins = NULL; */
-static Eina_List   *actions = NULL;
-static Evry_State  *cur_state = NULL;
-static Eina_List   *stack = NULL;
-static Evry_Plugin *action_selector = NULL;
+
+static Evry_Selector *selector = NULL;
+static const char *thumb_types = NULL;
+
+Evry_Selector **selectors;
+Evry_Plugin *action_selector;
 
 /* externally accessible functions */
-EAPI int
+int
 evry_init(void)
 {
-   _evry_plug_act_select_init();
-
+   action_selector = evry_plug_actions_new();
+   thumb_types = eina_stringshare_add("FILE");
    return 1;
 }
 
-EAPI int
+int
 evry_shutdown(void)
 {
    evry_hide();
-   return 1;
-}
-
-EAPI void
-evry_plugin_register(Evry_Plugin *plugin)
-{
-   Eina_List *l;
-   Plugin_Config *pc;
-   Eina_Bool found = 0;
-   
-   evry_conf->plugins = eina_list_append(evry_conf->plugins, plugin);
-
-   EINA_LIST_FOREACH(evry_conf->plugins_conf, l, pc)
-     {
-	if (pc->name && plugin->name && !strcmp(pc->name, plugin->name))
-	  {
-	     found = 1;
-	     break;
-	  }
-     }
-
-   if (!found)
-     {
-	pc = E_NEW(Plugin_Config, 1);
-	pc->name = eina_stringshare_add(plugin->name);
-	pc->enabled = 1;
-	pc->priority = eina_list_count(evry_conf->plugins);
-
-	evry_conf->plugins_conf = eina_list_append(evry_conf->plugins_conf, pc);	
-     }
-
-   if (plugin->trigger && !pc->trigger)
-     pc->trigger = eina_stringshare_add(plugin->trigger);
-   
-   plugin->config = pc;
-
-   evry_conf->plugins = eina_list_sort(evry_conf->plugins,
-				       eina_list_count(evry_conf->plugins),
-				       _evry_cb_plugin_sort);
-   
-   /* TODO sorting, initialization, etc */
-}
 
-EAPI void
-evry_plugin_unregister(Evry_Plugin *plugin)
-{
-   evry_conf->plugins = eina_list_remove(evry_conf->plugins, plugin);
-   /* cleanup */
-}
-
-EAPI void
-evry_action_register(Evry_Action *action)
-{
-   actions = eina_list_append(actions, action);
-   /* TODO sorting, initialization, etc */
-}
-
-EAPI void
-evry_action_unregister(Evry_Action *action)
-{
-   actions = eina_list_remove(actions, action);
-   /* cleanup */
+   evry_plug_actions_free(action_selector);
+   eina_stringshare_del(thumb_types);
+   return 1;
 }
 
-EAPI int
-evry_show(E_Zone *zone)
+int
+evry_show(E_Zone *zone, const char *params)
 {
-   Evas_Object *o;
-   int x, y;
+   if (win) return 0;
 
    E_OBJECT_CHECK_RETURN(zone, 0);
    E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, 0);
 
-   if (popup) return 0;
-
-   input_window = ecore_x_window_input_new(zone->container->win, zone->x,
-					   zone->y, zone->w, zone->h);
+   input_window = ecore_x_window_input_new(zone->container->win,
+					   zone->x, zone->y,
+					   zone->w, zone->h);
    ecore_x_window_show(input_window);
    if (!e_grabinput_get(input_window, 1, input_window))
-     {
-        ecore_x_window_free(input_window);
-	input_window = 0;
-	return 0;
-     }
+     goto error;
 
-   x = (zone->w / 2) - (evry_conf->width / 2);
-   y = (zone->h / 2) - (evry_conf->height / 2);
+   win = _evry_window_new(zone);
+   if (!win) goto error;
 
-   popup = e_popup_new(zone, x, y, evry_conf->width, evry_conf->height);
-   if (!popup) return 0;
+   list = _evry_list_win_new(zone);
+   if (!list) goto error;
 
-   ecore_x_netwm_window_type_set(popup->evas_win, ECORE_X_WINDOW_TYPE_UTILITY);
+   list->visible = EINA_FALSE;
 
-   e_popup_layer_set(popup, 255);
-   evas_event_freeze(popup->evas);
-   evas_event_feed_mouse_in(popup->evas, ecore_x_current_time_get(), NULL);
-   evas_event_feed_mouse_move(popup->evas, -1000000, -1000000, ecore_x_current_time_get(), NULL);
-   o = edje_object_add(popup->evas);
-   o_main = o;
-   e_theme_edje_object_set(o, "base/theme/everything",
-			   "e/widgets/everything/main");
+   evry_history_load();
+   
+   selectors = E_NEW(Evry_Selector*, 3);
+   selectors[0] = _evry_selector_new(type_subject);
+   selectors[1] = _evry_selector_new(type_action);
+   selectors[2] = _evry_selector_new(type_object);
 
-   o = e_box_add(popup->evas);
-   o_list = o;
-   e_box_orientation_set(o, 0);
-   e_box_homogenous_set(o, 1);
-   edje_object_part_swallow(o_main, "e.swallow.list", o);
-   evas_object_show(o);
+   if (params)
+     win->plugin_dedicated = EINA_TRUE;
 
-   o = o_main;
-   evas_object_move(o, 0, 0);
-   evas_object_resize(o, evry_conf->width, evry_conf->height);
-   evas_object_show(o);
-   e_popup_edje_bg_object_set(popup, o);
+   _evry_selector_subjects_get(params);
+   _evry_selector_activate(selectors[0]);
 
-   o = e_box_add(popup->evas);
-   e_box_orientation_set(o, 1);
-   e_box_homogenous_set(o, 1);
-   edje_object_part_swallow(o_main, "e.swallow.bar", o);
-   evas_object_show(o);
-   o_selector = o;
+   _evry_selector_update(selector);
+
+   if (evry_conf->views && selector->state)
+     {
+	Evry_View *view =evry_conf->views->data;
+	Evry_State *s = selector->state;
+
+	s->view = view->create(view, s, list->o_main);
 
-   evas_event_thaw(popup->evas);
+	_evry_view_show(s->view);
+     }
+   else goto error;
 
+   if (!evry_conf->hide_input)
+     edje_object_signal_emit(list->o_main, "e,state,entry_show", "e");
+   
    handlers = eina_list_append
      (handlers, ecore_event_handler_add
       (ECORE_EVENT_KEY_DOWN, _evry_cb_key_down, NULL));
    handlers = eina_list_append
      (handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_BUTTON_DOWN, _evry_cb_mouse_down, NULL));
-   handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_BUTTON_UP, _evry_cb_mouse_up, NULL));
-   handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_MOVE, _evry_cb_mouse_move, NULL));
-   handlers = eina_list_append
-     (handlers, ecore_event_handler_add
-      (ECORE_EVENT_MOUSE_WHEEL, _evry_cb_mouse_wheel, NULL));
-
-   _evry_push_state();
+      (ECORE_X_EVENT_SELECTION_NOTIFY,
+       _evry_cb_selection_notify, win));
 
-   e_popup_show(popup);
+   e_popup_layer_set(list->popup, 255);
+   e_popup_layer_set(win->popup, 255);
+   e_popup_show(win->popup);
+   e_popup_show(list->popup);
 
-   e_box_align_set(o_selector, 0.0, 0.5);
+   if (!evry_conf->hide_input)
+     {
+	edje_object_part_text_set(win->o_main, "e.text.label", "Search:");
+	edje_object_part_text_set(list->o_main, "e.text.label", "Search:");
+     }
+   
    return 1;
+
+ error:
+   if (win && selectors[0])
+     _evry_selector_free(selectors[0]);
+   if (win && selectors[1])
+     _evry_selector_free(selectors[1]);
+   if (win && selectors[2])
+     _evry_selector_free(selectors[2]);
+
+   if (win)
+     _evry_window_free(win);
+   if (list)
+     _evry_list_win_free(list);
+   win = NULL;
+   list = NULL;
+   ecore_x_window_free(input_window);
+   input_window = 0;
+
+   return 0;
 }
 
-EAPI void
+void
 evry_hide(void)
 {
    Ecore_Event *ev;
-   Evry_State *s;
 
-   if (!popup) return;
+   if (!win) return;
 
-   evas_event_freeze(popup->evas);
+   _evry_view_clear(selector->state);
 
-   _evry_list_clear();
+   if (update_timer)
+     ecore_timer_del(update_timer);
+   update_timer = NULL;
 
-   EINA_LIST_FREE(stack, s)
-     {
-	Evry_Plugin *p;
+   list->visible = EINA_FALSE;
+   _evry_selector_free(selectors[0]);
+   _evry_selector_free(selectors[1]);
+   _evry_selector_free(selectors[2]);
+   selector = NULL;
+   E_FREE(selectors);
 
-	free(s->input);
+   _evry_list_win_free(list);
+   list = NULL;
 
-	EINA_LIST_FREE(s->plugins, p)
-	  {
-	     p->cleanup(p);
+   _evry_window_free(win);
+   win = NULL;
 
-	     if (p->tab)
-	       {
-		  evas_object_del(p->tab);
-		  p->tab = NULL;
-	       }
-	  }
-     }
-   stack = NULL;
-   cur_state = NULL;
+   EINA_LIST_FREE(handlers, ev)
+     ecore_event_handler_del(ev);
 
-   if (update_timer)
+   ecore_x_window_free(input_window);
+   e_grabinput_release(input_window, input_window);
+   input_window = 0;
+
+   evry_history_unload();
+}
+
+EAPI void
+evry_clear_input(void)
+{
+   Evry_State *s = selector->state;
+
+   if (s->input[0] != 0)
      {
-	ecore_timer_del(update_timer);
-	update_timer = NULL;
+       	s->input[0] = 0;
      }
-   if (scroll_timer)
+}
+
+
+#ifdef CECHK_REFS
+static int item_cnt = 0;
+#endif
+
+EAPI Evry_Item *
+evry_item_new(Evry_Item *base, Evry_Plugin *p, const char *label, void (*cb_free) (Evry_Item *item))
+{
+   Evry_Item *it;
+   if (base)
      {
-	ecore_timer_del(scroll_timer);
-	scroll_timer = NULL;
+	it = base;
      }
-   if (scroll_animator)
+   else
      {
-	ecore_animator_del(scroll_animator);
-	scroll_animator = NULL;
+	it = E_NEW(Evry_Item, 1);
+	if (!it) return NULL;
      }
 
-   e_popup_hide(popup);
+   it->plugin = p;
+   if (label) it->label = eina_stringshare_add(label);
+   it->free = cb_free;
+
+   it->ref = 1;
+   it->usage = -1;
+
+#ifdef CHECK_REFS
+   item_cnt++;
+#endif
 
-   evas_object_del(o_list);
-   o_list = NULL;
+   return it;
+}
 
-   evas_object_del(o_selector);
-   o_selector = NULL;
+EAPI void
+evry_item_free(Evry_Item *it)
+{
+   if (!it) return;
 
-   evas_object_del(o_main);
-   o_main = NULL;
+   it->ref--;
 
-   evas_event_thaw(popup->evas);
-   e_object_del(E_OBJECT(popup));
-   popup = NULL;
+#ifdef CHECK_REFS
+   printf("%d, %d\t free: %s\n", it->ref, item_cnt - 1, it->label);
+#endif
 
-   EINA_LIST_FREE(handlers, ev)
-     ecore_event_handler_del(ev);
+   if (it->ref > 0) return;
 
-   ecore_x_window_free(input_window);
-   e_grabinput_release(input_window, input_window);
-   input_window = 0;
+#ifdef CHECK_REFS
+   item_cnt--;
+#endif
+
+   if (it->label) eina_stringshare_del(it->label);
+   if (it->id) eina_stringshare_del(it->id);
+   if (it->context) eina_stringshare_del(it->context);
+   
+   if (it->free)
+     it->free(it);
+   else
+     E_FREE(it);
+}
+
+EAPI void
+evry_item_select(const Evry_State *state, Evry_Item *it)
+{
+   Evry_State *s = (Evry_State *)state;
+
+   s->plugin_auto_selected = EINA_FALSE;
+   s->item_auto_selected = EINA_FALSE;
+   _evry_item_sel(s, it);
+   _evry_selector_update(selector);
+}
+
+EAPI void
+evry_item_mark(const Evry_State *state, Evry_Item *it, Eina_Bool mark)
+{
+   Evry_State *s = (Evry_State *)state;
+
+   if (mark)
+     s->sel_items = eina_list_append(s->sel_items, it);
+   else
+     s->sel_items = eina_list_remove(s->sel_items, it);
+   
+   /* s->plugin_auto_selected = EINA_FALSE;
+    * s->item_auto_selected = EINA_FALSE;
+    * _evry_item_sel(s, it);
+    * _evry_selector_update(selector); */
+}
+
+EAPI void
+evry_item_ref(Evry_Item *it)
+{
+   it->ref++;
+}
+
+EAPI int
+evry_list_win_show(void)
+{
+   if (list->visible) return 0;
+
+   _evry_list_win_show();
+   return 1;
+}
+
+EAPI void
+evry_list_win_hide(void)
+{
+   _evry_list_win_clear(1);
 }
 
 EAPI void
 evry_plugin_async_update(Evry_Plugin *p, int action)
 {
    Evry_State *s;
+   Evry_Plugin *agg;
+
+   if (!win) return;
 
-   if (!popup) return;
+   s = selector->state;
+   agg = selector->aggregator;
 
-   s = cur_state;
+   /* received data from a plugin of the current selector ? */
+   if (!s || !eina_list_data_find(s->plugins, p))
+     {
+	/* if (p->type == type_action) */
+	/* TODO */
+	return;
+     }
 
    if (action == EVRY_ASYNC_UPDATE_ADD)
      {
-	if (!eina_list_data_find(s->cur_plugins, p))
+	if (!p->items)
 	  {
-	     s->cur_plugins = eina_list_prepend(s->cur_plugins, p);
+	     /* remove plugin */
+	     if (!eina_list_data_find(s->cur_plugins, p)) return;
 
-	     s->cur_plugins = eina_list_sort(s->cur_plugins,
-					     eina_list_count(s->cur_plugins),
-					     _evry_cb_plugin_sort_by_trigger);
+	     s->cur_plugins = eina_list_remove(s->cur_plugins, p);
 
-	     _evry_plugin_selector_show(p);
+	     if (s->plugin == p)
+	       _evry_plugin_select(s, NULL);
 	  }
 	else
 	  {
-	     char buf[64];
-	     snprintf(buf, 64, "%s (%d)", p->name, eina_list_count(p->items));
-	     edje_object_part_text_set(p->tab, "e.text.label", buf);
+	     /* add plugin to current plugins*/
+	     _evry_plugin_list_insert(s, p);
+
+	     if (!s->plugin || !eina_list_data_find_list(s->cur_plugins, s->plugin))
+	       _evry_plugin_select(s, NULL);
 	  }
 
-	if ((!s->cur_plugin && s->cur_plugins) || (s->cur_plugin == p))
-	  /* || (s->plugin_auto_selected && (s->cur_plugin->config->priority > p->config->priority))) */
+	/* update aggregator */
+	if (eina_list_count(s->cur_plugins) > 0)
 	  {
-	     if (!s->cur_plugin)
-	       s->plugin_auto_selected = 1;
+	     /* add aggregator */
+	     if (!(s->cur_plugins->data == agg))
+	       {
+		  s->cur_plugins = eina_list_prepend(s->cur_plugins, agg);
 
-	     _evry_list_clear();
-	     _evry_show_items(s->cur_plugins->data);
+		  if (s->plugin_auto_selected)
+		    _evry_plugin_select(s, agg);
+	       }
+	     agg->fetch(agg, s->input[0] ? s->input : NULL);
 	  }
-	else if (/*s->plugin_auto_selected &&*/ p->trigger &&
-		 (!strncmp(s->input, p->trigger, strlen(p->trigger))))
+	else
 	  {
-	     _evry_list_clear();
-	     _evry_show_items(p);
-	     /* s->plugin_auto_selected = 0; */
+	     if (s->cur_plugins && s->cur_plugins->data == agg)
+	       {
+		  agg->cleanup(agg);
+		  s->cur_plugins = eina_list_remove(s->cur_plugins, agg);
+	       }
 	  }
-	else if (s->cur_plugin)
-	  _evry_tab_scroll_to(s->cur_plugin); 
-     }
-   else if ((action == EVRY_ASYNC_UPDATE_CLEAR) && (s->cur_plugin == p))
-     {
-	_evry_list_clear();
-	/*XXX  move this into list clear?*/
-	s->cur_items = NULL;
+
+	/* plugin is visible */
+	if ((s->plugin == p) || (s->plugin == agg))
+	  _evry_selector_update(selector);
+
+	_evry_view_update(s, NULL);
      }
 }
 
-EAPI void
-evry_clear_input(void)
+
+/* local subsystem functions */
+
+static Evry_List_Window *
+_evry_list_win_new(E_Zone *zone)
 {
-   if (cur_state->input[0] != 0)
+   int x, y, w, mw, mh;
+   Evry_List_Window *list_win;
+   E_Popup *popup;
+   Evas_Object *o;
+   const char *offset_y;
+   const char *offset_x;
+
+   if (!evry_conf->views) return NULL;
+
+   popup = e_popup_new(zone, 0, 0, 1, 1);
+   if (!popup) return NULL;
+
+   list_win = E_NEW(Evry_List_Window, 1);
+   if (!list_win)
      {
-       	cur_state->input[0] = 0;
+	e_object_del(E_OBJECT(popup));
+	return NULL;
+     }
+   list_win->popup = popup;
+   
+   o = edje_object_add(popup->evas);
+   list_win->o_main = o;
+   e_theme_edje_object_set(o, "base/theme/everything",
+			   "e/modules/everything/list");
+
+   if (e_config->use_composite)
+     {
+	edje_object_signal_emit(o, "e,state,composited", "e");
+	edje_object_message_signal_process(o);
+	edje_object_calc_force(o);
+	offset_x = edje_object_data_get(o, "offset_composite_x");
+	offset_y = edje_object_data_get(o, "offset_composite_y");
+     }
+   else
+     {	
+	offset_x = edje_object_data_get(o, "offset_x");
+	offset_y = edje_object_data_get(o, "offset_y");
      }
+   
+   edje_object_size_min_calc(o, &mw, &mh);
+   
+   if (mh == 0) mh = 200;
+   if (mw == 0) mw = win->popup->w / 2;
+
+   evry_conf->min_h = mh;
+   if (evry_conf->height > mh) 
+     mh = evry_conf->height;
+   
+   x =  win->popup->x + (offset_x ? atoi(offset_x) : 0);
+   y = (win->popup->y + win->popup->h) + (offset_y ? atoi(offset_y) : 0);
+	
+   w = win->popup->w - (offset_x ? atoi(offset_x) : 0)*2;
+   e_popup_move_resize(popup, x, y, w, mh);
+
+   o = list_win->o_main;
+   evas_object_move(o, 0, 0);
+   evas_object_resize(o, list_win->popup->w, list_win->popup->h);
+   evas_object_show(o);
+   e_popup_edje_bg_object_set(popup, o);
+   
+   return list_win;
 }
 
+static void
+_evry_list_win_free(Evry_List_Window *list_win)
+{
+   e_popup_hide(list_win->popup);
+   evas_event_freeze(list_win->popup->evas);
+   evas_object_del(list_win->o_main);
+   e_object_del(E_OBJECT(list_win->popup));
 
-/* local subsystem functions */
-static int
-_evry_cb_plugin_sort(const void *data1, const void *data2)
+   E_FREE(list_win);
+}
+
+static void
+_evry_list_win_show(void)
 {
-   const Evry_Plugin *p1 = data1;
-   const Evry_Plugin *p2 = data2;
-   return p1->config->priority - p2->config->priority;
+   if (list->visible) return;
+
+   list->visible = EINA_TRUE;
+
+   _evry_list_win_update(selector->state);
+
+   edje_object_signal_emit(list->o_main, "e,state,list_show", "e");
+   edje_object_signal_emit(list->o_main, "e,state,entry_show", "e");
 }
 
-static int
-_evry_cb_plugin_sort_by_trigger(const void *data1, const void *data2)
+static void
+_evry_list_win_clear(int hide)
 {
-   const Evry_Plugin *p1 = data1;
-   const Evry_Plugin *p2 = data2;
-   if (p1->trigger)
+   if (!list->visible) return;
+
+   if (selector->state)
+     _evry_view_clear(selector->state);
+
+   if (hide)
      {
-	if (!strncmp(cur_state->input, p1->trigger, strlen(p1->trigger)))
-	  return 1;
+	list->visible = EINA_FALSE;
+	edje_object_signal_emit(list->o_main, "e,state,list_hide", "e");
+	if (evry_conf->hide_input &&
+	    (!selector->state || !selector->state->input ||
+	     strlen(selector->state->input) == 0))
+	  edje_object_signal_emit(list->o_main, "e,state,entry_hide", "e");
      }
-   
-   return p1->config->priority - p2->config->priority;
 }
 
-static int
-_evry_push_state(void)
+static Evry_Window *
+_evry_window_new(E_Zone *zone)
 {
-   Evry_State *s;
-   Eina_List *l, *list = NULL;
-   const char *cur_type = "NONE";
-   Evry_Plugin *p;
+   int x, y, mw, mh;
+   Evry_Window *win;
+   E_Popup *popup;
+   Evas_Object *o;
 
-   s = cur_state;
+   popup = e_popup_new(zone, 0, 0, 1, 1);
+   if (!popup) return NULL;
 
-   if (update_timer)
+   win = E_NEW(Evry_Window, 1);
+   if (!win)
      {
-	_evry_matches_update(s->cur_plugin);
-	ecore_timer_del(update_timer);
-	update_timer = NULL;
+	e_object_del(E_OBJECT(popup));
+	return NULL;
      }
-   
-   if (s)
-     {
-	if (!s->cur_plugin || !s->sel_item)
-	  return 0;
-
-	cur_type = s->cur_plugin->type_out;
-	/* current plugin provides no candidates to act on by others */
-	if (!s->cur_action && !strcmp(cur_type, "NONE"))
-	  return 0;
 
-	EINA_LIST_FOREACH(s->plugins, l, p)
-	  {
-	     if (p != s->cur_plugin)
-	       p->cleanup(p);
+   win->popup = popup;
 
-	     if (p->tab)
-	       {
-		  evas_object_del(p->tab);
-		  p->tab = NULL;
-	       }
-	  }
-     }
+   o = edje_object_add(popup->evas);
+   win->o_main = o;
+   e_theme_edje_object_set(o, "base/theme/everything",
+			   "e/modules/everything/main");
 
-   EINA_LIST_FOREACH(evry_conf->plugins, l, p)
+   if (e_config->use_composite)
      {
-	if (!p->config->enabled) continue;
-	
-	if (strstr(p->type_in, cur_type) || p == action_selector)
-	  {
-	     /* printf("%s- in:%s out:%s\n", p->name, p->type_in, p->type_out); */
-
-	     if (s && s->cur_action)
-	       {
-		  /* filter out plugins that dont provide the type
-		     requested by current action */
-		  if (strcmp(p->type_out, s->request_type))
-		    continue;
-	       }
+	edje_object_signal_emit(o, "e,state,composited", "e");
+	edje_object_message_signal_process(o);
+	edje_object_calc_force(o);
+     }
+   
+   edje_object_size_min_calc(o, &mw, &mh);
 
-	     if (p->begin)
-	       {
-		  Evry_Item *it = NULL;
+   evry_conf->min_w = mw;
+   
+   if (evry_conf->width > mw) 
+     mw = evry_conf->width;
+   
+   x = (zone->w * evry_conf->rel_x) - (mw / 2);
+   y = (zone->h * evry_conf->rel_y) - (mh / 2);
+   
+   e_popup_move_resize(popup, x, y, mw, mh);
 
-		  if (s && (s->cur_plugin != action_selector))
-		    it = s->sel_item;
+   o = win->o_main;
+   e_popup_edje_bg_object_set(win->popup, o);
+   evas_object_move(o, 0, 0);
+   evas_object_resize(o, mw, mh);
+   evas_object_show(o);
 
-		  if (p->begin(p, it))
-		    list = eina_list_append(list, p);
-	       }
-	     else
-	       list = eina_list_append(list, p);
-	  }
-     }
+   ecore_x_netwm_window_type_set(popup->evas_win, ECORE_X_WINDOW_TYPE_UTILITY);
 
-   if (!list) return 0;
+   return win;
+}
 
-   _evry_list_clear();
+static void
+_evry_window_free(Evry_Window *win)
+{
+   e_popup_hide(win->popup);
+   evas_event_freeze(win->popup->evas);
+   evas_object_del(win->o_main);
+   /* evas_event_thaw(win->popup->evas); */
+   e_object_del(E_OBJECT(win->popup));
+   E_FREE(win);
+}
 
-   s = E_NEW(Evry_State, 1);
-   s->input = malloc(INPUTLEN);
-   s->input[0] = 0;
-   s->plugins = list;
-   s->cur_plugins = NULL;
-   s->sel_item = NULL;
-   s->plugin_auto_selected = 1;
+static Evry_Selector *
+_evry_selector_new(int type)
+{
+   Evry_Plugin *p;
+   Eina_List *l;
+   Evry_Selector *sel = E_NEW(Evry_Selector, 1);
+   Evas_Object *o = edje_object_add(win->popup->evas);
+   sel->o_main = o;
+   e_theme_edje_object_set(o, "base/theme/everything",
+			   "e/modules/everything/selector_item");
+   evas_object_show(o);
 
-   if (cur_state)
+   if (type == type_subject)
      {
-	s->request_type = cur_state->request_type;
-	s->cur_action = cur_state->cur_action;
-	s->cur_actions = cur_state->cur_actions;
-	s->initial = 0;
+	sel->history = evry_hist->subjects;
+	edje_object_part_swallow(win->o_main, "e.swallow.subject_selector", o);
      }
-   else
+   else if (type == type_action)
      {
-	s->initial = 1;
+	sel->history = evry_hist->actions;
+	edje_object_part_swallow(win->o_main, "e.swallow.action_selector", o);
      }
+   
+   else if (type == type_object)
+     {
+	sel->history = evry_hist->subjects;
+	edje_object_part_swallow(win->o_main, "e.swallow.object_selector", o);
+     }
+   
+   p = evry_plug_aggregator_new(sel);
 
-   cur_state = s;
-   stack = eina_list_prepend(stack, s);
-
-   edje_object_part_text_set(o_main, "e.text.label", s->input);
-
-   ev_last_is_mouse = 0;
-   item_mouseover = NULL;
+   sel->plugins = eina_list_append(sel->plugins, p);
+   sel->aggregator = p;
 
-   _evry_matches_update(s->cur_plugin);
+   EINA_LIST_FOREACH(evry_conf->plugins, l, p)
+     {
+	if (!p->config->enabled) continue;
+	if (p->type != type) continue;
+	sel->plugins = eina_list_append(sel->plugins, p);
+     }
 
-   return 1;
+   return sel;
 }
 
-static int
-_evry_pop_state(void)
+static void
+_evry_selector_free(Evry_Selector *sel)
 {
-   Evry_State *s, *last_state;
-   Evry_Plugin *p;
-   Eina_List *l;
+   if (sel->do_thumb)
+     e_thumb_icon_end(sel->o_thumb);
+   if (sel->o_thumb)
+     evas_object_del(sel->o_thumb);
+   if (sel->o_icon)
+     evas_object_del(sel->o_icon);
+   if (sel->o_main)
+     evas_object_del(sel->o_main);
 
-   if (!stack || !stack->next) return 0;
+   if (list->visible && (sel == selector))
+     _evry_view_clear(sel->state);
 
-   s = cur_state;
+   while (sel->states)
+     _evry_state_pop(sel);
 
-   stack = eina_list_remove_list(stack, stack);
-   last_state = stack->data;
-   
-   _evry_list_clear();
+   evry_plug_aggregator_free(sel->aggregator);
 
-   free(s->input);
+   if (sel->plugins) eina_list_free(sel->plugins);
 
-   EINA_LIST_FOREACH(s->plugins, l, p)
-     p->cleanup(p);
+   E_FREE(sel);
+}
 
-   E_FREE(s);
+static void
+_evry_selector_activate(Evry_Selector *sel)
+{
+   Evry_State *s;
 
-   if (stack)
+   if (selector)
      {
-	Evry_Item *it = NULL;
-	int i = 0;
-
-	s = last_state;
-	cur_state = s;
+	s = selector->state;
 
-	edje_object_part_text_set(o_main, "e.text.label", s->input);
+	edje_object_signal_emit(selector->o_main, "e,state,unselected", "e");
+	edje_object_part_text_set(selector->o_main, "e.text.plugin", "");
 
-	if (s->sel_item)
+	if (s && s->view)
 	  {
-	     Evry_Item *it;
-	     EINA_LIST_FOREACH(s->cur_plugin->items, l, it)
-	       if (it == s->sel_item)
-		 break;
-	       else i++;
+	     s->view->clear(s->view);
+	     _evry_view_hide(s->view);
 	  }
 
-	if (stack->next)
-	  {
-	     Evry_State *prev = stack->next->data;
-	     it = prev->sel_item;
-	  }
+	_evry_list_win_clear(evry_conf->hide_list);
+     }
 
-	EINA_LIST_FOREACH(s->plugins, l, p)
-	  if (p != s->cur_plugin && p->begin)
-	    p->begin(p, it);
+   selector = sel;
+   s = selector->state;
 
-	p = s->cur_plugin;
-	s->cur_plugin = NULL;
-	_evry_matches_update(p);
+   edje_object_signal_emit(sel->o_main, "e,state,selected", "e");
 
-	/* FIXME better solution: handle the case that previous plugin fetches async */
-	s->cur_plugin = p;
-	
-	it = eina_list_nth(s->cur_plugin->items, i);
+   if (s)
+     {
+	_evry_update_text_label(s);
 
-	if (it)
-	  {
-	     if (s->sel_item) _evry_item_desel(s->sel_item);
-	     s->sel_item = it;
-	     _evry_item_sel(s->sel_item);
-	     _evry_scroll_to(i);
-	  }
+	if (sel->state->cur_item)
+	  edje_object_part_text_set(sel->o_main, "e.text.plugin",
+				    s->cur_item->plugin->name);
+
+	_evry_view_show(s->view);
+	_evry_list_win_update(s);
      }
+}
+
+static void
+_evry_selector_thumb_gen(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Coord w, h;
+   Evry_Selector *sel = data;
+
+   if (sel->o_icon)
+     evas_object_del(sel->o_icon);
+   sel->o_icon = NULL;
+
+   e_icon_size_get(sel->o_thumb, &w, &h);
+   edje_extern_object_aspect_set(sel->o_thumb, EDJE_ASPECT_CONTROL_BOTH, w, h);
+   edje_object_part_swallow(sel->o_main, "e.swallow.thumb", sel->o_thumb);
+   evas_object_show(sel->o_thumb);
+   edje_object_signal_emit(sel->o_main, "e,action,thumb,show", "e");
+   sel->do_thumb = EINA_FALSE;
+}
 
-   /* else
-    *   {
-    * 	cur_state = NULL;
-    * 	evry_hide();
-    *   } */
+static int
+_evry_selector_thumb(Evry_Selector *sel, const Evry_Item *it)
+{
+   Evas_Coord w, h;
 
-   ev_last_is_mouse = 0;
-   item_mouseover = NULL;
+   if (sel->do_thumb)
+     e_thumb_icon_end(sel->o_thumb);
 
-   return 1;
+   if (sel->o_thumb)
+     evas_object_del(sel->o_thumb);
+   sel->o_thumb = NULL;
+
+   if (it->plugin->type_out != thumb_types) return 0;
+
+   ITEM_FILE(file, it);
+
+   if (!file->uri || !file->mime) return 0;
+
+   if (!strncmp(file->mime, "image/", 6))
+     {
+   	sel->o_thumb = e_thumb_icon_add(win->popup->evas);
+   	evas_object_smart_callback_add(sel->o_thumb, "e_thumb_gen", _evry_selector_thumb_gen, sel);
+   	edje_object_part_geometry_get(sel->o_main, "e.swallow.thumb", NULL, NULL, &w, &h);
+   	e_thumb_icon_file_set(sel->o_thumb, file->uri, NULL);
+   	e_thumb_icon_size_set(sel->o_thumb, w, h);
+   	e_thumb_icon_begin(sel->o_thumb);
+   	sel->do_thumb = EINA_TRUE;
+   	return 1;
+     }
+
+   return 0;
 }
 
-/* TODO config options for users preferred keys */
-static int
-_evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
+static void
+_evry_selector_icon_set(Evry_Selector *sel)
 {
-   Ecore_Event_Key *ev;
-   Evry_State *s = cur_state;
-   ev_last_is_mouse = 0;
-   item_mouseover = NULL;
+   Evry_State *s = sel->state;
+   Evry_Item *it;
+   Evas_Object *o;
 
-   ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (!edje_object_part_exists(sel->o_main, "e.swallow.icons")) return;
 
-   if      (!strcmp(ev->key, "Up"))
-     _evry_item_prev();
-   else if (!strcmp(ev->key, "Down"))
-     _evry_item_next();
-   else if (!strcmp(ev->key, "Right") &&
-	    ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
-	     (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
+   if (sel->o_icon)
      {
-	if (s->sel_item)
+	evas_object_del(sel->o_icon);
+	sel->o_icon = NULL;
+     }
+
+   if (!s) return;
+
+   it = s->cur_item;
+
+   if (it && it->plugin && it->plugin->icon_get)
+     {
+	if (!_evry_selector_thumb(sel, it))
 	  {
-	     if (!_evry_push_state())
-	       _evry_plugin_action(0);
+	     o = it->plugin->icon_get(it->plugin, it, win->popup->evas);
+	     if (o)
+	       {
+		  edje_object_part_swallow(sel->o_main, "e.swallow.icons", o);
+		  evas_object_show(o);
+		  sel->o_icon = o;
+	       }
 	  }
      }
-   /* _evry_plugin_next(); */
-   else if (!strcmp(ev->key, "Left") &&
-	    ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
-	     (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
-     _evry_pop_state();
-   /* _evry_plugin_prev(); */
-   else if (!strcmp(ev->key, "Right"))
-     _evry_plugin_next();
-   /* {
-    * 	if (s->sel_item)
-    * 	  {
-    * 	     if (!_evry_push_state())
-    * 	       _evry_plugin_action(0);
-    * 	  }
-    * } */
-   else if (!strcmp(ev->key, "Left"))
-     _evry_plugin_prev();
-   /* _evry_pop_state();      */
-   else if (!strcmp(ev->key, "Return") &&
-	    (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
-     _evry_plugin_action(0);
-   else if (!strcmp(ev->key, "Return"))
-     _evry_plugin_action(1);
-   else if (!strcmp(ev->key, "Tab") &&
-	    ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) ||
-	     (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)))
-     _evry_plugin_prev();
-   else if (!strcmp(ev->key, "Tab"))
+   else if (it)
      {
-     	if (s->sel_item)
-     	  {
-     	     if (!_evry_push_state())
-     	       _evry_plugin_action(0);
-     	  }
-     }
-   /* _evry_plugin_next(); */
-   else if (!strcmp(ev->key, "u") &&
-	    (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL))
-     _evry_clear();
-   else  if ((!strcmp(ev->key, "Escape")) ||
-	     (!strcmp(ev->key, "e") &&
-	      (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
-     {
-	if (!_evry_pop_state())
-	  evry_hide();
+   	_evry_selector_thumb(sel, it);
      }
 
-   else if (!strcmp(ev->key, "BackSpace"))
-     _evry_backspace();
-   else if (!strcmp(ev->key, "Delete"))
-     _evry_backspace();
-   else
+   if (!sel->o_icon && s->plugin && s->plugin->icon)
      {
-   	if (ev->compose)
-   	  {
-   	     if ((strlen(s->input) < (INPUTLEN - strlen(ev->compose))))
-   	       {
-   		  strcat(s->input, ev->compose);
-   		  _evry_update();
-   	       }
-   	  }
+	o = evry_icon_theme_get(s->plugin->icon, win->popup->evas);
+	if (o)
+	  {
+	     edje_object_part_swallow(sel->o_main, "e.swallow.icons", o);
+	     evas_object_show(o);
+	     sel->o_icon = o;
+	  }
      }
-   return 1;
 }
 
-static int
-_evry_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event)
+static void
+_evry_selector_update(Evry_Selector *sel)
 {
-   Ecore_Event_Mouse_Button *ev;
-   Evry_State *s =cur_state;
-
-   ev = event;
-   if (ev->event_window != input_window) return 1;
+   Evry_State *s = sel->state;
+   Evry_Item *it = NULL;
 
-   if (item_mouseover)
+   if (s)
      {
-	if (s->sel_item != item_mouseover)
+	it = s->cur_item;
+
+	if (!s->plugin && it)
+	  _evry_item_desel(s, NULL);
+	else if (it && !eina_list_data_find_list(s->plugin->items, it))
+	  _evry_item_desel(s, NULL);
+
+	it = s->cur_item;
+
+	if (s->plugin && (!it || s->item_auto_selected))
 	  {
-	     if (s->sel_item) _evry_item_desel(s->sel_item);
-	     s->sel_item = item_mouseover;
-	     _evry_item_sel(s->sel_item);
+	     /* get first item */
+	     if (s->plugin->items)
+	       {
+		  it = s->plugin->items->data;
+		  s->item_auto_selected = EINA_TRUE;
+		  _evry_item_sel(s, it);
+	       }
 	  }
      }
+
+   _evry_selector_icon_set(sel);
+
+   if (it)
+     {
+	edje_object_part_text_set(sel->o_main, "e.text.label", it->label);
+
+	if (sel == selector)
+	  edje_object_part_text_set(sel->o_main, "e.text.plugin", it->plugin->name);
+	else
+	  edje_object_part_text_set(sel->o_main, "e.text.plugin", "");
+     }
    else
      {
-	evas_event_feed_mouse_up(popup->evas, ev->buttons, 0, ev->timestamp, NULL);
+	/* no items for this state - clear selector */
+	edje_object_part_text_set(sel->o_main, "e.text.label", "");
+	if (sel == selector && s && s->plugin)
+	  edje_object_part_text_set(sel->o_main, "e.text.plugin", s->plugin->name);
+	else
+	  edje_object_part_text_set(sel->o_main, "e.text.plugin", "");
      }
 
-   return 1;
+   if (sel == selectors[0])
+     {
+	_evry_selector_actions_get(it);
+	_evry_selector_update(selectors[1]);
+     }
 }
 
-static int
-_evry_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
+static void
+_evry_list_win_update(Evry_State *s)
 {
-   Ecore_Event_Mouse_Button *ev;
+   if (s != selector->state) return;
+   if (!list->visible) return;
 
-   ev = event;
-   if (ev->event_window != input_window) return 1;
+   _evry_view_update(s, s->plugin);
+}
 
-   if (item_mouseover)
-     {
-	if (ev->buttons == 1)
-	  _evry_plugin_action(1);
-	else if (ev->buttons == 3)
-	  _evry_plugin_action(0);
-     }
-   else
+static int
+_evry_selector_subjects_get(const char *plugin_name)
+{
+   Eina_List *l, *plugins = NULL;
+   Evry_Plugin *p, *plugin;
+   Evry_Selector *sel = selectors[0];
+
+   EINA_LIST_FOREACH(sel->plugins, l, plugin)
      {
-	evas_event_feed_mouse_up(popup->evas, ev->buttons, 0, ev->timestamp, NULL);
+	if (plugin_name && strcmp(plugin_name, plugin->name))
+	  continue;
+
+	if (plugin->begin)
+	  {
+	     if ((p = plugin->begin(plugin, NULL)))
+	       plugins = eina_list_append(plugins, p);
+	  }
+	else
+	  plugins = eina_list_append(plugins, plugin);
      }
 
+   if (!plugins) return 0;
+
+   _evry_state_new(sel, plugins);
+   _evry_matches_update(sel, 1);
+
    return 1;
 }
 
 static int
-_evry_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
+_evry_selector_actions_get(Evry_Item *it)
 {
-   Ecore_Event_Mouse_Move *ev;
-   Evry_State *s =cur_state;
+   Eina_List *l, *plugins = NULL;
+   Evry_Plugin *p, *plugin;
+   Evry_Selector *sel = selectors[1];
+   const char *type_out;
 
-   ev = event;
-   if (ev->event_window != input_window) return 1;
+   while (sel->state)
+     _evry_state_pop(sel);
 
-   if (!ev_last_is_mouse)
+   if (!it) return 0;
+
+   type_out = it->plugin->type_out;
+
+   EINA_LIST_FOREACH(sel->plugins, l, plugin)
      {
-        ev_last_is_mouse = 1;
-        if (item_mouseover)
-          {
-             if (s->sel_item && (s->sel_item != item_mouseover))
-               _evry_item_desel(s->sel_item);
-             if (!s->sel_item || (s->sel_item != item_mouseover))
-               {
-                  s->sel_item = item_mouseover;
-                  _evry_item_sel(s->sel_item);
-               }
-          }
+	if ((plugin == action_selector) || (plugin == sel->aggregator) ||
+	    (plugin->type_in &&  type_out && plugin->type_in == type_out))
+	  {
+	     if (plugin->begin)
+	       {
+		  if ((p = plugin->begin(plugin, it)))
+		    plugins = eina_list_append(plugins, p);
+	       }
+	     else
+	       plugins = eina_list_append(plugins, plugin);
+	  }
      }
 
-   evas_event_feed_mouse_move(popup->evas, ev->x - popup->x,
-			      ev->y - popup->y, ev->timestamp, NULL);
+   if (!plugins) return 0;
+
+   _evry_state_new(sel, plugins);
+   _evry_matches_update(sel, 1);
 
    return 1;
 }
 
+/* find plugins that provide the second item required for an action */
 static int
-_evry_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
+_evry_selector_objects_get(Evry_Action *act)
 {
-   Ecore_Event_Mouse_Wheel *ev;
+   Eina_List *l, *plugins = NULL;
+   Evry_Plugin *p, *plugin;
+   Evry_Selector *sel = selectors[2];
+   Evry_Item *it;
+   /* required type */
+   const char *type_in = act->type_in2;
 
-   ev = event;
-   if (ev->event_window != input_window) return 1;
+   while (sel->state)
+     _evry_state_pop(sel);
 
-   ev_last_is_mouse = 0;
+   it = selectors[0]->state->cur_item;
 
-   if (ev->z < 0) /* up */
+   EINA_LIST_FOREACH(sel->plugins, l, plugin)
      {
-	int i;
+	/* plugin doesnt provide reuired type */
+	if ((plugin->type_out != type_in) &&
+	    (plugin != sel->aggregator))
+	  continue;
 
-	for (i = ev->z; i < 0; i++) _evry_item_prev();
+	if (plugin->begin)
+	  {
+	     /* plugins' begin method might require an item */
+	     /* like tracker searches files that match mimetype
+	      * of an application (item1) */
+	     if (((p = plugin->begin(plugin, it))) ||
+		 ((p = plugin->begin(plugin, NULL))))
+	       plugins = eina_list_append(plugins, p);
+	  }
+	else
+	  plugins = eina_list_append(plugins, plugin);
      }
-   else if (ev->z > 0) /* down */
-     {
-	int i;
 
-	for (i = ev->z; i > 0; i--) _evry_item_next();
-     }
+   if (!plugins) return 0;
+
+   _evry_state_new(sel, plugins);
+   _evry_matches_update(sel, 1);
+
    return 1;
 }
 
-static void
-_evry_cb_item_mouse_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+static Evry_State *
+_evry_state_new(Evry_Selector *sel, Eina_List *plugins)
 {
-   Evry_State *s =cur_state;
-
-   if (!ev_last_is_mouse) return;
+   Evry_State *s = E_NEW(Evry_State, 1);
+   s->input = malloc(INPUTLEN);
+   s->input[0] = 0;
+   s->plugins = plugins;
 
-   item_mouseover = data;
+   sel->states = eina_list_prepend(sel->states, s);
+   sel->state = s;
 
-   if (s->sel_item) _evry_item_desel(s->sel_item);
-   if (!(s->sel_item = data)) return;
-   _evry_item_sel(s->sel_item);
+   return s;
 }
 
 static void
-_evry_cb_item_mouse_out(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+_evry_state_pop(Evry_Selector *sel)
 {
-   item_mouseover = NULL;
-}
+   Evry_Plugin *p;
+   Evry_State *s;
 
-static void
-_evry_backspace(void)
-{
-   int len, val, pos;
-   Evry_State *s = cur_state;
+   s = sel->state;
 
-   len = strlen(s->input);
-   if (len > 0)
-     {
-	pos = evas_string_char_prev_get(s->input, len, &val);
-	if ((pos < len) && (pos >= 0))
-	  {
-	     s->input[pos] = 0;
-	     _evry_update();
-	  }
-     }
-}
+   _evry_item_desel(s, NULL);
 
-static void
-_evry_update(void)
-{
-   edje_object_part_text_set(o_main, "e.text.label", cur_state->input);
+   free(s->input);
 
-   if (update_timer) ecore_timer_del(update_timer);
-   update_timer = ecore_timer_add(MATCH_LAG, _evry_update_timer, NULL);
-}
+   if (s->view)
+     s->view->destroy(s->view);
 
-static int
-_evry_update_timer(void *data __UNUSED__)
-{
-   _evry_matches_update(cur_state->cur_plugin);
-   update_timer = NULL;
-   return 0;
-}
+   EINA_LIST_FREE(s->plugins, p)
+     p->cleanup(p);
 
-static void
-_evry_clear(void)
-{
-   if (cur_state->input[0] != 0)
-     {
-	cur_state->input[0] = 0;
-	_evry_update();
-     }
+   E_FREE(s);
+
+   sel->states = eina_list_remove_list(sel->states, sel->states);
+
+   if (sel->states)
+     sel->state = sel->states->data;
+   else
+     sel->state = NULL;
 }
 
-static void
-_evry_plugin_action(int finished)
+int
+evry_browse_item(Evry_Selector *sel)
 {
-   Evry_State *s = cur_state;
+   if (!sel) sel = selector;
+   Evry_State *s = sel->state;
+   Evry_Item *it;
+   Eina_List *l, *plugins = NULL;
+   Evry_Plugin *p, *plugin;
+   Evry_View *view = NULL;
+   const char *type_out;
 
-   if (update_timer)
-     {
-	_evry_matches_update(s->cur_plugin);
-	ecore_timer_del(update_timer);
-	update_timer = NULL;
-     }
+   if (!s)
+     return 0;
    
-   if (s->cur_plugin == action_selector)
-     {
-	/* set cur_action and start plugins for second parameter (if required)*/
-	if (s->sel_item)
-	  finished = _evry_plug_act_select_action(s->cur_plugin, s->sel_item, s->input);
-     }
-   else if (s->cur_action)
-     {
-	/* */
-	if (s->sel_item && (!strcmp(s->cur_plugin->type_out, s->request_type)))
-	  {
-	     s->cur_action->thing2 = s->sel_item;
-	     s->cur_action->action(s->cur_action);
-	  }
-     }
-   else if (s->cur_plugin && (s->sel_item || s->input))
-     {
-	int ret = EVRY_ACTION_OTHER;
+   it = s->cur_item;
 
-	if (s->cur_plugin->action)
-	  {
-	     ret = s->cur_plugin->action(s->cur_plugin, s->sel_item, s->input);
-	  }
-	if (ret == EVRY_ACTION_OTHER)
-	  {
-	     _evry_push_state();
- 	     finished = 0;
-	  }
-	else if (ret == EVRY_ACTION_CONTINUE)
-	  finished = 0;
-     }
-   else if (s->initial)
-     e_exec(popup->zone, NULL, s->input, NULL, NULL /* "everything" */);
+   if (!it || !it->browseable)
+     return 0;
 
-   if (finished)
-     evry_hide();
-}
+   type_out = it->plugin->type_out;
 
-static void
-_evry_show_items(Evry_Plugin *p)
-{
-   Evry_Item *it;
-   Eina_List *l;
-   int mw, mh, h;
-   Evas_Object *o;
-   Evry_State *s = cur_state;
+   if (!type_out)
+     return 1;
+
+   if (it->plugin->begin &&
+       (p = it->plugin->begin(it->plugin, it)))
+     plugins = eina_list_append(plugins, p);
 
-   if (s->cur_plugin)
+   if (!plugins)
      {
-	if (s->cur_plugin != p)
+	EINA_LIST_FOREACH(sel->plugins, l, plugin)
 	  {
-	     edje_object_signal_emit(s->cur_plugin->tab, "e,state,unselected", "e");
-	     edje_object_signal_emit(p->tab, "e,state,selected", "e");
+	     if ((!plugin->begin || !plugin->type_in) ||
+		 (plugin->type_in != type_out))
+	       continue;
+
+	     if ((p = plugin->begin(plugin, it)))
+	       plugins = eina_list_append(plugins, p);
 	  }
      }
-   else
-     edje_object_signal_emit(p->tab, "e,state,selected", "e");
 
-   /* XXX move this to push/pop as plugin could be the same for
-      different states!*/
-   if (s->cur_plugin != p)
-     s->sel_item = NULL;
+   if (!plugins)
+     return 1;
 
-   if (p->realize_items) p->realize_items(p, popup->evas);
+   evry_history_add(sel->history, s, NULL); 
    
-   s->cur_plugin = p;
-   s->cur_items = p->items;
-
-   if (scroll_timer)
+   if (s->view)
      {
-	ecore_timer_del(scroll_timer);
-	scroll_timer = NULL;
-     }
-   if (scroll_animator)
-     {
-	ecore_animator_del(scroll_animator);
-	scroll_animator = NULL;
+	_evry_view_hide(s->view);
+	view = s->view;
      }
 
-   scroll_align = 0;
-   
-   evas_event_freeze(popup->evas);
-   e_box_freeze(o_list);
+   _evry_state_new(sel, plugins);
+   _evry_matches_update(sel, 1);
+   _evry_selector_update(sel);
+   s = sel->state;
 
-   EINA_LIST_FOREACH(p->items, l, it)
+   if (view && list->visible && s)
      {
-	o = edje_object_add(popup->evas);
-	it->o_bg = o;
-	e_theme_edje_object_set(o, "base/theme/everything",
-				"e/widgets/everything/item");
-
-	edje_object_part_text_set(o, "e.text.title", it->label);
-
-	evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
-				       _evry_cb_item_mouse_in, it);
-	evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
-				       _evry_cb_item_mouse_out, it);
-	evas_object_show(o);
-
-	if (!it->o_icon) p->icon_get(p, it, popup->evas);
-
-	if (edje_object_part_exists(o, "e.swallow.icons") && it->o_icon)
+	s->view = view->create(view, s, list->o_main);
+	if (s->view)
 	  {
-	     edje_object_part_swallow(o, "e.swallow.icons", it->o_icon);
-	     evas_object_show(it->o_icon);
+	     _evry_view_show(s->view);
+	     s->view->update(s->view);
 	  }
-	edje_object_size_min_calc(o, &mw, &mh);
-	e_box_pack_end(o_list, o);
-	e_box_pack_options_set(o, 1, 1, 1, 0, 0.5, 0.5, mw, mh, 9999, mh);
      }
-   e_box_thaw(o_list);
 
-   e_box_min_size_get(o_list, NULL, &mh);
-   evas_object_geometry_get(o_list, NULL, NULL, NULL, &h);
-   if (mh <= h)
-     e_box_align_set(o_list, 0.5, 0.0);
-   else
-     e_box_align_set(o_list, 0.5, 1.0);
+   _evry_update_text_label(sel->state);
 
-   /* TODO add option */
+   return 1;
+}
 
-   if (/*!s->initial &&*/!s->sel_item && p->items)
-     {
-   	s->sel_item = p->items->data;
-   	_evry_item_sel(s->sel_item);
-   	_evry_scroll_to(0);
-     }
+void
+evry_browse_back(Evry_Selector *sel)
+{
+   Evry_State *s = sel->state;
+
+   if (!s || !sel->states->next)
+     return;
 
-   evas_event_thaw(popup->evas);
+   _evry_state_pop(sel);
 
-   _evry_tab_scroll_to(p);
+   s = sel->state;
+   sel->aggregator->fetch(sel->aggregator, s->input);
+   _evry_selector_update(sel);
+   _evry_update_text_label(s);
+   _evry_view_show(s->view);
 }
 
 static void
-_evry_matches_update(Evry_Plugin *cur_plugin)
+_evry_selectors_switch(void)
 {
-   Evry_Plugin *p;
-   Eina_List *l;
-   int items;
-   Evry_State *s = cur_state;
-
-   _evry_list_clear();
-   eina_list_free(s->cur_plugins);
-   s->cur_plugins = NULL;
-   s->sel_item = NULL;
+   Evry_State *s = selector->state;
 
-   if (s->input)
-   EINA_LIST_FOREACH(s->plugins, l, p)
+   if (update_timer)
      {
-	/* input matches trigger? */
-	if (p->trigger)
+	if ((selector == selectors[0]) ||
+	    (selector == selectors[1]))
 	  {
-	     if ((strlen(s->input) >= strlen(p->trigger)) &&
-		 (!strncmp(s->input, p->trigger, strlen(p->trigger))))
-	       {
-		  s->cur_plugins = eina_list_append(s->cur_plugins, p);
-		  items = p->fetch(p, s->input);
-		  break;
-	       }
+	     _evry_matches_update(selector, 0);
+	     _evry_selector_update(selector);
 	  }
+
+	ecore_timer_del(update_timer);
+	update_timer = NULL;
      }
 
-   if (!s->cur_plugins)
-   EINA_LIST_FOREACH(s->plugins, l, p)
+   if (selector == selectors[0])
      {
-	if (p->trigger) continue;
-	
-	if (strlen(s->input) == 0)
-	  items = !p->need_query ? p->fetch(p, NULL) : 0;
-	else
-	  items = p->fetch(p, s->input);
-
-	if (!s->initial || (items && eina_list_count(p->items) > 0) || p->async_query)
-	  s->cur_plugins = eina_list_append(s->cur_plugins, p);
+	if (s->cur_item)
+	  _evry_selector_activate(selectors[1]);
      }
-
-   /* remove tabs for not active plugins */
-   EINA_LIST_FOREACH(evry_conf->plugins, l, p)
+   else if (selector == selectors[1])
      {
-	if (p->tab && !eina_list_data_find(s->cur_plugins, p))
+	int next_selector = 0;
+	Evry_Action *act;
+
+	if ((s->cur_item) &&
+	    (s->cur_item->plugin == action_selector) &&
+	    (act = s->cur_item->data) &&
+	    (act->type_in2))
 	  {
-	     evas_object_del(p->tab);
-	     p->tab = NULL;
+	     _evry_selector_objects_get(act);
+	     _evry_selector_update(selectors[2]);
+	     edje_object_signal_emit(win->o_main,
+				     "e,state,object_selector_show", "e");
+	     next_selector = 2;
 	  }
+	_evry_selector_activate(selectors[next_selector]);
      }
+   else if (selector == selectors[2])
+     {
+	while (selector->states)
+	  _evry_state_pop(selector);
 
-   /* show/update tabs of active plugins */
-   EINA_LIST_FOREACH(s->cur_plugins, l, p)
-     _evry_plugin_selector_show(p);
+	edje_object_signal_emit(win->o_main,
+				"e,state,object_selector_hide", "e");
 
-   if (s->cur_plugins)
-     {
-	/* s->cur_plugins = eina_list_sort(s->cur_plugins,
-	 * 				eina_list_count(s->cur_plugins),
-	 * 				_evry_cb_plugin_sort_by_trigger); */
+	_evry_selector_activate(selectors[0]);
+     }
+}
+
+static int
+_evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Event_Key *ev;
+   Evry_State *s = selector->state;
+   const char *key = NULL, *old;
 
-	if (cur_plugin && eina_list_data_find(s->cur_plugins, cur_plugin))
-	  _evry_show_items(cur_plugin);
+   win->request_selection = EINA_FALSE;
+
+   ev = event;
+   if (ev->event_window != input_window) return 1;
+
+   old = ev->key;
+
+   if (evry_conf->quick_nav && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT))
+     {
+	if (!strcmp(ev->key, "k") || (!strcmp(ev->key, "K")))
+	  key = eina_stringshare_add("Up");
+	else if (!strcmp(ev->key, "j") || (!strcmp(ev->key, "J")))
+	  key = eina_stringshare_add("Down");
+	else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
+	  key = eina_stringshare_add("Next");
+	else if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
+	  key = eina_stringshare_add("Prior");
+	else if (!strcmp(ev->key, "l") || (!strcmp(ev->key, "L")))
+	  key = eina_stringshare_add("Right");
+	else if (!strcmp(ev->key, "h") || (!strcmp(ev->key, "H")))
+	  key = eina_stringshare_add("Left");
+	else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
+	  key = eina_stringshare_add("Tab");
+	else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
+	  key = eina_stringshare_add("Return");
 	else
-	  _evry_show_items(s->cur_plugins->data);
+	  key = eina_stringshare_add(ev->key);
+
+	ev->key = key;
      }
    else
      {
-	s->cur_plugin = NULL;
-	s->cur_items = NULL;
+	key = eina_stringshare_add(ev->key);
+	ev->key = key;
      }
-}
 
-static void
-_evry_list_clear(void)
-{
-   Evry_State *s = cur_state;
-   Evry_Item *it;
-   Eina_List *l;
-
-   if (s && s->cur_items)
+   if (!list->visible && (!strcmp(key, "Down")))
+     _evry_list_win_show();
+   else if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
      {
-	evas_event_freeze(popup->evas);
-	e_box_freeze(o_list);
-	EINA_LIST_FOREACH(s->cur_items, l, it)
+	if (!strcmp(key, "u"))
 	  {
-	     evas_object_del(it->o_bg);
-	     if (it->o_icon) evas_object_del(it->o_icon);
-	     it->o_icon = NULL;
+	     if (!_evry_clear(s))
+	       evry_browse_back(selector);
 	  }
-	e_box_thaw(o_list);
-	evas_event_thaw(popup->evas);
+	else if (!strcmp(key, "1"))
+	  _evry_view_toggle(s, NULL);
+	else if (!strcmp(key, "Return"))
+	  _evry_plugin_action(selector, 0);
+	else if (!strcmp(key, "v"))
+	  {
+	     win->request_selection = EINA_TRUE;
+	     ecore_x_selection_primary_request
+	       (win->popup->evas_win, ECORE_X_SELECTION_TARGET_UTF8_STRING);
+	  }
+	else if (_evry_view_key_press(s, ev))
+	  goto end;
+     }
+   else if (_evry_view_key_press(s, ev))
+     goto end;
+   else if (!strcmp(key, "Right"))
+     evry_browse_item(selector);
+   else if (!strcmp(key, "Left"))
+     evry_browse_back(selector);
+   else if (!strcmp(key, "Return"))
+     {
+	if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+	  _evry_plugin_action(selector, 0);
+	else /*if (!_evry_browse_item(selector))*/
+	  _evry_plugin_action(selector, 1);
+     }
+   else if (!strcmp(key, "Escape"))
+     evry_hide();
+   else if (!strcmp(key, "Tab"))
+     _evry_selectors_switch();
+   else if (!strcmp(key, "BackSpace"))
+     {
+	if (!_evry_backspace(s))
+	  evry_browse_back(selector);
      }
+   else if (!strcmp(key, "Delete"))
+     _evry_backspace(s);
+   else if (_evry_view_key_press(s, ev))
+     goto end;
+   else if ((ev->compose && !(ev->modifiers & ECORE_EVENT_MODIFIER_ALT)))
+     {
+	int len = strlen(s->input);
+	if (len < (INPUTLEN - strlen(ev->compose)))
+	  {
+	     strcat(s->input, ev->compose);
+	     /* if ((len == 0) && isspace(s->input[0]))
+	      *   _evry_show_triggers(); */
+	     if ((len == 1) &&
+		 (isspace(s->input[0])) &&
+		 (_evry_view_toggle(s, s->input + 1)))
+	       {
+		  /* space at the beginning is trigger */
+		  _evry_update(s, 0);
+	       }
+	     else if (isspace(*ev->compose))
+	       {
+		  /* do not update matches on space */
+		  _evry_update(s, 0);
+	       }
+	     else
+	       _evry_update(s, 1);
+	  }
+     }
+
+ end:
+   eina_stringshare_del(ev->key);
+   ev->key = old;
+   return 1;
 }
 
-static void
-_evry_scroll_to(int i)
+static int
+_evry_backspace(Evry_State *s)
 {
-   int n, h, mh;
+   int len, val, pos;
 
-   n = eina_list_count(cur_state->cur_plugin->items);
+   len = strlen(s->input);
+   if (len > 0)
+     {
+	pos = evas_string_char_prev_get(s->input, len, &val);
+	if ((pos < len) && (pos >= 0))
+	  {
+	     val = *(s->input + pos);
 
-   e_box_min_size_get(o_list, NULL, &mh);
-   evas_object_geometry_get(o_list, NULL, NULL, NULL, &h);
+	     s->input[pos] = 0;
 
-   if (mh <= h) return;
+	     if ((pos == 0) || !isspace(val))
+	       _evry_update(s, 1);
 
-   if (n > 1)
-     {
-	scroll_align_to = (double)i / (double)(n - 1);
-	if (evry_conf->scroll_animate)
- 	  {
-	     if (!scroll_timer)
-	       scroll_timer = ecore_timer_add(0.01, _evry_scroll_timer, NULL);
-	     if (!scroll_animator)
-	       scroll_animator = ecore_animator_add(_evry_animator, NULL);
-	  }
-	else
-	  {
-	     scroll_align = scroll_align_to;
-	     e_box_align_set(o_list, 0.5, 1.0 - scroll_align);
+	     return 1;
 	  }
      }
-   else
-     e_box_align_set(o_list, 0.5, 1.0);
+
+   return 0;
 }
 
 static void
-_evry_tab_scroll_to(Evry_Plugin *p)
+_evry_update_text_label(Evry_State *s)
 {
-   int n, w, mw, i;
-   double align;
-
-   Eina_List *l;
+   if (!list->visible && evry_conf->hide_input)
+     {
+	if (strlen(s->input) > 0)
+	  edje_object_signal_emit(list->o_main, "e,state,entry_show", "e");
+	else
+	  edje_object_signal_emit(list->o_main, "e,state,entry_hide", "e");
+     }
 
-   for(i = 0, l = cur_state->cur_plugins; l; l = l->next, i++)
-     if (l->data == p) break;
+   edje_object_part_text_set(win->o_main, "e.text.label", s->input);
+   edje_object_part_text_set(list->o_main, "e.text.label", s->input);
 
-   n = eina_list_count(cur_state->cur_plugins);
+}
 
-   e_box_min_size_get(o_selector, &mw, NULL);
-   evas_object_geometry_get(o_selector, NULL, NULL, &w, NULL);
+static void
+_evry_update(Evry_State *s, int fetch)
+{
+   _evry_update_text_label(s);
 
-   if (mw <= w)
+   if (fetch)
      {
-	e_box_align_set(o_selector, 0.0, 0.5);
-	return;
-     }
+	if (update_timer) ecore_timer_del(update_timer);
+	update_timer = ecore_timer_add(MATCH_LAG, _evry_update_timer, s);
 
-   if (n > 1)
-     {
-	align = (double)i / (double)(n - 1);
-	/* if (evry_conf->scroll_animate)
-	 *   {
-	 *      if (!scroll_timer)
-	 *        scroll_timer = ecore_timer_add(0.01, _evry_scroll_timer, NULL);
-	 *      if (!scroll_animator)
-	 *        scroll_animator = ecore_animator_add(_evry_animator, NULL);
-	 *   }
-	 * else */
-	{
-	   e_box_align_set(o_selector, 1.0 - align, 0.5);
-	}
+	if (s->plugin && !s->plugin->trigger)
+	  edje_object_signal_emit(list->o_main, "e,signal,update", "e");
      }
-   else
-     e_box_align_set(o_selector, 1.0, 0.5);
 }
 
-static void
-_evry_item_desel(Evry_Item *it)
+static int
+_evry_update_timer(void *data)
 {
-   edje_object_signal_emit(it->o_bg, "e,state,unselected", "e");
-   if (it->o_icon)
-     edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
+   _evry_matches_update(selector, 1);
+   _evry_selector_update(selector);
+   _evry_list_win_update(selector->state);
+   update_timer = NULL;
+
+   return 0;
 }
 
-static void
-_evry_item_sel(Evry_Item *it)
+static int
+_evry_clear(Evry_State *s)
 {
-   edje_object_signal_emit(it->o_bg, "e,state,selected", "e");
-   if (it->o_icon)
-     edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
+   if ((s->plugin && s->plugin->trigger && s->input) &&
+       (!strncmp(s->plugin->trigger, s->input, strlen(s->plugin->trigger))))
+     {
+	s->input[strlen(s->plugin->trigger)] = 0;
+	_evry_update(s, 1);
+	return 1;
+     }
+   else if (s->input && s->input[0] != 0)
+     {
+	s->input[0] = 0;
+	_evry_update(s, 1);
+	if (!list->visible && evry_conf->hide_input)
+	  edje_object_signal_emit(list->o_main, "e,state,entry_hide", "e");
+	return 1;
+     }
+   return 0;
 }
 
 static void
-_evry_item_next(void)
+_evry_plugin_action(Evry_Selector *sel, int finished)
 {
-   Eina_List *l;
-   int i;
-   Evry_State *s = cur_state;
+   Evry_State *s_subject, *s_action, *s_object;
+
+   s_subject = selectors[0]->state;
+   s_action  = selectors[1]->state;
+   s_object = NULL;
+
+   if (!s_subject || !s_action)
+     return;
+
+   if (update_timer)
+     {
+	_evry_matches_update(selector, 0);
+	_evry_selector_update(selector);
+
+	ecore_timer_del(update_timer);
+	update_timer = NULL;
+     }
 
-   s->plugin_auto_selected = 0;
+   if (!s_subject->cur_item || !s_action->cur_item)
+     return;
 
-   if (s->sel_item)
+   if (s_action->cur_item->plugin == action_selector)
      {
-	for (i = 0, l = s->cur_plugin->items; l; l = l->next, i++)
+	Evry_Action *act = s_action->cur_item->data;
+	Evry_Item *it_object = NULL;
+
+	if (selectors[2] == selector)
+	  it_object = selector->state->cur_item;
+
+	if (act->type_in2 && !it_object)
 	  {
-	     if (l->data == s->sel_item)
-	       {
-		  if (l->next)
-		    {
-		       _evry_item_desel(s->sel_item);
-		       s->sel_item = l->next->data;
-		       _evry_item_sel(s->sel_item);
-		       _evry_scroll_to(i + 1);
-		    }
-		  break;
-	       }
+	     if (selectors[1] == selector)
+	       _evry_selectors_switch();
+	     return;
 	  }
+	
+	act->item2 = it_object;
+
+	if (!act->action(act))
+	  return;
      }
-   else if (s->cur_plugin && s->cur_plugin->items)
-     {
-	s->sel_item = s->cur_plugin->items->data;
-	_evry_item_sel(s->sel_item);
-	_evry_scroll_to(0);
+   else if (s_action->plugin->action)
+     {	
+	Evry_Item *it = s_action->cur_item;
+	if (!s_action->plugin->action(s_action->plugin, it))
+	  return;
      }
+   else return;
+
+   evry_history_add(evry_hist->subjects, s_subject, NULL);
+   evry_history_add(evry_hist->actions, s_action, s_subject->cur_item->context);
+   evry_history_add(evry_hist->subjects, s_object, s_action->cur_item->context);
+   
+   /* let subject and object plugin know that an action was performed */
+   if (s_subject->plugin->action)
+     s_subject->plugin->action(s_subject->plugin, s_subject->cur_item);
 
-   /* if (s->sel_item)
-    *   edje_object_part_text_set(o_main, "e.text.label", s->sel_item->label); */
+   if (s_object && s_object->plugin->action)
+     s_object->plugin->action(s_object->plugin, s_object->cur_item);
+
+   if (finished)
+     evry_hide();
 }
 
 static void
-_evry_item_prev(void)
+_evry_view_show(Evry_View *v)
 {
-   Eina_List *l;
-   int i;
-   Evry_State *s = cur_state;
-
-   s->plugin_auto_selected = 0;
+   if (!v) return;
 
-   if (s->sel_item)
+   if (v->o_list)
      {
-	_evry_item_desel(s->sel_item);
+	edje_object_part_swallow(list->o_main, "e.swallow.list", v->o_list);
+	evas_object_show(v->o_list);
+     }
 
-	for (i = 0, l = s->cur_plugin->items; l; l = l->next, i++)
-	  {
-	     if (l->data == s->sel_item)
-	       {
-		  if (l->prev)
-		    {
-		       s->sel_item = l->prev->data;
-		       _evry_item_sel(s->sel_item);
-		       _evry_scroll_to(i - 1);
-		    }
-		  else
-		    s->sel_item = NULL;
-		  break;
-	       }
-	  }
+   if (v->o_bar)
+     {
+	edje_object_part_swallow(list->o_main, "e.swallow.bar", v->o_bar);
+	evas_object_show(v->o_bar);
      }
-   /* if (s->sel_item)
-    *   edje_object_part_text_set(o_main, "e.text.label", s->sel_item->label);
-    * else
-    *   edje_object_part_text_set(o_main, "e.text.label", input); */
 }
 
 static void
-_evry_plugin_next(void)
+_evry_view_hide(Evry_View *v)
 {
-   Eina_List *l;
-   Evry_State *s = cur_state;
-
-   if (!s->cur_plugin) return;
+   if (!v) return;
 
-   l = eina_list_data_find_list(s->cur_plugins, s->cur_plugin);
-
-   if (l && l->next)
+   if (v->o_list)
      {
-	s->plugin_auto_selected = 0;
-	_evry_list_clear();
-	_evry_show_items(l->next->data);
+	edje_object_part_unswallow(list->o_main, v->o_list);
+	evas_object_hide(v->o_list);
      }
-   else if (s->cur_plugin != s->cur_plugins->data)
+
+   if (v->o_bar)
      {
-	s->plugin_auto_selected = 0;
-	_evry_list_clear();
-	_evry_show_items(s->cur_plugins->data);
+	edje_object_part_unswallow(list->o_main, v->o_bar);
+	evas_object_hide(v->o_bar);
      }
 }
 
 static void
-_evry_plugin_prev(void)
+_evry_view_update(Evry_State *s, Evry_Plugin *p)
 {
-   Eina_List *l;
-   Evry_State *s = cur_state;
+   if (!list->visible) return;
 
-   if (!s->cur_plugin) return;
-
-   l = eina_list_data_find_list(s->cur_plugins, s->cur_plugin);
-
-   if (l && l->prev)
+   if (!s->view)
      {
-	s->plugin_auto_selected = 0;
-	_evry_list_clear();
-	_evry_show_items(l->prev->data);
+	Evry_View *view = evry_conf->views->data;
+	s->view = view->create(view, s, list->o_main);
+	_evry_view_show(s->view);
      }
-   else
-     {
-	l = eina_list_last(s->cur_plugins);
 
-	if (s->cur_plugin != l->data)
-	  {
-	     s->plugin_auto_selected = 0;
-	     _evry_list_clear();
-	     _evry_show_items(l->data);
-	  }
-     }
+   if (s->view)
+     s->view->update(s->view);
 }
 
-static int
-_evry_scroll_timer(void *data __UNUSED__)
+static void
+_evry_view_clear(Evry_State *s)
 {
-   if (scroll_animator)
-     {
-	double spd;
-	spd = evry_conf->scroll_speed;
-	scroll_align = (scroll_align * (1.0 - spd)) + (scroll_align_to * spd);
-	return 1;
-     }
-   scroll_timer = NULL;
-   return 0;
+   if (!s || !s->view) return;
+
+   s->view->clear(s->view);
 }
 
 static int
-_evry_animator(void *data __UNUSED__)
+_evry_view_key_press(Evry_State *s, Ecore_Event_Key *ev)
 {
-   double da;
-   Eina_Bool scroll_to = 1;
+   if (!s || !s->view || !s->view->cb_key_down) return 0;
 
-   da = scroll_align - scroll_align_to;
-   if (da < 0.0) da = -da;
-   if (da < 0.01)
-     {
-	scroll_align = scroll_align_to;
-	scroll_to = 0;
-     }
-   e_box_align_set(o_list, 0.5, 1.0 - scroll_align);
-   if (scroll_to) return 1;
-   scroll_animator = NULL;
-   return 0;
+   return s->view->cb_key_down(s->view, ev);
 }
 
-static void
-_evry_plugin_selector_show(Evry_Plugin *p)
+static int
+_evry_view_toggle(Evry_State *s, const char *trigger)
 {
-   Evas_Object *o;
-   Evas_Coord mw = 0, mh = 0;
-   char buf[64];
-   Eina_List *l;
-   Evry_State *s = cur_state;
-
-   e_box_freeze(o_selector);
+   Evry_View *view, *v = NULL;
+   Eina_List *l, *ll;
 
-   if (p->tab)
+   if (trigger)
      {
-	o = p->tab;
-	e_box_unpack(p->tab);
+	EINA_LIST_FOREACH(evry_conf->views, ll, view)
+	  {
+	     if (view->trigger && !strncmp(trigger, view->trigger, 1) &&
+		 (v = view->create(view, s, list->o_main)))
+	       goto found;
+	  }
      }
    else
      {
-	o = edje_object_add(popup->evas);
-	/* TODO move this to everything theme group !*/
-	e_theme_edje_object_set(o, "base/theme/widgets",
-				"e/widgets/toolbar/item");
-     }
-
-   snprintf(buf, 64, "%s (%d)", p->name, eina_list_count(p->items));
+	if (s->view)
+	  l = eina_list_data_find_list(evry_conf->views, s->view->id);
+	else
+	  {
+	     view = evry_conf->views->data;
+	     v = view->create(view, s, list->o_main);
+	     goto found;
+	  }
 
-   edje_object_part_text_set(o, "e.text.label", buf);
+	if (l && l->next)
+	  l = l->next;
+	else
+	  l = evry_conf->views;
 
-   edje_object_size_min_calc(o, &mw, &mh);
+	EINA_LIST_FOREACH(l, ll, view)
+	  {
+	     if ((!view->trigger) &&
+		 ((view == s->view->id) ||
+		  (v = view->create(view, s, list->o_main))))
+	       goto found;
+	  }
 
-   l = eina_list_data_find_list(s->cur_plugins, p);
-   if (l && l->prev)
-     {
-	Evry_Plugin *p2 = l->prev->data;
-	e_box_pack_after(o_selector, o, p2->tab);
+	EINA_LIST_FOREACH(evry_conf->views, ll, view)
+	  {
+	     if ((!view->trigger) &&
+		 ((view == s->view->id) ||
+		  (v = view->create(view, s, list->o_main))))
+	       goto found;
+	  }
      }
-   else
-     e_box_pack_end(o_selector, o);
 
-   evas_object_show(o);
-   e_box_pack_options_set(o, 1, 1, 0, 0, 0.5, 0.5, mw, mh, 9999, 9999);
-   e_box_thaw(o_selector);
-   p->tab = o;
-}
+ found:
+   if (!v) return 0;
 
+   _evry_list_win_show();
 
-/* action selector plugin: provides list of actions registered for
-   candidate types provided by current plugin */
-static int
-_evry_plug_act_select_init(void)
-{
-   Plugin_Config *pc;
-   Evry_Plugin *p = E_NEW(Evry_Plugin, 1);
-   p->name = "Select Action";
-   p->type_in  = "ANY";
-   p->type_out = "NONE";
-   p->begin    = &_evry_plug_act_select_begin;
-   p->cleanup  = &_evry_plug_act_select_cleanup;
-   p->fetch    = &_evry_plug_act_select_fetch;
-   p->action   = &_evry_plug_act_select_action;
-   p->icon_get = &_evry_plug_act_select_item_icon_get;
-
-   pc = E_NEW(Plugin_Config, 1);
-   pc->name = eina_stringshare_add(p->name);
-   pc->enabled = 1;
-   pc->priority = 100;
-   p->config = pc;
-
-   evry_conf->plugins = eina_list_append(evry_conf->plugins, p);
-   action_selector = p;
+   if (s->view)
+     {
+	_evry_view_hide(s->view);
+	s->view->destroy(s->view);
+     }
+
+   s->view = v;
+   _evry_view_show(s->view);
+   view->update(s->view);
 
    return 1;
 }
 
-static int
-_evry_plug_act_select_begin(Evry_Plugin *p, Evry_Item *it __UNUSED__)
+static void
+_evry_matches_update(Evry_Selector *sel, int async)
 {
-   Evry_Action *act;
+   Evry_State *s = sel->state;
+   Evry_Plugin *p;
    Eina_List *l;
-   Evry_State *s = cur_state;
+   const char *input;
 
-   _evry_plug_act_select_cleanup(p);
+   /* TODO cleanup plugins */
+   EINA_LIST_FREE(s->cur_plugins, p);
 
-   if (!s || !s->cur_plugin || s->cur_action) return 0;
-   
-   const char *type = s->cur_plugin->type_out;
+   /* if (strlen(s->input) > 0) */
+   if (s->input[0])
+   input = s->input;
+   else
+     input = NULL;
+
+   if (input)
+     {
+	EINA_LIST_FOREACH(s->plugins, l, p)
+	  {
+	     /* input matches plugin trigger? */
+	     if (!p->trigger) continue;
 
-   EINA_LIST_FOREACH(actions, l, act)
+	     if ((strlen(s->input) >= strlen(p->trigger)) &&
+		 (!strncmp(s->input, p->trigger, strlen(p->trigger))))
+	       {
+		  s->cur_plugins = eina_list_append(s->cur_plugins, p);
+		  p->fetch(p, s->input + strlen(p->trigger));
+		  break;
+	       }
+	  }
+     }
+
+   if (!s->cur_plugins)
      {
-	if ((strstr(act->type_in1, type)) &&
-	    (!act->check_item || act->check_item(act, s->sel_item)))
+	EINA_LIST_FOREACH(s->plugins, l, p)
 	  {
-	     act->thing1 = s->sel_item;
-	     s->cur_actions = eina_list_append(s->cur_actions, act);
+	     if (!win->plugin_dedicated && p->trigger) continue;
+	     if (p == sel->aggregator) continue;
+	     if (!async && p->async_fetch && p->items) 
+	       {
+		  s->cur_plugins = eina_list_append(s->cur_plugins, p);
+	       }
+	     else
+	       {
+		  if (p->fetch(p, input) || (sel->states->next) || (win->plugin_dedicated))
+		    s->cur_plugins = eina_list_append(s->cur_plugins, p);
+	       }
 	  }
+
+	if (eina_list_count(s->cur_plugins) > 0)
+	  {
+	     s->cur_plugins = eina_list_prepend(s->cur_plugins, sel->aggregator);
+	     sel->aggregator->fetch(sel->aggregator, input);
+	     if (s->plugin_auto_selected)
+	       _evry_plugin_select(s, NULL);
+	  }
+	else
+	  sel->aggregator->cleanup(sel->aggregator);
      }
 
-   if (s->cur_actions) return 1;
+   if (s->plugin && !eina_list_data_find_list(s->cur_plugins, s->plugin))
+     s->plugin = NULL;
 
-   return 0;
+   _evry_plugin_select(s, s->plugin);
 }
 
-static int
-_evry_plug_act_select_fetch(Evry_Plugin *p, const char *input __UNUSED__)
+static void
+_evry_item_desel(Evry_State *s, Evry_Item *it)
 {
-   Evry_Action *act;
-   Eina_List *l;
-   Evry_State *s = cur_state;
-   
-   if (p->items) return 1;
-   
-   EINA_LIST_FOREACH(s->cur_actions, l, act)
-     {
-	Evry_Item *it;
+   if (s->cur_item)
+     evry_item_free(s->cur_item);
 
-	it = E_NEW(Evry_Item, 1);
-	it->label = eina_stringshare_add(act->name);
-	it->data[0] = act;
+   s->cur_item = NULL;
+}
 
-	p->items = eina_list_append(p->items, it);
-     }
+static void
+_evry_item_sel(Evry_State *s, Evry_Item *it)
+{
+   if (s->cur_item == it) return;
 
-   if (p->items) return 1;
+   _evry_item_desel(s, NULL);
 
-   return 0;
+   evry_item_ref(it);
+   s->cur_item = it;
 }
 
-static int
-_evry_plug_act_select_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
+static void
+_evry_plugin_select(Evry_State *s, Evry_Plugin *p)
 {
-   Evry_Action *act = it->data[0];
-   cur_state->cur_action = act;
-   if (strcmp(act->type_in2, "NONE"))
+   if (!s || !s->cur_plugins) return;
+
+   if (!p && s->cur_plugins)
      {
-	/* XXX hackish - param for push? */
-	cur_state->request_type = act->type_in2;
-	_evry_push_state();
-	
-	return 0;
-     }
-   else
-     {
-	act->action(act);
-	return 1;
+	p = s->cur_plugins->data;
+	s->plugin_auto_selected = EINA_TRUE;
      }
+   else s->plugin_auto_selected = EINA_FALSE;
+
+   if (s->plugin != p)
+     _evry_item_desel(s, NULL);
+
+   s->plugin = p;
 }
 
-static void
-_evry_plug_act_select_cleanup(Evry_Plugin *p)
+void
+evry_plugin_select(const Evry_State *s, Evry_Plugin *p)
 {
-   Evry_Item *it;
+   _evry_plugin_select((Evry_State *) s, p);
 
-   if (!cur_state) return;
-   
-   EINA_LIST_FREE(p->items, it)
-     {
-	eina_stringshare_del(it->label);
-	E_FREE(it);
-     }
+   _evry_selector_update(selector);
+}
 
-   eina_list_free(cur_state->cur_actions);
-   cur_state->cur_actions = NULL;
+static void
+_evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
+{
+   Eina_List *l;
+   Evry_Plugin *plugin;
+
+   EINA_LIST_FOREACH(s->cur_plugins, l, plugin)
+     if (p == plugin)
+       return;
+     else
+       if (p->config->priority < plugin->config->priority)
+       break;
 
-   p->items = NULL;
+   if (l)
+     s->cur_plugins = eina_list_prepend_relative_list(s->cur_plugins, p, l);
+   else
+     s->cur_plugins = eina_list_append(s->cur_plugins, p);
 }
 
-static void
-_evry_plug_act_select_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, Evas *e __UNUSED__)
+static int
+_evry_cb_selection_notify(void *data, int type, void *event)
 {
-   /*    Evry_Action *act = it->data[0]; */
+   Ecore_X_Event_Selection_Notify *ev;
+   Evry_State *s = selector->state;
 
-   /* if (act->icon_get)
-    *   it->o_icon = act->icon_get(act, e); */
+   if (!s || (data != win)) return 1;
+   if (!win->request_selection) return 1;
+
+   win->request_selection = EINA_FALSE;
+
+   ev = event;
+   if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
+       (ev->selection == ECORE_X_SELECTION_PRIMARY))
+     {
+        if (strcmp(ev->target, ECORE_X_SELECTION_TARGET_UTF8_STRING) == 0)
+          {
+             Ecore_X_Selection_Data_Text *text_data;
+
+             text_data = ev->data;
+
+	     strncat(s->input, text_data->text, (INPUTLEN - strlen(s->input)) - 1);
+	     _evry_update(s, 1);
+          }
+     }
+
+   return 1;
 }
 
diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c
index b492a91..bab66d5 100644
--- a/src/modules/everything/evry_config.c
+++ b/src/modules/everything/evry_config.c
@@ -1,34 +1,50 @@
-
 #include "e_mod_main.h"
 
-/* typedef struct _E_Config_Dialog_Data E_Config_Dialog_Data; */
-
 static void        *_create_data             (E_Config_Dialog *cfd);
 static void         _free_data               (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static int          _basic_apply_data        (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create_widgets    (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 
 
-struct _E_Config_Dialog_Data 
+struct _E_Config_Dialog_Data
 {
-  int width, height;
+  int hide_input;
+  int hide_list;
 
+  int quick_nav;
+
+  int width, height;
+  double rel_x, rel_y;
   int scroll_animate;
 
-  Evas_Object *l_avail;
+  char *cmd_terminal;
+  char *cmd_sudo;
+
+  int view_mode;
+  int view_zoom;
+  int cycle_mode;
+
+  int history_sort_mode;
   
+  Evas_Object *l_subject;
+  Evas_Object *l_action;
+  Evas_Object *l_object;
+
+  Eina_List *p_subject;
+  Eina_List *p_action;
+  Eina_List *p_object;
 };
 
 
 EAPI E_Config_Dialog *
-evry_config_dialog(E_Container *con, const char *params __UNUSED__) 
+evry_config_dialog(E_Container *con, const char *params __UNUSED__)
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
-   
-   if (e_config_dialog_find("E", "_config_everything_dialog")) return NULL;
+
+   if (e_config_dialog_find("E", "extensions/run_everything")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
-   
+
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
    v->basic.apply_cfdata = _basic_apply_data;
@@ -37,24 +53,51 @@ evry_config_dialog(E_Container *con, const char *params __UNUSED__)
    v->advanced.create_widgets = NULL;
    cfd = e_config_dialog_new(con,
 			     _("Everything Settings"),
-			     "E", "_config_everything_dialog",
+			     "E", "extensions/run_everything",
 			     "system-run", 0, v, NULL);
    return cfd;
 }
 
 static void
-_fill_data(E_Config_Dialog_Data *cfdata) 
+_fill_data(E_Config_Dialog_Data *cfdata)
 {
-   cfdata->scroll_animate = evry_conf->scroll_animate;
-   cfdata->height = evry_conf->height;
-   cfdata->width = evry_conf->width;
+   Eina_List *l;
+   Evry_Plugin *p;
+
+#define C(_name) cfdata->_name = evry_conf->_name
+   C(height);
+   C(width);
+   C(hide_list);
+   C(hide_input);
+   C(quick_nav);
+   C(rel_x);
+   C(rel_y);
+   C(view_mode);
+   C(view_zoom);
+   C(cycle_mode);
+   C(history_sort_mode);
+#undef C
+   
+   EINA_LIST_FOREACH(evry_conf->plugins, l, p)
+     if (p->type == type_subject)
+       cfdata->p_subject = eina_list_append(cfdata->p_subject, p);
+     else if (p->type == type_action)
+       cfdata->p_action = eina_list_append(cfdata->p_action, p);
+     else if (p->type == type_object)
+       cfdata->p_object = eina_list_append(cfdata->p_object, p);
+
+   if (evry_conf->cmd_terminal)
+     cfdata->cmd_terminal = strdup(evry_conf->cmd_terminal);   
+
+   if (evry_conf->cmd_sudo)
+     cfdata->cmd_sudo = strdup(evry_conf->cmd_sudo);   
 }
 
 static void *
 _create_data(E_Config_Dialog *cfd __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
-   
+
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    _fill_data(cfdata);
    return cfdata;
@@ -63,28 +106,62 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
 static void
 _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
+   if (cfdata->p_subject) eina_list_free(cfdata->p_subject);
+   if (cfdata->p_action)  eina_list_free(cfdata->p_action);
+   if (cfdata->p_object)  eina_list_free(cfdata->p_object);
+   E_FREE(cfdata->cmd_terminal);
+   E_FREE(cfdata->cmd_sudo);
    E_FREE(cfdata);
 }
 
 static int
+_evry_cb_plugin_sort(const void *data1, const void *data2)
+{
+   const Evry_Plugin *p1 = data1;
+   const Evry_Plugin *p2 = data2;
+   return p1->config->priority - p2->config->priority;
+}
+
+static int
 _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
 {
-   evry_conf->width = cfdata->width;
-   evry_conf->height = cfdata->height;
-   evry_conf->scroll_animate = cfdata->scroll_animate;
 
+#define C(_name) evry_conf->_name = cfdata->_name
+  C(height);
+  C(width);
+  C(hide_list);
+  C(hide_input);
+  C(quick_nav);
+  C(rel_x);
+  C(rel_y);
+  C(view_mode);
+  C(view_zoom);
+  C(cycle_mode);
+  C(history_sort_mode);
+#undef C
+
+   evry_conf->plugins = eina_list_sort(evry_conf->plugins, -1,
+				       _evry_cb_plugin_sort);
+
+   if (evry_conf->cmd_terminal)
+     eina_stringshare_del(evry_conf->cmd_terminal);
+   evry_conf->cmd_terminal = eina_stringshare_add(cfdata->cmd_terminal);
+   if (evry_conf->cmd_sudo)
+     eina_stringshare_del(evry_conf->cmd_sudo);
+   evry_conf->cmd_sudo = eina_stringshare_add(cfdata->cmd_sudo);
+   
    e_config_save_queue();
    return 1;
 }
 
 static void
-_fill_list(Evas_Object *obj, int enabled __UNUSED__)
+_fill_list(Eina_List *plugins, Evas_Object *obj, int enabled __UNUSED__)
 {
    Evas *evas;
    Evas_Coord w;
    Eina_List *l;
    Evry_Plugin *p;
-   
+
    /* freeze evas, edje, and list widget */
    evas = evas_object_evas_get(obj);
    evas_event_freeze(evas);
@@ -92,19 +169,19 @@ _fill_list(Evas_Object *obj, int enabled __UNUSED__)
    e_widget_ilist_freeze(obj);
    e_widget_ilist_clear(obj);
 
-   EINA_LIST_FOREACH(evry_conf->plugins, l, p)
+   EINA_LIST_FOREACH(plugins, l, p)
      e_widget_ilist_append(obj, NULL, p->name, NULL, p, NULL);
 
    e_widget_ilist_go(obj);
-   e_widget_min_size_get(obj, &w, NULL);
-   e_widget_min_size_set(obj, w > 180 ? w : 180, 200);
+   e_widget_size_min_get(obj, &w, NULL);
+   e_widget_size_min_set(obj, w > 180 ? w : 180, 200);
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas);
 }
 
 static void
-_plugin_move(Evas_Object *list, int dir)
+_plugin_move(Eina_List *plugins, Evas_Object *list, int dir)
 {
    int sel;
    Eina_List *l1, *l2;
@@ -115,85 +192,214 @@ _plugin_move(Evas_Object *list, int dir)
      {
 	Evry_Plugin *p;
 	int prio = 0;
-	
-	l1 = eina_list_nth_list(evry_conf->plugins, sel);
-	l2 = eina_list_nth_list(evry_conf->plugins, sel + dir);
+
+	l1 = eina_list_nth_list(plugins, sel);
+	l2 = eina_list_nth_list(plugins, sel + dir);
 
 	if (!l1 || !l2) return;
 	p = l1->data;
 	l1->data = l2->data;
 	l2->data = p;
 
-	_fill_list(list, 0); 
+	_fill_list(plugins, list, 0);
 	e_widget_ilist_selected_set(list, sel + dir);
 
-	EINA_LIST_FOREACH(evry_conf->plugins, l1, p)
+	EINA_LIST_FOREACH(plugins, l1, p)
 	  p->config->priority = prio++;
      }
 }
 
 static void
-_plugin_move_up_cb(void *data, void *data2 __UNUSED__)
+_plugin_move_up_cb(void *data, void *data2)
 {
-   E_Config_Dialog_Data *cfdata;
-   
-   cfdata = data;
-
-   _plugin_move(cfdata->l_avail, -1);
+   _plugin_move(data2, data, -1);
 }
 
 static void
-_plugin_move_down_cb(void *data, void *data2 __UNUSED__)
+_plugin_move_down_cb(void *data, void *data2)
 {
-   E_Config_Dialog_Data *cfdata;
-
-   cfdata = data;
-
-   _plugin_move(cfdata->l_avail, 1);
+   _plugin_move(data2, data, 1);
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
 {
    Evas_Object *o, *of, *ob, *otb;
-
-   otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
+   E_Radio_Group *rg;
    
+   otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
+
    o = e_widget_list_add(evas, 0, 0);
 
    of = e_widget_framelist_add(evas, _("General Settings"), 0);
-   ob = e_widget_label_add(evas, _("Popup Width"));
+
+   ob = e_widget_check_add(evas, _("Hide input when inactive"),
+   			   &(cfdata->hide_input));
+   e_widget_framelist_object_append(of, ob);
+
+   ob = e_widget_check_add(evas, _("Hide list"),
+   			   &(cfdata->hide_list));
+   e_widget_framelist_object_append(of, ob);
+
+   ob = e_widget_check_add(evas, _("Quick Navigation (ALT + h,j,k,l,n,p,m,i)"),
+   			   &(cfdata->quick_nav));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   
+   of = e_widget_framelist_add(evas, _("Default View"), 0);
+   rg = e_widget_radio_group_new(&cfdata->view_mode); 
+   ob = e_widget_radio_add(evas, "List", 0, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->view_mode == 0));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_radio_add(evas, "Icons", 1, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->view_mode == 1));
+   e_widget_framelist_object_append(of, ob);
+   
+   ob = e_widget_check_add(evas, _("Up/Down select next item in icon view"),
+   			   &(cfdata->cycle_mode));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 300, 800, 5, 0, NULL, &(cfdata->width), 200);
-   e_widget_framelist_object_append(of, ob);   
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
 
+   of = e_widget_framelist_add(evas, _("History Sort"), 0);
+   rg = e_widget_radio_group_new(&cfdata->history_sort_mode); 
+   ob = e_widget_radio_add(evas, "By usage", 0, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 0));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_radio_add(evas, "Most used", 1, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 1));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_radio_add(evas, "Last used", 2, rg);
+   e_widget_radio_toggle_set(ob, (cfdata->history_sort_mode == 2));
+   e_widget_framelist_object_append(of, ob);
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+   
+   of = e_widget_framelist_add(evas, _("Commands"), 0);
+   ob = e_widget_label_add(evas, _("Terminal Command"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_entry_add(evas, &(cfdata->cmd_terminal), NULL, NULL, NULL);
+   e_widget_framelist_object_append(of, ob);
+
+   ob = e_widget_label_add(evas, _("Sudo GUI"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_entry_add(evas, &(cfdata->cmd_sudo), NULL, NULL, NULL);
+   e_widget_framelist_object_append(of, ob);
+
+   e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   e_widget_toolbook_page_append(otb, NULL, _("General Settings"),
+				 o, 1, 0, 1, 0, 0.5, 0.0);
+
+   o = e_widget_list_add(evas, 0, 0);
+   of = e_widget_framelist_add(evas, _("Popup Size"), 0);
+   ob = e_widget_label_add(evas, _("Popup Width"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"),
+   			    evry_conf->min_w, 800, 5, 0, NULL,
+   			    &(cfdata->width), 200);
+   e_widget_framelist_object_append(of, ob);
+   
    ob = e_widget_label_add(evas, _("Popup Height"));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 200, 800, 5, 0, NULL, &(cfdata->height), 200);
-   e_widget_framelist_object_append(of, ob);   
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"),
+   			    evry_conf->min_h, 800, 5, 0, NULL,
+   			    &(cfdata->height), 200);
+   e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+   of = e_widget_framelist_add(evas, _("Popup Align"), 0);
+   ob = e_widget_label_add(evas, _("Vertical"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"),
+   			    0.0, 1.0, 0.01, 0,
+   			    &(cfdata->rel_y), NULL, 200);
+   e_widget_framelist_object_append(of, ob);
    
-   of = e_widget_framelist_add(evas, _("Scroll Settings"), 0);
-   ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
+   ob = e_widget_label_add(evas, _("Horizontal"));
+   e_widget_framelist_object_append(of, ob);
+   ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"),
+   			    0.0, 1.0, 0.01, 0,
+   			    &(cfdata->rel_x), NULL, 200);
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
-   e_widget_toolbook_page_append(otb, NULL, _("General Settings"), o, 0, 0, 0, 0, 0.5, 0.0);
-   e_widget_toolbook_page_show(otb, 0);
+   /* of = e_widget_framelist_add(evas, _("Scroll Settings"), 0);
+    * ob = e_widget_check_add(evas, _("Scroll Animate"),
+    * 			   &(cfdata->scroll_animate));
+    * e_widget_framelist_object_append(of, ob);
+    * e_widget_list_object_append(o, of, 1, 1, 0.5); */
+
+   e_widget_toolbook_page_append(otb, NULL, _("Position / Size"),
+				 o, 1, 0, 1, 0, 0.5, 0.0);
 
-   of = e_widget_framelist_add(evas, _("Available Plugins"), 0);
+   ob = e_widget_list_add(evas, 1, 1);
+   of = e_widget_framelist_add(evas, _("Active Plugins"), 0);
    o = e_widget_ilist_add(evas, 24, 24, NULL);
-   cfdata->l_avail = o;
-   /* e_widget_ilist_multi_select_set(ol, 1); */
+   cfdata->l_subject = o;
    /* e_widget_on_change_hook_set(ol, _avail_list_cb_change, cfdata); */
-   _fill_list(o, 0);
+   _fill_list(cfdata->p_subject, o, 0);
+   e_widget_framelist_object_append(of, o);
+   o = e_widget_button_add(evas, _("Move Up"), NULL,
+			   _plugin_move_up_cb,
+			   cfdata->l_subject,
+			   cfdata->p_subject);
    e_widget_framelist_object_append(of, o);
-   o = e_widget_button_add(evas, _("Move Up"), NULL, _plugin_move_up_cb, cfdata, NULL);
+   o = e_widget_button_add(evas, _("Move Down"), NULL,
+			   _plugin_move_down_cb,
+			   cfdata->l_subject,
+			   cfdata->p_subject);
    e_widget_framelist_object_append(of, o);
-   o = e_widget_button_add(evas, _("Move Down"), NULL, _plugin_move_down_cb, cfdata, NULL);
+   e_widget_list_object_append(ob, of, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("Subject Plugins"),
+				 of, 1, 0, 1, 0, 0.5, 0.0);
+
+
+   ob = e_widget_list_add(evas, 1, 1);
+   of = e_widget_framelist_add(evas, _("Active Plugins"), 0);
+   o = e_widget_ilist_add(evas, 24, 24, NULL);
+   cfdata->l_action = o;
+   _fill_list(cfdata->p_action, o, 0);
    e_widget_framelist_object_append(of, o);
+   o = e_widget_button_add(evas, _("Move Up"), NULL,
+			   _plugin_move_up_cb,
+			   cfdata->l_action,
+			   cfdata->p_action);
+   e_widget_framelist_object_append(of, o);
+   o = e_widget_button_add(evas, _("Move Down"), NULL,
+			   _plugin_move_down_cb,
+			   cfdata->l_action,
+			   cfdata->p_action);
+   e_widget_framelist_object_append(of, o);
+   e_widget_list_object_append(ob, of, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("Action Plugins"),
+				 of, 1, 0, 1, 0, 0.5, 0.0);
+
+   ob = e_widget_list_add(evas, 1, 1);
+   of = e_widget_framelist_add(evas, _("Active Plugins"), 0);
+   o = e_widget_ilist_add(evas, 24, 24, NULL);
+   cfdata->l_object = o;
+   _fill_list(cfdata->p_object, o, 0);
+   e_widget_framelist_object_append(of, o);
+   o = e_widget_button_add(evas, _("Move Up"), NULL,
+			   _plugin_move_up_cb,
+			   cfdata->l_object,
+			   cfdata->p_object);
+   e_widget_framelist_object_append(of, o);
+   o = e_widget_button_add(evas, _("Move Down"), NULL,
+			   _plugin_move_down_cb,
+			   cfdata->l_object,
+			   cfdata->p_object);
+   e_widget_framelist_object_append(of, o);
+   e_widget_list_object_append(ob, of, 1, 1, 0.5);
+
+   e_widget_toolbook_page_append(otb, NULL, _("Object Plugins"),
+				 ob, 1, 0, 1, 0, 0.5, 0.0);
+
+   e_widget_toolbook_page_show(otb, 0);
+
+   /* e_widget_size_min_set(otb, 350, 350); */
+   e_widget_size_min_resize(otb);
 
-   e_widget_toolbook_page_append(otb, NULL, _("Plugins"), of, 0, 0, 0, 0, 0.5, 0.0);
+   e_dialog_resizable_set(cfd->dia, 1);
    
    return otb;
 }
diff --git a/src/modules/everything/evry_history.c b/src/modules/everything/evry_history.c
new file mode 100644
index 0000000..787572f
--- /dev/null
+++ b/src/modules/everything/evry_history.c
@@ -0,0 +1,319 @@
+#include "e_mod_main.h"
+
+#define HISTORY_VERSION 8
+
+#define SEVEN_DAYS 604800
+
+#define TIME_FACTOR(_now) (1.0 - (evry_hist->begin / _now)) / 1000000000000000.0
+
+typedef struct _Cleanup_Data Cleanup_Data;
+
+struct _Cleanup_Data
+{
+  double time;
+  Eina_List *keys;
+  Eina_Bool normalize;
+  const char *plugin;
+};
+
+static E_Config_DD *hist_entry_edd = NULL;
+static E_Config_DD *hist_item_edd = NULL;
+static E_Config_DD *hist_edd = NULL;
+
+History *evry_hist = NULL;
+
+void
+evry_history_init(void)
+{
+#undef T
+#undef D
+   hist_item_edd = E_CONFIG_DD_NEW("History_Item", History_Item);
+#define T History_Item
+#define D hist_item_edd
+   E_CONFIG_VAL(D, T, plugin,    STR);
+   E_CONFIG_VAL(D, T, context,   STR);
+   E_CONFIG_VAL(D, T, input,     STR);
+   E_CONFIG_VAL(D, T, last_used, DOUBLE);
+   E_CONFIG_VAL(D, T, usage,     DOUBLE);
+   E_CONFIG_VAL(D, T, count,     INT);
+   E_CONFIG_VAL(D, T, transient, INT);
+#undef T
+#undef D
+   hist_entry_edd = E_CONFIG_DD_NEW("History_Entry", History_Entry);
+#define T History_Entry
+#define D hist_entry_edd
+   E_CONFIG_LIST(D, T, items, hist_item_edd);
+#undef T
+#undef D
+   hist_edd = E_CONFIG_DD_NEW("History", History);
+#define T History
+#define D hist_edd
+   E_CONFIG_VAL(D, T,  version,  INT);
+   E_CONFIG_VAL(D, T,  begin,    DOUBLE);
+   E_CONFIG_HASH(D, T, subjects, hist_entry_edd);
+   E_CONFIG_HASH(D, T, actions,  hist_entry_edd);
+#undef T
+#undef D
+}
+
+static Eina_Bool
+_hist_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+{
+   History_Entry *he = data;
+   History_Item *hi;
+
+   EINA_LIST_FREE(he->items, hi)
+     {
+	if (hi->input)
+	  eina_stringshare_del(hi->input);
+	if (hi->plugin)
+	  eina_stringshare_del(hi->plugin);
+	if (hi->context)
+	  eina_stringshare_del(hi->context);
+	E_FREE(hi);
+     }
+
+   E_FREE(he);
+   return 1;
+}
+
+static Eina_Bool
+_hist_cleanup_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+{
+   History_Entry *he = data;
+   Cleanup_Data *d = fdata;
+   History_Item *hi;
+   Eina_List *l, *ll;
+
+   EINA_LIST_FOREACH_SAFE(he->items, l, ll, hi)
+     {
+	/* item for this plugi nneed to be removed, e.g. on updates */
+	if (d->plugin)
+	  {
+	     if (hi->plugin == d->plugin)
+	       hi->transient = 1;
+	  }
+
+	if (hi->last_used < d->time - SEVEN_DAYS)
+	  {
+	     hi->count--;
+	     hi->last_used = d->time - SEVEN_DAYS/2;
+	  }
+	
+	/* item is transient or too old */
+	if (!hi->count || hi->transient)
+	  {
+	     if (hi->input)
+	       eina_stringshare_del(hi->input);
+	     if (hi->plugin)
+	       eina_stringshare_del(hi->plugin);
+	     if (hi->context)
+	       eina_stringshare_del(hi->context);
+	     E_FREE(hi);
+
+	     he->items = eina_list_remove_list(he->items, l);
+	  }
+     }
+
+   if (!he->items)
+     {
+	E_FREE(he);
+	d->keys = eina_list_append(d->keys, key);
+     }
+
+   return 1;
+}
+
+void
+evry_history_free(void)
+{
+   Cleanup_Data *d;
+   char *key;
+
+   evry_hist = e_config_domain_load("module.everything.history", hist_edd);
+   if (evry_hist)
+     {
+	d = E_NEW(Cleanup_Data, 1);
+	d->time = ecore_time_get();
+
+	if (evry_hist->subjects)
+	  {
+	     eina_hash_foreach(evry_hist->subjects, _hist_cleanup_cb, d);
+	     EINA_LIST_FREE(d->keys, key)
+	       eina_hash_del_by_key(evry_hist->subjects, key);
+	  }
+
+	if (evry_hist->actions)
+	  {
+	     eina_hash_foreach(evry_hist->actions, _hist_cleanup_cb, d);
+	     EINA_LIST_FREE(d->keys, key)
+	       eina_hash_del_by_key(evry_hist->actions, key);
+	  }
+
+	E_FREE(d);
+	evry_history_unload();
+     }
+
+   E_CONFIG_DD_FREE(hist_item_edd);
+   E_CONFIG_DD_FREE(hist_entry_edd);
+   E_CONFIG_DD_FREE(hist_edd);
+}
+
+EAPI void
+evry_history_load(void)
+{
+   evry_hist = e_config_domain_load("module.everything.history", hist_edd);
+     
+   if (evry_hist && evry_hist->version != HISTORY_VERSION)
+     {
+	eina_hash_foreach(evry_hist->subjects, _hist_free_cb, NULL);
+	eina_hash_foreach(evry_hist->actions,  _hist_free_cb, NULL);
+	eina_hash_free(evry_hist->subjects);
+	eina_hash_free(evry_hist->actions);
+
+	E_FREE(evry_hist);
+	evry_hist = NULL;
+     }
+
+   if (!evry_hist)
+     {
+	evry_hist = E_NEW(History, 1);
+	evry_hist->version = HISTORY_VERSION;
+	evry_hist->begin = ecore_time_get();
+     }
+   if (!evry_hist->subjects)
+     evry_hist->subjects = eina_hash_string_superfast_new(NULL);
+   if (!evry_hist->actions)
+     evry_hist->actions  = eina_hash_string_superfast_new(NULL);
+}
+
+
+EAPI void
+evry_history_unload(void)
+{
+   if (!evry_hist) return;
+
+   e_config_domain_save("module.everything.history", hist_edd, evry_hist);
+
+   eina_hash_foreach(evry_hist->subjects, _hist_free_cb, NULL);
+   eina_hash_foreach(evry_hist->actions,  _hist_free_cb, NULL);
+
+   E_FREE(evry_hist);
+   evry_hist = NULL;
+}
+
+EAPI void
+evry_history_add(Eina_Hash *hist, Evry_State *s, const char *ctxt)
+{
+   History_Entry *he;
+   History_Item  *hi = NULL;
+   Evry_Item *it;
+   Eina_List *l;
+   const char *id;
+   
+   if (!s) return;
+
+   it = s->cur_item;
+   if (!it) return;
+
+   id = (it->id ? it->id : it->label);
+   
+   he = eina_hash_find(hist, id);
+   if (!he)
+     {
+	he = E_NEW(History_Entry, 1);
+	eina_hash_add(hist, id, he);
+     }
+   else
+     {
+	EINA_LIST_FOREACH(he->items, l, hi)
+	  if ((hi->plugin == it->plugin->name) &&
+	      (ctxt == hi->context))
+	    break;
+     }
+
+   if (!hi)
+     {
+	hi = E_NEW(History_Item, 1);
+	hi->plugin = eina_stringshare_ref(it->plugin->name);
+	he->items = eina_list_append(he->items, hi);
+     }
+
+   if (hi)
+     {
+	hi->last_used = ecore_time_get();
+	hi->usage /= 4.0;
+	hi->usage += TIME_FACTOR(hi->last_used);
+	hi->transient = it->transient;
+	hi->count += (hi->transient ? 2:1);
+	if (ctxt && !hi->context)
+	  hi->context = eina_stringshare_ref(ctxt);
+	
+	if (s->input)
+	  {
+	     if (hi->input)
+	       eina_stringshare_del(hi->input);
+
+	     hi->input = eina_stringshare_add(s->input);
+	  }
+     }   
+}
+
+int
+evry_history_item_usage_set(Eina_Hash *hist, Evry_Item *it, const char *input, const char *ctxt)
+{
+   History_Entry *he;
+   History_Item *hi;
+   Eina_List *l;
+
+   it->usage = 0.0;
+   
+   if (!(he = eina_hash_find(hist, (it->id ? it->id : it->label))))
+     return 0;
+   
+   EINA_LIST_FOREACH(he->items, l, hi)
+     {
+	if (hi->plugin != it->plugin->name)
+	  continue;
+	if (evry_conf->history_sort_mode == 0)
+	  {
+	     
+	if (!input || !hi->input)
+	  {
+	     it->usage += hi->usage * hi->count;
+	  }
+	else
+	  {
+	     /* higher priority for exact matches */
+	     if (!strncmp(input, hi->input, strlen(input)))
+	       {
+		  it->usage += hi->usage * hi->count;
+	       }
+	     if (!strncmp(input, hi->input, strlen(hi->input)))
+	       {
+		  it->usage += hi->usage * hi->count;
+	       }
+	  }
+	if (hi->context && ctxt)
+	  {
+	     if (hi->context == ctxt)
+	       it->usage += hi->usage * hi->count * 2;
+	  }
+	  }
+	else if (evry_conf->history_sort_mode == 1)
+	  {
+	     it->usage = hi->count * (hi->last_used / 10000000000.0);
+	     
+	  }
+	else if (evry_conf->history_sort_mode == 2)
+	  {
+	     it->usage = hi->last_used;
+	  }
+     }
+   
+   if (it->usage > 0.0)
+     return 1;
+
+   return 0;
+}
+
diff --git a/src/modules/everything/evry_plug_actions.c b/src/modules/everything/evry_plug_actions.c
new file mode 100644
index 0000000..5b96d99
--- /dev/null
+++ b/src/modules/everything/evry_plug_actions.c
@@ -0,0 +1,144 @@
+#include "e_mod_main.h"
+
+/* action selector plugin: provides list of actions registered for
+   candidate types provided by current plugin */
+
+
+static void
+_cleanup(Evry_Plugin *p)
+{
+   Evry_Action *act;
+   Evry_Selector *sel = selectors[1];
+
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
+   EINA_LIST_FREE(sel->actions, act)
+     if (act->cleanup) act->cleanup(act);
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *p, const Evry_Item *it)
+{
+   Evry_Action *act;
+   Eina_List *l;
+   Evry_Selector *sel = selectors[1];
+
+   _cleanup(p);
+
+   if (!it) return NULL;
+
+   const char *type = it->plugin->type_out;
+
+   if (!type) return NULL;
+
+   EINA_LIST_FOREACH(evry_conf->actions, l, act)
+     {
+	if (act->type_in1 && (act->type_in1 == type) &&
+	    (!act->check_item || act->check_item(act, it)))
+	  {
+	     act->item1 = it;
+
+	     if (act->type_out && act->intercept && !(act->intercept(act)))
+	       continue;;
+
+	     sel->actions = eina_list_append(sel->actions, act);
+	  }
+     }
+
+   if (!sel->actions) return NULL;
+
+   return p;
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->fuzzy_match || it2->fuzzy_match)
+     {
+	if (it1->fuzzy_match && !it2->fuzzy_match)
+	  return -1;
+
+	if (!it1->fuzzy_match && it2->fuzzy_match)
+	  return 1;
+
+	if (it1->fuzzy_match - it2->fuzzy_match)
+	  return (it1->fuzzy_match - it2->fuzzy_match);
+     }
+
+   if (it1->priority - it2->priority)
+     return (it1->priority - it2->priority);
+
+   return 0;
+}
+
+static int
+_fetch(Evry_Plugin *p, const char *input)
+{
+   Evry_Action *act;
+   Eina_List *l;
+   Evry_Item *it;
+   Evry_Selector *sel = selectors[1];
+   int match = 0;
+
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
+   EINA_LIST_FOREACH(sel->actions, l, act)
+     {
+	if (input)
+	  match = evry_fuzzy_match(act->name, input);
+
+	if (!input || match)
+	  {
+	     it = evry_item_new(NULL, p, act->name, NULL);
+	     it->fuzzy_match = match;
+	     it->data = act;
+	     it->priority = act->priority;
+	     EVRY_PLUGIN_ITEM_APPEND(p, it);
+	  }
+     }
+
+   if (!p->items) return 0;
+   
+   if (input)
+     EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+
+   return 1;
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   Evas_Object *o = NULL;
+   Evry_Action *act = it->data;
+
+   if (!act) return NULL;
+
+   if (act->icon_get)
+     o = act->icon_get(act, e);
+   else if (act->icon)
+     o = evry_icon_theme_get(act->icon, e);
+
+   return o;
+}
+
+Evry_Plugin *
+evry_plug_actions_new(void)
+{
+   Evry_Plugin *p;
+
+   p = evry_plugin_new(NULL, "Select Action", type_action, "", "", 0, NULL, NULL,
+		       _begin, _cleanup, _fetch, NULL, _icon_get, NULL, NULL);
+
+   evry_plugin_register(p, 2);
+
+   return p;
+}
+
+void
+evry_plug_actions_free(Evry_Plugin *plugin)
+{
+   evry_plugin_free(plugin, 1);
+}
diff --git a/src/modules/everything/evry_plug_aggregator.c b/src/modules/everything/evry_plug_aggregator.c
new file mode 100644
index 0000000..5858680
--- /dev/null
+++ b/src/modules/everything/evry_plug_aggregator.c
@@ -0,0 +1,259 @@
+#include "e_mod_main.h"
+
+
+typedef struct _Plugin Plugin;
+
+struct _Plugin
+{
+  Evry_Plugin base;
+  Evry_Selector *selector;
+};
+
+static int
+_cb_sort_recent(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->usage && it2->usage)
+     return (it1->usage > it2->usage ? -1 : 1);
+   if (it1->usage && !it2->usage)
+     return -1;
+   if (it2->usage && !it1->usage)
+     return 1;
+
+   if ((it1->plugin == action_selector) ||
+       (it2->plugin == action_selector))
+     {
+	if ((it1->plugin == action_selector) &&
+	    (it2->plugin == action_selector))
+	  return (it1->priority - it2->priority);
+	else if (it1->plugin == action_selector)
+	  return ((it1->plugin->config->priority + it1->priority)
+		  - it2->plugin->config->priority);
+	else
+	  return (it1->plugin->config->priority -
+		  (it2->plugin->config->priority + it2->priority));
+     }
+
+  return -1;
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->usage && it2->usage)
+     return (it1->usage > it2->usage ? -1 : 1);
+   if (it1->usage && !it2->usage)
+     return -1;
+   if (it2->usage && !it1->usage)
+     return 1;
+
+   if ((it1->plugin == action_selector) ||
+       (it2->plugin == action_selector))
+     {
+	if ((it1->plugin == action_selector) &&
+	    (it2->plugin == action_selector))
+	  return (it1->priority - it2->priority);
+	else if (it1->plugin == action_selector)
+	  return ((it1->plugin->config->priority + it1->priority)
+		  - it2->plugin->config->priority);
+	else
+	  return (it1->plugin->config->priority -
+		  (it1->plugin->config->priority + it2->priority));
+     }
+
+   if ((it1->plugin == it2->plugin) &&
+       (it1->priority - it2->priority))
+     return (it1->priority - it2->priority);
+
+   if (it1->fuzzy_match || it2->fuzzy_match)
+     {
+	if (it1->fuzzy_match && !it2->fuzzy_match)
+	  return -1;
+
+	if (!it1->fuzzy_match && it2->fuzzy_match)
+	  return 1;
+
+	if (it1->fuzzy_match - it2->fuzzy_match)
+	  return (it1->fuzzy_match - it2->fuzzy_match);
+     }
+
+   if (it1->plugin->config->priority - it2->plugin->config->priority)
+     return (it1->plugin->config->priority - it2->plugin->config->priority);
+
+   if (it1->priority - it2->priority)
+     return (it1->priority - it2->priority);
+
+   return strcasecmp(it1->label, it2->label);
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   Plugin *p = (Plugin *) plugin;
+   Evry_Plugin *pp;
+   Evry_State *s;
+   Eina_List *l, *ll, *lp;
+   Evry_Item *it;
+   int i, cnt = 0;
+   Eina_List *items = NULL;
+   const char *context = NULL;
+   
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
+   s = p->selector->state;
+
+   if (!s || !s->cur_plugins || !s->cur_plugins->next)
+     return 0;
+
+   for (i = 1; i < 3; i++)
+     {
+	Evry_Item *item;
+	if (p->selector == selectors[i])
+	  {
+	     item = selectors[i-1]->state->cur_item;
+	     context = item->context;
+	  }	
+     }
+
+   /* first is aggregator itself */
+   lp = s->cur_plugins->next;
+
+   if (input)
+     {
+	EINA_LIST_FOREACH(lp, l, pp)
+	  {
+	     EINA_LIST_FOREACH(pp->items, ll, it)
+	       {
+		  if (!it->fuzzy_match)
+		    it->fuzzy_match = evry_fuzzy_match(it->label, input);
+
+		  if (it->fuzzy_match || p->selector == selectors[2])
+		    {
+		       evry_item_ref(it);
+		       items = eina_list_append(items, it);
+		       EVRY_PLUGIN_ITEM_APPEND(p, it);
+		    }
+	       }
+	  }
+     }
+
+   /* always append items of action or object selector */
+   if ((!input) &&
+       ((p->selector == selectors[1]) ||
+	(p->selector == selectors[2])))
+     {
+   	EINA_LIST_FOREACH(lp, l, pp)
+   	  {
+  	     for (cnt = 0, ll = pp->items; ll && cnt < 50; ll = ll->next, cnt++)
+   	       {
+   		  if (!eina_list_data_find_list(items, ll->data))
+   		    {
+   		       it = ll->data;
+   		       evry_item_ref(it);
+   		       it->fuzzy_match = 0;
+		       items = eina_list_append(items, it);
+   		       EVRY_PLUGIN_ITEM_APPEND(p, it);
+   		    }
+   	       }
+   	  }
+     }
+
+   EINA_LIST_FOREACH(lp, l, pp)
+     {
+	EINA_LIST_FOREACH(pp->items, ll, it)
+	  {
+	     if (evry_history_item_usage_set(p->selector->history, it, input, context) &&
+		 (!eina_list_data_find_list(items, it)))
+	       {
+		  evry_item_ref(it);
+		  items = eina_list_append(items, it);
+		  EVRY_PLUGIN_ITEM_APPEND(p, it);
+		  continue;
+	       }
+	  }
+     }
+
+   if (lp && ((eina_list_count(lp) == 2) || (!EVRY_PLUGIN(p)->items)))
+     {
+	pp = lp->data;
+	EINA_LIST_FOREACH(pp->items, l, it)
+	  {
+	     if (!eina_list_data_find_list(items, it))
+	       {
+		  evry_item_ref(it);
+		  it->fuzzy_match = 0;
+		  EVRY_PLUGIN_ITEM_APPEND(p, it);
+	       }
+	  }
+     }
+
+   if (items) eina_list_free(items);
+
+   if (input)
+     {
+	EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+     }
+   else
+     {
+	EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort_recent);
+     }
+
+   return 1;
+}
+
+static int
+_action(Evry_Plugin *plugin, const Evry_Item *it)
+{
+   if (it->plugin && it->plugin->action)
+     return it->plugin->action(it->plugin, it);
+
+   return 0;
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   EVRY_PLUGIN_ITEMS_FREE(plugin);
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *plugin, const Evry_Item *it, Evas *e)
+{
+   if (it->plugin && it->plugin->icon_get)
+     return it->plugin->icon_get(it->plugin, it, e);
+
+   return NULL;
+}
+
+Evry_Plugin *
+evry_plug_aggregator_new(Evry_Selector *selector)
+{
+   Plugin *p;
+   Plugin_Config *pc;
+
+   p = E_NEW(Plugin, 1);
+   evry_plugin_new(EVRY_PLUGIN(p), "All", 0, "", "", 0, NULL, NULL,
+		   NULL, _cleanup, _fetch, _action, _icon_get,
+		   NULL, NULL);
+
+   pc = E_NEW(Plugin_Config, 1);
+   pc->enabled = 1;
+   pc->priority = -1;
+   EVRY_PLUGIN(p)->config = pc;
+
+   p->selector = selector;
+
+   return EVRY_PLUGIN(p);
+}
+
+void
+evry_plug_aggregator_free(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+   EVRY_PLUGIN_FREE(p);
+}
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
deleted file mode 100644
index 64b581a..0000000
--- a/src/modules/everything/evry_plug_apps.c
+++ /dev/null
@@ -1,662 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-typedef struct _Inst Inst;
-
-struct _Inst
-{
-  Eina_Hash *added;
-  Eina_List *apps;
-  Evry_Item *candidate;
-};
-
-static int  _begin(Evry_Plugin *p, Evry_Item *item);
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_add(Evry_Plugin *p, Efreet_Desktop *desktop, char *file, int prio);
-static int  _cb_sort(const void *data1, const void *data2);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static int _exec_app_action(Evry_Action *act);
-static int _exec_app_check_item(Evry_Action *act, Evry_Item *it);
-static int _edit_app_action(Evry_Action *act);
-static int _edit_app_check_item(Evry_Action *act, Evry_Item *it);
-static int _new_app_action(Evry_Action *act);
-static int _new_app_check_item(Evry_Action *act, Evry_Item *it);
-
-static Evry_Plugin *p1;
-static Evry_Plugin *p2;
-static Evry_Action *act;
-static Evry_Action *act2;
-static Evry_Action *act3;
-static Inst *inst;
-
-
-EAPI int
-evry_plug_apps_init(void)
-{
-   p1 = E_NEW(Evry_Plugin, 1);
-   p1->name = "Applications";
-   p1->type_in  = "NONE";
-   p1->type_out = "APPLICATION";
-   p1->need_query = 0;
-   p1->begin = &_begin;
-   p1->fetch = &_fetch;
-   p1->action = &_action;
-   p1->cleanup = &_cleanup;
-   p1->icon_get = &_item_icon_get;
-   evry_plugin_register(p1);
-
-   p2 = E_NEW(Evry_Plugin, 1);
-   p2->name = "Open With...";
-   p2->type_in  = "FILE";
-   p2->type_out = "NONE";
-   p2->need_query = 0;
-   p2->begin = &_begin;
-   p2->fetch = &_fetch;
-   p2->action = &_action;
-   p2->cleanup = &_cleanup;
-   p2->icon_get = &_item_icon_get;
-   evry_plugin_register(p2);
-
-   act = E_NEW(Evry_Action, 1);
-   act->name = "Open File...";
-   act->type_in1 = "APPLICATION";
-   act->type_in2 = "FILE";
-   act->type_out = "NONE";
-   act->action = &_exec_app_action;
-   act->check_item = &_exec_app_check_item;
-   evry_action_register(act);
-
-   act2 = E_NEW(Evry_Action, 1);
-   act2->name = "Edit Application Entry";
-   act2->type_in1 = "APPLICATION";
-   act2->type_in2 = "NONE";
-   act2->type_out = "NONE";
-   act2->action = &_edit_app_action;
-   act2->check_item = &_edit_app_check_item;
-   evry_action_register(act2);
-
-   act3 = E_NEW(Evry_Action, 1);
-   act3->name = "New Application Entry";
-   act3->type_in1 = "APPLICATION";
-   act3->type_in2 = "NONE";
-   act3->type_out = "NONE";
-   act3->action = &_new_app_action;
-   act3->check_item = &_new_app_check_item;
-   evry_action_register(act3);
-
-   inst = NULL;
-
-   return 1;
-}
-
-EAPI int
-evry_plug_apps_shutdown(void)
-{
-   evry_plugin_unregister(p1);
-   evry_plugin_unregister(p2);
-   evry_action_unregister(act);
-   evry_action_unregister(act2);
-   evry_action_unregister(act3);
-
-   return 1;
-}
-
-static int
-_begin(Evry_Plugin *p __UNUSED__, Evry_Item *it)
-{
-   const char *mime;
-
-   if (inst) return 0;
-
-   if (it)
-     {
-	if (!it->uri) return 0;
-
-	if (!it->mime)
-	  mime = efreet_mime_type_get(it->uri);
-	else
-	  mime = it->mime;
-
-	if (!mime) return 0;
-
-	inst = E_NEW(Inst, 1);
-	inst->candidate = it;
-
-	inst->apps = efreet_util_desktop_mime_list(mime);
-
-	if (!inst->apps)
-	  {
-	     Efreet_Desktop *desktop;
-	     desktop = e_exehist_mime_desktop_get(mime);
-	     if (desktop)
-	       inst->apps = eina_list_append(inst->apps, desktop);
-	  }
-     }
-   else
-     {
-	inst = E_NEW(Inst, 1);
-     }
-
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input)
-{
-   E_Zone *zone;
-   Evry_App *app = NULL;
-   Efreet_Desktop *desktop = NULL;
-   Eina_List *files = NULL;
-
-   if (it) app = it->data[0];
-
-   if (app && app->desktop)
-     {
-	desktop = app->desktop;
-     }
-   else
-     {
-	if (app && app->file)
-	  input = app->file;
-
-	if (!input || strlen(input) < 1) return EVRY_ACTION_CONTINUE;
-	
-	desktop = efreet_desktop_empty_new("");
-	if (strchr(input, '%'))
-	  {
-	     desktop->exec = strdup(input);
-	  }
-	else
-	  {
-	     int len = strlen(input) + 4;
-	     desktop->exec = malloc(len);
-	     if (desktop->exec)
-	       snprintf(desktop->exec, len, "%s %%U", input);
-	  }
-     }
-
-   if (desktop)
-     {
-	if (inst && inst->candidate)
-	  files = eina_list_append(files, inst->candidate->uri);
-
-	zone = e_util_zone_current_get(e_manager_current_get());
-
-	e_exec(zone, desktop, NULL, files, "everything");
-
-	if (inst && inst->candidate && inst->candidate->mime)
-	  e_exehist_mime_desktop_add(inst->candidate->mime, desktop);
-	
-	if (!it)
-	  efreet_desktop_free(desktop);
-
-	eina_list_free(files);
-
-	return EVRY_ACTION_FINISHED;
-     }
-
-   return EVRY_ACTION_CONTINUE;
-}
-
-static void
-_list_free(Evry_Plugin *p)
-{
-   Evry_Item *it;
-   Evry_App *app;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->label) eina_stringshare_del(it->label);
-	app = it->data[0];
-	E_FREE(app);
-	E_FREE(it);
-     }
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   _list_free(p);
-
-   if (inst)
-     {
-	eina_list_free(inst->apps);
-	E_FREE(inst);
-     }
-
-   inst = NULL;
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   Eina_List *l;
-   Efreet_Desktop *desktop;
-   char *file;
-   char match1[4096];
-   char match2[4096];
-   Evry_Item *it;
-   Evry_App *app;
-   
-   _list_free(p);
-
-   if (inst && inst->apps)
-     {
-	if (!input)
-	  {
-	     EINA_LIST_FOREACH(inst->apps, l, desktop)
-	       _item_add(p, desktop, NULL, 1);
-	  }
-	else
-	  {
-	     snprintf(match1, sizeof(match1), "%s*", input);
-	     snprintf(match2, sizeof(match2), "*%s*", input);
-
-	     EINA_LIST_FOREACH(inst->apps, l, desktop)
-	       {
-		  if (e_util_glob_case_match(desktop->exec, match1))
-		    _item_add(p, desktop, NULL, 1);
-		  else if (e_util_glob_case_match(desktop->exec, match2))
-		    _item_add(p, desktop, NULL, 2);
-		  else if (e_util_glob_case_match(desktop->name, match1))
-		    _item_add(p, desktop, NULL, 1);
-		  else if (e_util_glob_case_match(desktop->name, match2))
-		    _item_add(p, desktop, NULL, 2);
-		  else if (desktop->comment)
-		    {
-		       if (e_util_glob_case_match(desktop->comment, match1))
-			 _item_add(p, desktop, NULL, 3);
-		       else if (e_util_glob_case_match(desktop->comment, match2))
-			 _item_add(p, desktop, NULL, 4);
-		    }
-	       }
-	  }
-     }
-
-
-   if (!p->items && input)
-     {
-	snprintf(match1, sizeof(match1), "%s*", input);
-	l = efreet_util_desktop_exec_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 1);
-
-	l = efreet_util_desktop_name_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 3);
-
-	snprintf(match1, sizeof(match1), "*%s*", input);
-	l = efreet_util_desktop_exec_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 2);
-
-	l = efreet_util_desktop_name_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 4);
-
-	// TODO make these optional/configurable
-	l = efreet_util_desktop_generic_name_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 5);
-
-	l = efreet_util_desktop_comment_glob_list(match1);
-	EINA_LIST_FREE(l, desktop)
-	  _item_add(p, desktop, NULL, 5);
-     }
-   else if (!p->items)
-     {
-   	// TODO option for popular/recent
-   	l = e_exehist_list_get();
-   	EINA_LIST_FREE(l, file)
-   	  _item_add(p, NULL, file, 1);
-     }
-
-   if (inst->added)
-     {
-	eina_hash_free(inst->added);
-	inst->added = NULL;
-     }
-
-   it = E_NEW(Evry_Item, 1);
-   app = E_NEW(Evry_App, 1);
-   app->file = eina_stringshare_add(input);
-   app->desktop = NULL;
-   it->data[0] = app;
-   it->priority = 100;
-   it->label = eina_stringshare_add("Run Command");
-   p->items = eina_list_append(p->items, it);
-
-     if (p->items)
-     {
-	p->items = eina_list_sort(p->items, eina_list_count(p->items), _cb_sort);
-	return 1;
-     }
-
-   return 0;
-}
-
-static void
-_item_add(Evry_Plugin *p, Efreet_Desktop *desktop, char *file, int prio)
-{
-   Evry_Item *it;
-   Evry_App *app;
-   Efreet_Desktop *desktop2;
-
-   if (desktop)
-     {
-	Eina_List *l;
-	char *cat;
-
-	/* ignore screensaver.. */
-	EINA_LIST_FOREACH(desktop->categories, l, cat)
-	  if (cat && !strcmp(cat, "Screensaver"))
-	    return;
-
-	file = desktop->exec;
-     }
-
-   if (!file) return;
-
-   if (!inst->added)
-     inst->added = eina_hash_string_superfast_new(NULL);
-
-
-   if (!desktop)
-   {
-      char match[4096];
-      Eina_List *l;
-      int len;
-      char *tmp;
-      int found = 0;
-
-      if (eina_hash_find(inst->added, file))
-	return;
-
-      len = strlen(file);
-      tmp = ecore_file_app_exe_get(file);
-      snprintf(match, sizeof(match), "%s*", tmp);
-      l = efreet_util_desktop_exec_glob_list(match);
-
-      EINA_LIST_FREE(l, desktop)
-      	{
-      	   if (desktop->exec && !strncmp(file, desktop->exec, len))
-      	     {
-      		found = 1;
-      		break;
-      	     }
-      	}
-      
-      eina_list_free(l);
-      free(tmp);
-
-      /* desktop = efreet_desktop_get(file); */
-      /* if (!desktop || !desktop->exec) */
-      if (!found)
-	eina_hash_add(inst->added, file, file);
-   }
-
-   if (desktop)
-     {
-	if ((desktop2 = eina_hash_find(inst->added, file)))
-	  if (desktop == desktop2)
-	    return;
-
-	eina_hash_add(inst->added, file, desktop);
-	file = NULL;
-     }
-
-   it = E_NEW(Evry_Item, 1);
-   app = E_NEW(Evry_App, 1);
-   app->desktop = desktop;
-   app->file = file;
-   it->data[0] = app;
-   it->priority = prio;
-   if (desktop)
-     it->label = eina_stringshare_add(desktop->name);
-   else
-     it->label = eina_stringshare_add(file);
-   it->o_icon = NULL;
-
-   p->items = eina_list_append(p->items, it);
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   Evry_App *app = it->data[0];
-
-   if (app->desktop)
-     it->o_icon = e_util_desktop_icon_add(app->desktop, 24, e);
-
-   if (!it->o_icon)
-     {
-	it->o_icon = edje_object_add(e);
-	/* e_util_icon_theme_set(it->o_icon, "system-run") */
-	e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/system-run");
-     }
-}
-
-static int
-_cb_sort(const void *data1, const void *data2)
-{
-   const Evry_Item *it1, *it2;
-   Evry_App *app1, *app2;
-   const char *e1, *e2;
-   double t1, t2;
-
-   it1 = data1;
-   it2 = data2;
-   app1 = it1->data[0];
-   app2 = it2->data[0];
-
-   if (app1->desktop)
-     e1 = app1->desktop->exec;
-     /* //e1 = efreet_util_path_to_file_id(app1->desktop->orig_path);
-      * e1 = app1->desktop->orig_path; */
-   else
-     e1 = app1->file;
-
-   if (app2->desktop)
-     e2 = app2->desktop->exec;
-     /* //e2 = efreet_util_path_to_file_id(app2->desktop->orig_path);
-      * e2 = app2->desktop->orig_path; */
-   else
-     e2 = app2->file;
-
-   t1 = e_exehist_newest_run_get(e1);
-   t2 = e_exehist_newest_run_get(e2);
-
-   if ((int)(t2 - t1))
-     return (int)(t2 - t1);
-   else if (it1->priority - it2->priority)
-     return (it1->priority - it2->priority);
-   // TODO compare exe strings?
-   else return 0;
-}
-
-static int
-_exec_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
-{
-   Evry_App *app = it->data[0];
-   if (app->desktop)
-     return 1;
-
-   if (app->file && strlen(app->file) > 0)
-     return 1;
-     
-   return 0;
-}
-
-
-static int
-_exec_app_action(Evry_Action *act)
-{
-   if (act->thing1 && act->thing2)
-     {
-	E_Zone *zone;
-	Evry_App *app = NULL;
-	Efreet_Desktop *desktop = NULL;
-	Eina_List *files = NULL;
-
-	app = act->thing1->data[0];
-
-	if (app->desktop)
-	  desktop = app->desktop;
-	else
-	  {
-	     desktop = efreet_desktop_empty_new("");
-	     if (strchr(app->file, '%'))
-	       desktop->exec = strdup(app->file);
-	     else
-	       {
-		  int len = strlen(app->file) + 4;
-		  desktop->exec = malloc(len);
-		  if (desktop->exec)
-		    snprintf(desktop->exec, len, "%s %%U", app->file);
-	       }
-	  }
-
-	if (desktop)
-	  {
-	     files = eina_list_append(files, act->thing2->uri);
-
-	     zone = e_util_zone_current_get(e_manager_current_get());
-
-	     e_exec(zone, desktop, NULL, files, "everything");
-
-	     if (act->thing2->mime)
-	       e_exehist_mime_desktop_add(act->thing2->mime, desktop);
-	
-	     if (!app->desktop)
-	       efreet_desktop_free(desktop);
-
-	     eina_list_free(files);
-
-	     return EVRY_ACTION_FINISHED;
-	  }
-
-	return EVRY_ACTION_CONTINUE;
-     }
-
-   return 0;
-}
-
-static int
-_edit_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
-{
-   Evry_App *app = it->data[0];
-   if (app->desktop)
-     return 1;
-
-   return 0;
-}
-
-
-static int
-_edit_app_action(Evry_Action *act)
-{
-   if (act->thing1)
-     {
-	Evry_Item *it = act->thing1;
-	Evry_App *app = it->data[0];
-	
-	Efreet_Desktop *desktop;
-	
-	if (app->desktop)
-	  desktop = app->desktop;
-	else
-	  {
-	     char buf[128];
-	     snprintf(buf, 128, "%s/.local/share/applications/%s.desktop", e_user_homedir_get(), app->file);
-	     
-	     desktop = efreet_desktop_empty_new(eina_stringshare_add(buf));
-	     /* XXX check if this gets freed by efreet*/
-	     desktop->exec = strdup(app->file); 
-	  }
-
-	e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
-	
-	return 1;
-     }
-   
-   return 0;
-}
-
-
-static int
-_new_app_check_item(Evry_Action *act __UNUSED__, Evry_Item *it)
-{
-   Evry_App *app = it->data[0];
-   if (app->desktop)
-     return 1;
-
-   if (app->file && strlen(app->file) > 0)
-     return 1;
-     
-   return 0;
-}
-
-
-static int
-_new_app_action(Evry_Action *act)
-{
-   if (act->thing1)
-     {
-	Evry_Item *it = act->thing1;
-	Evry_App *app = it->data[0];
-	char *name;
-	char buf[4096];
-	char *end;
-	Efreet_Desktop *desktop;
-	int i;
-	
-	if (app->desktop)
-	  name = strdup(app->desktop->name);
-	else
-	  /* TODO replace '/' and remove other special characters */
-	  name = strdup(app->file);
-
-	if ((end = strchr(name, ' ')))
-	  name[end - name] = '\0';
-	
-	for (i = 0; i < 10; i++)
-	  {
-	     snprintf(buf, 4096, "%s/.local/share/applications/%s-%d.desktop", e_user_homedir_get(), name, i);
-	     if (ecore_file_exists(buf))
-	       {
-		  buf[0] = '\0';
-		  continue;
-	       }
-	     else break;
-	  }
-
-	free(name);
-	   
-	if (strlen(buf) == 0)
-	  return 0;
-	
-	if (!app->desktop)
-	  {
-	     desktop = efreet_desktop_empty_new(buf);
-	     desktop->exec = strdup(app->file);
-	  }
-	else 
-	  {
-	     efreet_desktop_save_as(app->desktop, buf);
-	     /*XXX hackish - desktop is removed on save_as..*/
-	     efreet_desktop_new(app->desktop->orig_path);
-	     
-	     desktop = efreet_desktop_new(buf);
-	  }
-	
-	e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
-
-	return 1;
-     }
-   
-   return 0;
-}
-
-
diff --git a/src/modules/everything/evry_plug_border.c b/src/modules/everything/evry_plug_border.c
deleted file mode 100644
index 4091c9b..0000000
--- a/src/modules/everything/evry_plug_border.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_add(Evry_Plugin *p, E_Border *bd, int prio);
-static int  _cb_sort(const void *data1, const void *data2);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-
-static Evry_Plugin *p;
-
-
-EAPI int
-evry_plug_border_init(void)
-{
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Windows";
-   p->type_in  = "NONE";
-   p->type_out = "BORDER";
-   p->need_query = 0;
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->icon_get = &_item_icon_get;
-   evry_plugin_register(p);
-
-   return 1;
-}
-
-EAPI int
-evry_plug_border_shutdown(void)
-{
-   evry_plugin_unregister(p);
-   E_FREE(p);
-
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
-{
-   E_Border *bd;
-   E_Zone *zone;
-
-   if (!it) return EVRY_ACTION_CONTINUE;
-
-   bd = (E_Border *)it->data[0];
-   zone = e_util_zone_current_get(e_manager_current_get());
-
-   if (bd->desk != (e_desk_current_get(zone)))
-     e_desk_show(bd->desk);
-
-   if (bd->shaded)
-     e_border_unshade(bd, E_DIRECTION_UP);
-
-   if (bd->iconic)
-     e_border_uniconify(bd);
-   else
-     e_border_raise(bd);
-
-   /* e_border_focus_set(bd, 1, 1); */
-   e_border_focus_set_with_pointer(bd);
-
-   return EVRY_ACTION_FINISHED;
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   Evry_Item *it;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	/* if (it->data[0]) e_object_unref(E_OBJECT(it->data[0])); */
-	if (it->label) eina_stringshare_del(it->label);
-	E_FREE(it);
-     }
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   E_Manager *man;
-   E_Zone *zone;
-
-   char match1[4096];
-   char match2[4096];
-   E_Border *bd;
-   E_Border_List *bl;
-
-   _cleanup(p);
-
-   man = e_manager_current_get();
-   zone = e_util_zone_current_get(man);
-
-   if (input)
-     {
-	snprintf(match1, sizeof(match1), "%s*", input);
-	snprintf(match2, sizeof(match2), "*%s*", input);
-     }
-
-   bl = e_container_border_list_first(e_container_current_get(man));
-   while ((bd = e_container_border_list_next(bl)))
-     {
-	if (zone == bd->zone)
-	  {
-	     if (!input)
-	       _item_add(p, bd, 1);
-	     else if (bd->client.icccm.name &&
-		      e_util_glob_case_match(bd->client.icccm.name, match1))
-	       _item_add(p, bd, 1);
-	     else  if (e_util_glob_case_match(e_border_name_get(bd), match1))
-	       _item_add(p, bd, 1);
-	     else if (bd->client.icccm.name &&
-		      e_util_glob_case_match(bd->client.icccm.name, match2))
-	       _item_add(p, bd, 2);
-	     else if (e_util_glob_case_match(e_border_name_get(bd), match2))
-	       _item_add(p, bd, 2);
-	  }
-     }
-   e_container_border_list_free(bl);
-
-   if (eina_list_count(p->items) > 0)
-     {
-	p->items = eina_list_sort(p->items, eina_list_count(p->items), _cb_sort);
-	return 1;
-     }
-
-   return 0;
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   it->o_icon = e_border_icon_add(((E_Border *)it->data[0]), e);
-}
-
-static void
-_item_add(Evry_Plugin *p, E_Border *bd, int prio)
-{
-   Evry_Item *it;
-
-   it = E_NEW(Evry_Item, 1);
-   /* e_object_ref(E_OBJECT(bd)); */
-   it->data[0] = bd;
-   it->priority = prio;
-   it->label = eina_stringshare_add(e_border_name_get(bd));
-
-   p->items = eina_list_append(p->items, it);
-}
-
-/* TODO sort by focus history and name? */
-static int
-_cb_sort(const void *data1, const void *data2)
-{
-   const Evry_Item *it1, *it2;
-
-   it1 = data1;
-   it2 = data2;
-
-   return (it1->priority - it2->priority);
-}
-
diff --git a/src/modules/everything/evry_plug_border_act.c b/src/modules/everything/evry_plug_border_act.c
deleted file mode 100644
index d83b600..0000000
--- a/src/modules/everything/evry_plug_border_act.c
+++ /dev/null
@@ -1,147 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-typedef struct _Inst Inst;
-
-struct _Inst
-{
-  E_Border *border;
-};
-
-static int  _begin(Evry_Plugin *p, Evry_Item *item);
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static void _item_add(Evry_Plugin *p, const char *label, void (*action_cb) (E_Border *bd), const char *icon);
-
-static Evry_Plugin *p;
-static Inst *inst;
-
-
-EAPI int
-evry_plug_border_act_init(void)
-{
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Window Action";
-   p->type_in  = "BORDER";
-   p->type_out = "NONE";
-   p->need_query = 0;
-   p->begin = &_begin;
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->icon_get = &_item_icon_get;
-
-   evry_plugin_register(p);
-
-   inst = E_NEW(Inst, 1);
-
-   return 1;
-}
-
-EAPI int
-evry_plug_border_act_shutdown(void)
-{
-   evry_plugin_unregister(p);
-   E_FREE(p);
-   E_FREE(inst);
-
-   return 1;
-}
-
-static void
-_act_cb_border_fullscreen(E_Border *bd)
-{
-   if (!bd->fullscreen)
-     e_border_fullscreen(bd, E_FULLSCREEN_RESIZE);
-   else
-     e_border_unfullscreen(bd);
-}
-
-static void
-_act_cb_border_close(E_Border *bd)
-{
-   if (!bd->lock_close) e_border_act_close_begin(bd);
-}
-
-static void
-_act_cb_border_minimize(E_Border *bd)
-{
-   if (!bd->lock_user_iconify) e_border_iconify(bd);
-}
-
-static int
-_begin(Evry_Plugin *p __UNUSED__, Evry_Item *item)
-{
-   E_Border *bd;
-
-   bd = item->data[0];
-   /* e_object_ref(E_OBJECT(bd)); */
-   inst->border = bd;
-
-   return 1;
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input __UNUSED__)
-{
-   _cleanup(p);
-
-   _item_add(p, _("Iconify"), _act_cb_border_minimize,
-	     "e/widgets/border/default/minimize");
-
-   if (!inst->border->fullscreen)
-     _item_add(p, _("Fullscreen"), _act_cb_border_fullscreen,
-	       "e/widgets/border/default/fullscreen");
-   else
-     _item_add(p, _("Unfullscreen"), _act_cb_border_fullscreen,
-	       "e/widgets/border/default/fullscreen");
-
-   _item_add(p, _("Close"), _act_cb_border_close,
-	     "e/widgets/border/default/close");
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *item, const char *input __UNUSED__)
-{
-   void (*border_action) (E_Border *bd);
-   border_action = item->data[0];
-   border_action(inst->border);
-
-   return EVRY_ACTION_FINISHED;
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   Evry_Item *it;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->data[1]) eina_stringshare_del(it->data[1]);
-	if (it->label) eina_stringshare_del(it->label);
-	E_FREE(it);
-     }
-}
-
-static void
-_item_add(Evry_Plugin *p, const char *label, void (*action_cb) (E_Border *bd), const char *icon)
-{
-   Evry_Item *it;
-
-   it = E_NEW(Evry_Item, 1);
-   it->data[0] = action_cb;
-   it->data[1] = (void *) eina_stringshare_add(icon);
-   it->label = eina_stringshare_add(label);
-   p->items = eina_list_append(p->items, it);
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   it->o_icon = edje_object_add(e);
-   e_theme_edje_object_set(it->o_icon, "base/theme/borders", (const char *)it->data[1]);
-}
-
diff --git a/src/modules/everything/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c
deleted file mode 100644
index bb1b9ae..0000000
--- a/src/modules/everything/evry_plug_calc.c
+++ /dev/null
@@ -1,262 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* TODO
- * - dc support?
- */
-
-static int  _begin(Evry_Plugin *p, Evry_Item *it);
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_add(Evry_Plugin *p, char *output, int prio);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static int  _cb_data(void *data, int type, void *event);
-static int  _cb_error(void *data, int type, void *event);
-static int  _cb_del(void *data, int type, void *event);
-
-static Evry_Plugin *p;
-static Ecore_Exe *exe = NULL;
-static Eina_List *history = NULL;
-static Ecore_Event_Handler *data_handler = NULL;
-static Ecore_Event_Handler *error_handler = NULL;
-static Ecore_Event_Handler *del_handler = NULL;
-static Ecore_X_Window clipboard_win = 0;
-static int error = 0;
-
-EAPI int
-evry_plug_calc_init(void)
-{
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Calculator";
-   p->type_in  = "NONE";
-   p->type_out = "NONE";
-   p->trigger = "=";
-   p->need_query = 0;
-   p->async_query = 1;
-   p->begin = &_begin;
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->icon_get = &_item_icon_get;
-   evry_plugin_register(p);
-
-   clipboard_win = ecore_x_window_new(0, 0, 0, 1, 1);
-   return 1;
-}
-
-EAPI int
-evry_plug_calc_shutdown(void)
-{
-   Evry_Item *it;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->label) eina_stringshare_del(it->label);
-	free(it);
-     }
-
-   evry_plugin_unregister(p);
-   E_FREE(p);
-
-   ecore_x_window_free(clipboard_win);
-   clipboard_win = 0;
-
-   return 1;
-}
-
-static int
-_begin(Evry_Plugin *p, Evry_Item *it __UNUSED__)
-{
-
-   data_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _cb_data, p);
-   error_handler = ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _cb_error, p);
-   del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _cb_del, p);
-   exe = ecore_exe_pipe_run("bc -l",
-			    ECORE_EXE_PIPE_READ |
-			    ECORE_EXE_PIPE_READ_LINE_BUFFERED |
-			    ECORE_EXE_PIPE_WRITE |
-			    ECORE_EXE_PIPE_ERROR |
-			    ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
-			    NULL);
-   return !!exe;
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   Evry_Item *it;
-   int i = 0;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (i < 10)
-	  {
-	     history = eina_list_append(history, it);
-	  }
-	else
-	  {
-	     if (it->label) eina_stringshare_del(it->label);
-	     free(it);
-	  }
-     }
-
-   ecore_event_handler_del(data_handler);
-   ecore_event_handler_del(error_handler);
-   data_handler = NULL;
-
-   ecore_exe_quit(exe);
-   exe = NULL;
-}
-
-static int
-_action(Evry_Plugin *p, Evry_Item *it, const char *input __UNUSED__)
-{
-   if (!it) return EVRY_ACTION_CONTINUE;
-
-   if (p->items)
-     {
-	Eina_List *l;
-	Evry_Item *it2;
-
-	evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
-
-	/* remove duplicates */
-	if (p->items->next)
-	  {
-	     it = p->items->data;
-		  
-	     EINA_LIST_FOREACH(p->items->next, l, it2)
-	       {
-		  if (!strcmp(it->label, it2->label))
-		    break;
-		  it2 = NULL;
-	       }
-
-	     if (it2)
-	       {
-		  p->items = eina_list_remove(p->items, it2);
-		  eina_stringshare_del(it2->label);
-		  E_FREE(it2);
-	       }
-	  }
-
-	it = p->items->data;
-
-	_item_add(p, (char *) it->label, 1);
-     }
-
-   /* evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD); */
-
-   ecore_x_selection_primary_set(clipboard_win, it->label, strlen(it->label));
-   ecore_x_selection_clipboard_set(clipboard_win, it->label, strlen(it->label));
-
-   return EVRY_ACTION_FINISHED;
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   char buf[1024];
-   
-   if (history)
-     {
-	p->items = history;
-	history = NULL;
-     }
-
-
-   if (!strncmp(input, "=scale=", 7))
-     snprintf(buf, 1024, "%s\n", input + (strlen(p->trigger)));
-   else
-     snprintf(buf, 1024, "scale=3;%s\n", input + (strlen(p->trigger)));
-
-   /* printf("send %s\n",buf); */
-
-   ecore_exe_send(exe, buf, strlen(buf));
-
-   /* XXX after error we get no response for first input ?! - send a
-      second time...*/
-   if (error)
-     {
-	ecore_exe_send(exe, buf, strlen(buf));
-	error = 0;
-     }
-	
-   return 1;
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e __UNUSED__)
-{
-   it->o_icon = NULL;
-}
-
-static void
-_item_add(Evry_Plugin *p, char *output, int prio)
-{
-   Evry_Item *it;
-
-   it = E_NEW(Evry_Item, 1);
-
-   it->priority = prio;
-   it->label = eina_stringshare_add(output);
-
-   p->items = eina_list_prepend(p->items, it);
-}
-
-static int
-_cb_data(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_Exe_Event_Data *ev = event;
-   Ecore_Exe_Event_Data_Line *l;
-
-   if (ev->exe != exe) return 1;
-   
-   evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_CLEAR);
-
-   for (l = ev->lines; l && l->line; l++)
-     {
-	/* printf("line %s\n", l->line); */
-	
-	if (p->items)
-	  {
-	     Evry_Item *it = p->items->data;
-	     if (it->label)
-	       eina_stringshare_del(it->label);
-	     it->label = eina_stringshare_add(l->line);
-	  }
-	else
-	  _item_add(p, l->line, 1);
-     }
-
-   evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
-
-   return 1;
-}
-
-static int
-_cb_error(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_Exe_Event_Data *ev = event;
-
-   if (ev->exe != exe)
-     return 1;
-
-   error = 1;
-   /* printf("got error\n"); */
-
-   return 1;
-}
-
-static int
-_cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
-{
-   Ecore_Exe_Event_Del *e = event;
-
-   if (e->exe != exe)
-     return 1;
-
-   exe = NULL;
-   return 1;
-}
diff --git a/src/modules/everything/evry_plug_config.c b/src/modules/everything/evry_plug_config.c
deleted file mode 100644
index ed5cc1a..0000000
--- a/src/modules/everything/evry_plug_config.c
+++ /dev/null
@@ -1,178 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *item, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_add(Evry_Plugin *p, E_Configure_It *eci, int prio);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static int  _cb_sort(const void *data1, const void *data2);
-
-static Evry_Plugin *p;
-
-
-EAPI int
-evry_plug_config_init(void)
-{
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Settings";
-   p->type_in  = "NONE";
-   p->type_out = "NONE";
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->icon_get = &_item_icon_get;
-
-   evry_plugin_register(p);
-   return 1;
-}
-
-EAPI int
-evry_plug_config_shutdown(void)
-{
-   evry_plugin_unregister(p);
-   E_FREE(p);
-
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *it, const char *input __UNUSED__)
-{
-   E_Configure_It *eci, *eci2;
-   E_Container *con;
-   E_Configure_Cat *ecat;
-   Eina_List *l, *ll;
-   char buf[1024];
-   int found = 0;
-
-   if (!it) return EVRY_ACTION_CONTINUE;
-
-   eci = it->data[0];
-   con = e_container_current_get(e_manager_current_get());
-
-   for (l = e_configure_registry; l && !found; l = l->next)
-     {
-	ecat = l->data;
-	for (ll = ecat->items; ll && !found; ll = ll->next)
-	  {
-	     eci2 = ll->data;
-	     if (eci == eci2)
-	       {
-		  found = 1;
-		  snprintf(buf, sizeof(buf), "%s/%s",
-			   ecat->cat,
-			   eci->item);
-	       }
-	  }
-     }
-
-   if (found)
-     e_configure_registry_call(buf, con, NULL);
-
-   return EVRY_ACTION_FINISHED;
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   Evry_Item *it;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->label) eina_stringshare_del(it->label);
-	E_FREE(it);
-     }
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   char match1[4096];
-   char match2[4096];
-   Eina_List *l, *ll;
-   E_Configure_Cat *ecat;
-   E_Configure_It *eci;
-
-   _cleanup(p);
-
-   snprintf(match1, sizeof(match1), "%s*", input);
-   snprintf(match2, sizeof(match2), "*%s*", input);
-
-   for (l = e_configure_registry; l; l = l->next)
-     {
-	ecat = l->data;
-	if ((ecat->pri >= 0) && (ecat->items))
-	  {
-	     for (ll = ecat->items; ll; ll = ll->next)
-	       {
-		  eci = ll->data;
-		  if (eci->pri >= 0)
-		    {
-		       if (e_util_glob_case_match(eci->label, match1))
-			 _item_add(p, eci, 1);
-		       else if (e_util_glob_case_match(eci->label, match2))
-			 _item_add(p, eci, 2);
-		       else if (e_util_glob_case_match(ecat->label, match1))
-			 _item_add(p, eci, 3);
-		       else if (e_util_glob_case_match(ecat->label, match2))
-			 _item_add(p, eci, 4);
-		    }
-	       }
-	  }
-     }
-
-   if (eina_list_count(p->items) > 0)
-     {
-	p->items = eina_list_sort(p->items, eina_list_count(p->items), _cb_sort);
-	return 1;
-     }
-
-   return 0;
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   E_Configure_It *eci = it->data[0];
-   Evas_Object *o = NULL;
-
-   if (eci->icon)
-     {
-	o = e_icon_add(e);
-	if (!e_util_icon_theme_set(o, eci->icon))
-	  {
-	     evas_object_del(o);
-	     o = e_util_icon_add(eci->icon, e);
-	  }
-     }
-
-   it->o_icon = o;
-}
-
-static void
-_item_add(Evry_Plugin *p, E_Configure_It *eci, int prio)
-{
-   Evry_Item *it;
-
-   it = E_NEW(Evry_Item, 1);
-   it->data[0] = eci;
-   it->priority = prio;
-   it->label = eina_stringshare_add(eci->label);
-   it->o_icon = NULL;
-
-   p->items = eina_list_append(p->items, it);
-}
-
-static int
-_cb_sort(const void *data1, const void *data2)
-{
-   const Evry_Item *it1, *it2;
-
-   it1 = data1;
-   it2 = data2;
-
-   /* TODO sort by name? */
-
-   return (it1->priority - it2->priority);
-}
diff --git a/src/modules/everything/evry_plug_dir_browse.c b/src/modules/everything/evry_plug_dir_browse.c
deleted file mode 100644
index 95944fe..0000000
--- a/src/modules/everything/evry_plug_dir_browse.c
+++ /dev/null
@@ -1,374 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-typedef struct _State State;
-
-struct _State
-{
-  const char *directory;
-  Eina_List  *items;
-  int command;
-};
-
-static int  _begin(Evry_Plugin *p, Evry_Item *it);
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *it, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static int  _cb_sort(const void *data1, const void *data2);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static void _list_free(Evry_Plugin *p);
-static void _item_fill(Evry_Item *it, Evas *evas);
-static Evry_Item *_item_add(const char *directory, const char *file);
-static void _realize(Evry_Plugin *p, Evas *e);
-
-static Evry_Plugin *p;
-static Eina_List *stack = NULL;
-
-
-EAPI int
-evry_plug_dir_browse_init(void)
-{
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Browse Files";
-   p->type_in  = "NONE|FILE";
-   p->type_out = "FILE";
-   /* p->trigger = "/"; */
-   p->begin = &_begin;
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->realize_items = &_realize;
-   p->icon_get = &_item_icon_get;
-
-   evry_plugin_register(p);
-
-   return 1;
-}
-
-EAPI int
-evry_plug_dir_browse_shutdown(void)
-{
-   evry_plugin_unregister(p);
-   E_FREE(p);
-
-   return 1;
-}
-
-static int
-_begin(Evry_Plugin *p, Evry_Item *it)
-{
-   State *s;
-
-   if (stack)
-     {
-	s = stack->data;
-	if (s->command) evry_clear_input();
-     }
-   
-   if (it)
-     {
-	if (!it->uri || !ecore_file_is_dir(it->uri))
-	  return 0;
-
-	s = E_NEW(State, 1);
-	s->directory = eina_stringshare_add(it->uri);
-     }
-   else
-     {
-	s = E_NEW(State, 1);
-	s->directory = eina_stringshare_add(e_user_homedir_get());
-     }
-
-   stack = eina_list_prepend(stack, s);
-   p->items = NULL;
-
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, const char *input __UNUSED__)
-{
-   return EVRY_ACTION_OTHER;
-}
-
-static void
-_list_free(Evry_Plugin *p)
-{
-   Evry_Item *it;
-
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->label) eina_stringshare_del(it->label);
-	if (it->uri) eina_stringshare_del(it->uri);
-	if (it->mime) eina_stringshare_del(it->mime);
-	free(it);
-     }
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   State *s;
-
-   if (!stack) return;
-
-   s = stack->data;
-
-   _list_free(p);
-
-   eina_stringshare_del(s->directory);
-
-   E_FREE(s);
-
-   stack = eina_list_remove_list(stack, stack);
-
-   if (stack)
-     {
-	s = stack->data;
-	p->items = s->items;
-     }
-}
-
-/* based on directory-watcher from drawer module  */
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   Eina_List *files;
-   char *file;
-   const char *directory = NULL;
-   Evry_Item *it;
-   char match1[4096];
-   char match2[4096];
-   State *s = stack->data;
-
-   _list_free(p);
-
-   /* input is command ? */
-   if (input)
-     {
-	if (!strncmp(input, "/", 1))
-	  {
-	     it = E_NEW(Evry_Item, 1);
-	     it->uri = eina_stringshare_add("/");
-	     it->label = eina_stringshare_add("/");
-	     p->items = eina_list_append(p->items, it);
-	     s->command = 1;
-	     return 1;
-	     
-	  }
-	else if (!strncmp(input, "..", 2))
-	  {
-	     char *end;
-	     char dir[4096];
-	     char *tmp;
-	     int prio = 0;
-
-	     if (!strcmp(s->directory, "/")) return 0;
-	     
-	     snprintf(dir, 4096, "%s", s->directory);
-	     end = strrchr(dir, '/');	     
-
-	     while (end != dir)
-	       {
-		  tmp = strdup(dir);
-		  snprintf(dir, (end - dir) + 1, "%s", tmp);
-	          it = E_NEW(Evry_Item, 1);
-		  it->uri = eina_stringshare_add(dir);
-		  it->label = eina_stringshare_add(dir);
-		  it->priority = prio;
-		  p->items = eina_list_append(p->items, it);
-		  end = strrchr(dir, '/');
-		  free(tmp);
-		  prio--;
-	       }
-
-	     it = E_NEW(Evry_Item, 1);
-	     it->uri = eina_stringshare_add("/");
-	     it->label = eina_stringshare_add("/");
-	     it->priority = prio;
-	     p->items = eina_list_append(p->items, it);
-
-	     s->command = 1;
-
-	     return 1;
-	  }
-     }
-   
-   if (!directory)
-     directory = s->directory;
-
-   files = ecore_file_ls(directory);
-
-   if (input)
-     {
-	snprintf(match1, sizeof(match1), "%s*", input);
-	snprintf(match2, sizeof(match2), "*%s*", input);
-     }
-
-   EINA_LIST_FREE(files, file)
-     {
-	it = NULL;
-
-	if (file[0] == '.')
-	  {
-	     free(file);
-	     continue;
-	  }
-
-	if (input)
-	  {
-	     if (e_util_glob_case_match(file, match1))
-	       {
-		  it  = _item_add(directory, file);
-		  it->priority = 1;
-	       }
-	     else if (e_util_glob_case_match(file, match2))
-	       {
-		  it = _item_add(directory, file);
-		  it->priority = 0;
-	       }
-	  }
-	else
-	  {
-	     it = _item_add(directory, file);
-	  }
-	
-	if (it)
-	  p->items = eina_list_append(p->items, it);
-
-	free(file);
-     }
-
-   s->items = p->items;
-   
-   if (p->items) return 1;
-   
-   return 0;
-}
-
-static Evry_Item *
-_item_add(const char *directory, const char *file)
-{
-   Evry_Item *it = NULL;
-   char buf[4096];
-   
-   it = E_NEW(Evry_Item, 1);
-
-   snprintf(buf, sizeof(buf), "%s/%s", directory, file);
-   it->uri = eina_stringshare_add(buf);
-   it->label = eina_stringshare_add(file);
-
-   return it;
-}
-
-static void
-_realize(Evry_Plugin *p, Evas *e)
-{
-   Eina_List *l;
-   Evry_Item *it;
-   State *s = stack->data;
-   
-   EINA_LIST_FOREACH(p->items, l, it)
-     _item_fill(it, e);
-
-   if (eina_list_count(p->items) > 0)
-     {
-	p->items = eina_list_sort(p->items, eina_list_count(p->items), _cb_sort);
-	s->items = p->items;
-     }
-}
-
-
-/* based on directory-watcher from drawer module  */
-static void
-_item_fill(Evry_Item *it, Evas *e)
-{
-   const char *mime;
-
-   if  (it->mime) return;
-   
-   if ((e_util_glob_case_match(it->label, "*.desktop")) ||
-       (e_util_glob_case_match(it->label, "*.directory")))
-     {
-	Efreet_Desktop *desktop;
-
-	desktop = efreet_desktop_new(it->uri);
-	if (!desktop) return;
-	it->label = eina_stringshare_add(desktop->name);
-	efreet_desktop_free(desktop);
-     }
-
-   mime = efreet_mime_globs_type_get(it->uri);
-   if (mime)
-     {
-	it->mime = eina_stringshare_add(mime);
-     }
-   else if (ecore_file_is_dir(it->uri))
-     {
-	it->mime = eina_stringshare_add("Folder");
-	it->priority += 1;
-	it->o_icon = edje_object_add(e);
-	e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/folder");
-     }
-   else if ((mime = efreet_mime_type_get(it->uri)))
-     {
-	it->mime = eina_stringshare_add(mime);
-     }
-   else
-     {
-	it->mime = eina_stringshare_add("None");
-     }
-
-   if (strcmp(it->mime, "Folder"))
-     {
-	char *item_path = efreet_mime_type_icon_get(it->mime, e_config->icon_theme, 32);
-
-	if (item_path)
-	  it->o_icon = e_util_icon_add(item_path, e);
-	else
-	  {
-	     it->o_icon = edje_object_add(e);
-	     e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/fileman/file");
-	  }
-     }
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   char *item_path;
-
-   if (!it->mime) return;
-
-   if (!strcmp(it->mime, "Folder"))
-     {
-	it->o_icon = edje_object_add(e);
-	e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/folder");
-     }
-   else
-     {
-	item_path = efreet_mime_type_icon_get(it->mime, e_config->icon_theme, 32);
-
-	if (item_path)
-	  it->o_icon = e_util_icon_add(item_path, e);
-	else
-	  {
-	     it->o_icon = edje_object_add(e);
-	     e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/fileman/file");
-	  }
-     }
-}
-
-static int
-_cb_sort(const void *data1, const void *data2)
-{
-   const Evry_Item *it1, *it2;
-
-   it1 = data1;
-   it2 = data2;
-
-   if (it2->priority - it1->priority)
-     return (it2->priority - it1->priority);
-   else
-     return strcasecmp(it1->label, it2->label);
-}
diff --git a/src/modules/everything/evry_plug_tracker.c b/src/modules/everything/evry_plug_tracker.c
deleted file mode 100644
index e5b20a7..0000000
--- a/src/modules/everything/evry_plug_tracker.c
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* TODO check if trackerd is running */
-
-typedef struct _Inst Inst;
-
-struct _Inst
-{
-  E_DBus_Connection *conn;
-};
-
-static int  _fetch(Evry_Plugin *p, const char *input);
-static int  _action(Evry_Plugin *p, Evry_Item *it, const char *input);
-static void _cleanup(Evry_Plugin *p);
-static void _item_add(Evry_Plugin *p, char *file, char *service, char *mime, int prio);
-static void _item_icon_get(Evry_Plugin *p, Evry_Item *it, Evas *e);
-static void _dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error);
-
-static Evry_Plugin *p;
-static Inst *inst;
-
-EAPI int
-evry_plug_tracker_init(void)
-{
-   E_DBus_Connection *conn = e_dbus_bus_get(DBUS_BUS_SESSION);
-
-   if (!conn) return 0;
-
-   p = E_NEW(Evry_Plugin, 1);
-   p->name = "Search Files";
-   p->type_in = "NONE";
-   p->type_out = "FILE";
-   p->need_query = 1;
-   p->fetch = &_fetch;
-   p->action = &_action;
-   p->cleanup = &_cleanup;
-   p->icon_get = &_item_icon_get;
-   
-   inst = E_NEW(Inst, 1);
-   inst->conn = conn;   
-   
-   evry_plugin_register(p);
-
-   return 1;
-}
-
-EAPI int
-evry_plug_tracker_shutdown(void)
-{
-   evry_plugin_unregister(p);
-
-   if (inst)
-     {
-	if (inst->conn)
-	  e_dbus_connection_close(inst->conn);
-	E_FREE(inst);
-     }
-   
-   if (p) E_FREE(p);
-   
-   return 1;
-}
-
-static int
-_action(Evry_Plugin *p __UNUSED__, Evry_Item *it __UNUSED__, const char *input __UNUSED__)
-{
-   return EVRY_ACTION_OTHER;
-}
-
-static void
-_cleanup(Evry_Plugin *p)
-{
-   Evry_Item *it;
-   
-   EINA_LIST_FREE(p->items, it)
-     {
-	if (it->mime) eina_stringshare_del(it->mime);
-	if (it->uri) eina_stringshare_del(it->uri);
-	if (it->label) eina_stringshare_del(it->label);
-	free(it);
-     }
-}
-
-static int
-_fetch(Evry_Plugin *p, const char *input)
-{
-   DBusMessage *msg;
-   DBusMessageIter iter;
-   int live_query_id = 0;
-   int offset = 0;
-   int max_hits = 50;
-   char *service = "Files";
-   char *match;
-   
-   _cleanup(p); 
-
-   match = malloc(sizeof(char) * strlen(input) + 2);
-   sprintf(match, "%s*", input);
-
-   msg = dbus_message_new_method_call("org.freedesktop.Tracker",
-				      "/org/freedesktop/Tracker/Search",
-				      "org.freedesktop.Tracker.Search",
-				      "TextDetailed");
-
-   dbus_message_iter_init_append(msg, &iter);
-   dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32,  &live_query_id);
-   dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &service);
-   dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &match);
-   dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32,  &offset);
-   dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32,  &max_hits);
-   e_dbus_message_send(inst->conn, msg, _dbus_cb_reply, -1, NULL);
-   dbus_message_unref(msg);
-
-   free(match);
-
-   return 0;
-}
-
-static void
-_item_icon_get(Evry_Plugin *p __UNUSED__, Evry_Item *it, Evas *e)
-{
-   char *item_path;
-
-   if (!strcmp(it->mime, "Folder"))
-     {
-	it->o_icon = edje_object_add(e);
-	/* e_util_icon_theme_set(it->o_icon, "folder"); */
-	e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/folder");
-     }
-   else
-     {
-	item_path = efreet_mime_type_icon_get(it->mime, e_config->icon_theme, 32);
-
-	if (item_path)
-	  it->o_icon = e_util_icon_add(item_path, e);
-	else
-	  {
-	     it->o_icon = edje_object_add(e);
-	     /* e_util_icon_theme_set(it->o_icon, "file"); */
-	     e_theme_edje_object_set(it->o_icon, "base/theme/fileman", "e/icons/fileman/file");
-	  }
-     }
-}
-
-static void
-_item_add(Evry_Plugin *p, char *file, char *service __UNUSED__, char *mime, int prio)
-{
-   Evry_Item *it;   
-   
-   it = E_NEW(Evry_Item, 1);
-   it->priority = prio;
-   it->label = eina_stringshare_add(ecore_file_file_get(file));
-   it->uri = eina_stringshare_add(file);
-   it->mime = eina_stringshare_add(mime);
-   it->o_icon = NULL;
-
-   p->items = eina_list_append(p->items, it);
-}
-
-static void
-_dbus_cb_reply(void *data __UNUSED__, DBusMessage *msg, DBusError *error)
-{
-   DBusMessageIter array, iter, item;
-
-   if (dbus_error_is_set(error))
-     {
-	printf("Error: %s - %s\n", error->name, error->message);
-	return;
-     }
-
-   dbus_message_iter_init(msg, &array);
-   if(dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_ARRAY)
-     {
-	dbus_message_iter_recurse(&array, &item);
-	while(dbus_message_iter_get_arg_type(&item) == DBUS_TYPE_ARRAY)
-	  {
-	     char *uri;
-	     char *service;
-	     char *mime;
-	     
-	     dbus_message_iter_recurse(&item, &iter);
-	     
-	     if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING)
-	       {
-		  dbus_message_iter_get_basic(&iter, &uri);
-		  dbus_message_iter_next(&iter);
-		  dbus_message_iter_get_basic(&iter, &service);
-		  dbus_message_iter_next(&iter);
-		  dbus_message_iter_get_basic(&iter, &mime);
-
-		  if (uri && service && mime)
-		    {
-		       _item_add(p, uri, service, mime, 1); 
-		    }
-	       }
-	     
-	     dbus_message_iter_next(&item);
-	  }
-     }
-   
-   if (p->items) evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD); 
-}
-
diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c
new file mode 100644
index 0000000..d95a1cf
--- /dev/null
+++ b/src/modules/everything/evry_util.c
@@ -0,0 +1,359 @@
+#include "Evry.h"
+
+#define MAX_FUZZ 100
+#define MAX_WORDS 5
+
+
+EAPI int
+evry_fuzzy_match(const char *str, const char *match)
+{
+   const char *p, *m, *next;
+   int sum = 0;
+
+   unsigned int last = 0;
+   unsigned int offset = 0;
+   unsigned int min = 0;
+   unsigned char first = 0;
+   /* ignore punctuation */
+   unsigned char ip = 1;
+
+   unsigned int cnt = 0;
+   /* words in match */
+   unsigned int m_num = 0;
+   unsigned int m_cnt = 0;
+   unsigned int m_min[MAX_WORDS];
+   unsigned int m_len = 0;
+
+   if (!match || !str) return 0;
+
+   /* remove white spaces at the beginning */
+   for (; (*match != 0) && isspace(*match); match++);
+   for (; (*str != 0)   && isspace(*str);   str++);
+
+   /* count words in match */
+   for (m = match; (*m != 0) && (m_num < MAX_WORDS);)
+     {
+	for (; (*m != 0) && !isspace(*m); m++);
+	for (; (*m != 0) &&  isspace(*m); m++);
+	m_min[m_num++] = MAX_FUZZ;
+     }
+   for (m = match; ip && (*m != 0); m++)
+     if (ip && ispunct(*m)) ip = 0;
+
+   m_len = strlen(match);
+
+   /* with less than 3 chars match must be a prefix */
+   if (m_len < 3) m_len = 0;
+
+   next = str;
+   m = match;
+
+   while((m_cnt < m_num) && (*next != 0))
+     {
+	/* reset match */
+	if (m_cnt == 0) m = match;
+
+	/* end of matching */
+	if (*m == 0) break;
+
+	offset = 0;
+	last = 0;
+	min = 1;
+	first = 0;
+
+	/* match current word of string against current match */
+	for (p = next; *next != 0; p++)
+	  {
+	     /* new word of string begins */
+	     if ((*p == 0) || isspace(*p) || (ip && ispunct(*p)))
+	       {
+		  if (m_cnt < m_num - 1)
+		    {
+		       /* test next match */
+		       for (; (*m != 0) && !isspace(*m); m++);
+		       for (; (*m != 0) &&  isspace(*m); m++);
+		       m_cnt++;
+		       break;
+		    }
+		  else
+		    {
+		       /* go to next word */
+		       for (; (*p != 0) && ((isspace(*p) || (ip && ispunct(*p)))); p++);
+		       cnt++;
+		       next = p;
+		       m_cnt = 0;
+		       break;
+		    }
+	       }
+
+	     /* current char matches? */
+	     if (tolower(*p) != tolower(*m))
+	       {
+		  if (!first)
+		    offset += 1;
+		  else
+		    offset += 3;
+
+		  if (offset <= m_len * 3)
+		    continue;
+	       }
+
+	     if (min < MAX_FUZZ && offset <= m_len * 3)
+	       {
+		  /* first offset of match in word */
+		  if (!first)
+		    {
+		       first = 1;
+		       last = offset;
+		    }
+
+		  min += offset + (offset - last) * 5;
+		  last = offset;
+
+		  /* try next char of match */
+		  if (*(++m) != 0 && !isspace(*m))
+		    continue;
+
+		  /* end of match: store min weight of match */
+		  min += (cnt - m_cnt) > 0 ? (cnt - m_cnt) : 0;
+
+		  if (min < m_min[m_cnt])
+		    m_min[m_cnt] = min;
+	       }
+	     else
+	       {
+		  /* go to next match */
+		  for (; (*m != 0) && !isspace(*m); m++);
+	       }
+
+	     if (m_cnt < m_num - 1)
+	       {
+		  /* test next match */
+		  for (; (*m != 0) && isspace(*m); m++);
+		  m_cnt++;
+		  break;
+	       }
+	     else if(*p != 0)
+	       {
+		  /* go to next word */
+		  for (; (*p != 0) && !((isspace(*p) || (ip && ispunct(*p)))); p++);
+		  for (; (*p != 0) &&  ((isspace(*p) || (ip && ispunct(*p)))); p++);
+		  cnt++;
+		  next = p;
+		  m_cnt = 0;
+		  break;
+	       }
+	     else
+	       {
+		  next = p;
+		  break;
+	       }
+	  }
+     }
+
+   for (m_cnt = 0; m_cnt < m_num; m_cnt++)
+     {
+	sum += m_min[m_cnt];
+
+	if (sum >= MAX_FUZZ)
+	  {
+	     sum = 0;
+	     break;
+	  }
+     }
+
+   return sum;
+}
+
+static int
+_evry_fuzzy_match_sort_cb(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->priority - it2->priority)
+     return (it1->priority - it2->priority);
+
+   if (it1->fuzzy_match || it2->fuzzy_match)
+     {
+	if (it1->fuzzy_match && !it2->fuzzy_match)
+	  return -1;
+
+	if (!it1->fuzzy_match && it2->fuzzy_match)
+	  return 1;
+
+	if (it1->fuzzy_match - it2->fuzzy_match)
+	  return (it1->fuzzy_match - it2->fuzzy_match);
+     }
+
+   return 0;
+}
+
+EAPI Eina_List *
+evry_fuzzy_match_sort(Eina_List *items)
+{
+   return eina_list_sort(items, eina_list_count(items), _evry_fuzzy_match_sort_cb);
+}
+ 
+
+/* taken from e_utils. just changed 48 to 72.. we need
+   evry_icon_theme_set(Evas_Object *obj, const char *icon,
+   size:small, mid, large) imo */
+static int
+_evry_icon_theme_set(Evas_Object *obj, const char *icon)
+{
+   const char *file;
+   char buf[4096];
+
+   if ((!icon) || (!icon[0])) return 0;
+   snprintf(buf, sizeof(buf), "e/icons/%s", icon);
+   file = e_theme_edje_file_get("base/theme/icons", buf);
+   if (file[0])
+     {
+	e_icon_file_edje_set(obj, file, buf);
+	return 1;
+     }
+   return 0;
+}
+
+static int
+_evry_icon_fdo_set(Evas_Object *obj, const char *icon)
+{
+   char *path = NULL;
+   unsigned int size;
+
+   if ((!icon) || (!icon[0])) return 0;
+   size = e_util_icon_size_normalize(72 * e_scale);
+   path = efreet_icon_path_find(e_config->icon_theme, icon, size);
+
+   if (!path) return 0;
+   e_icon_file_set(obj, path);
+   E_FREE(path);
+   return 1;
+}
+
+EAPI Evas_Object *
+evry_icon_theme_get(const char *icon, Evas *e)
+{
+   Evas_Object *o = e_icon_add(e);
+
+   if (e_config->icon_theme_overrides)
+     {
+	if (_evry_icon_fdo_set(o, icon) ||
+	    _evry_icon_theme_set(o, icon))
+	  return o;
+     }
+   else
+     {
+	if (_evry_icon_theme_set(o, icon) ||
+	    _evry_icon_fdo_set(o, icon))
+	  return o;
+     }
+
+   evas_object_del(o);
+
+   return NULL;
+}
+
+EAPI Evas_Object *
+evry_icon_mime_get(const char *mime, Evas *e)
+{
+   Evas_Object *o = NULL;
+   char *icon;
+
+   icon = efreet_mime_type_icon_get(mime, e_config->icon_theme, 64);
+
+   if (icon)
+     {
+	o = e_util_icon_add(icon, e);
+	free(icon);
+     }
+   else
+     {
+	o = evry_icon_theme_get("none", e);
+     }
+
+   return o;
+}
+
+EAPI int
+evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
+{
+   E_Zone *zone;
+   Eina_List *files = NULL;
+   char *exe = NULL;
+
+   if (!it_app) return 0;
+   ITEM_APP(app, it_app);
+   
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   if (app->desktop)
+     {
+	if (it_file)
+	  {
+	     ITEM_FILE(file, it_file);
+
+	     Eina_List *l;
+	     char *mime;
+	     char *path = NULL;
+	     int open_folder = 0;
+
+	     if (!EVRY_ITEM(file)->browseable)
+	       {
+		  EINA_LIST_FOREACH(app->desktop->mime_types, l, mime)
+		    {
+		       if (!strcmp(mime, "x-directory/normal"))
+			 {
+			    open_folder = 1;
+			    break;
+			 }
+		    }
+	       }
+
+	     if (open_folder)
+	       {
+		  path = ecore_file_dir_get(file->uri);
+		  files = eina_list_append(files, path);
+	       }
+	     else
+	       {
+		  files = eina_list_append(files, file->uri);
+	       }
+
+	     e_exec(zone, app->desktop, NULL, files, NULL);
+
+	     if (file && file->mime && !open_folder)
+	       e_exehist_mime_desktop_add(file->mime, app->desktop);
+
+	     if (files)
+	       eina_list_free(files);
+
+	     if (open_folder && path)
+	       free(path);
+	  }
+	else
+	  e_exec(zone, app->desktop, NULL, NULL, "everything");
+     }
+   else if (app->file)
+     {
+	if (it_file)
+	  {
+	     ITEM_FILE(file, it_file);
+	     int len;
+
+	     len = strlen(app->file) + strlen(file->uri) + 2;
+	     exe = malloc(len);
+	     snprintf(exe, len, "%s %s", app->file, file->uri);
+	     e_exec(zone, NULL, exe, NULL, NULL);
+	     free(exe);
+	  }
+	else
+	  {
+	     exe = (char *) app->file;
+	     e_exec(zone, NULL, exe, NULL, NULL);
+	  }
+     }
+
+   return 1;
+}
diff --git a/src/modules/everything/evry_view_plugin_tabs.c b/src/modules/everything/evry_view_plugin_tabs.c
new file mode 100644
index 0000000..d58323b
--- /dev/null
+++ b/src/modules/everything/evry_view_plugin_tabs.c
@@ -0,0 +1,319 @@
+#include "e_mod_main.h"
+
+
+typedef struct _Tab Tab;
+
+struct _Tab
+{
+  Evry_Plugin *plugin;
+  Evas_Object *o_tab;
+
+  int cw, mw;
+};
+
+
+
+static void
+_tab_scroll_to(Tab_View *v, Evry_Plugin *p)
+{
+   int n, w, mw, i;
+   double align;
+   Eina_List *l;
+   const Evry_State *s = v->state;
+
+   for(i = 0, l = s->cur_plugins; l; l = l->next, i++)
+     if (l->data == p) break;
+
+   n = eina_list_count(s->cur_plugins);
+
+   e_box_size_min_get(v->o_tabs, &mw, NULL);
+   evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL);
+
+   if (mw <= w + 5)
+     {
+	e_box_align_set(v->o_tabs, 0.0, 0.5);
+	return;
+     }
+
+   if (n > 1)
+     {
+	align = (double)i / (double)(n - 1);
+	/* if (evry_conf->scroll_animate)
+	 *   {
+	 *      if (!scroll_timer)
+	 *        scroll_timer = ecore_timer_add(0.01, _evry_list_scroll_timer, NULL);
+	 *      if (!scroll_animator)
+	 *        scroll_animator = ecore_animator_add(_evry_list_animator, NULL);
+	 *   }
+	 * else */
+	e_box_align_set(v->o_tabs, 1.0 - align, 0.5);
+     }
+   else
+     e_box_align_set(v->o_tabs, 0.0, 0.5);
+}
+
+static void
+_tabs_update(Tab_View *v)
+{
+
+   Eina_List *l, *ll;
+   Evry_Plugin *p;
+   const Evry_State *s = v->state;
+   Tab *tab;
+   Evas_Coord w;
+   Evas_Object *o;
+
+   evas_object_geometry_get(v->o_tabs, NULL, NULL, &w, NULL);
+
+   /* remove tabs for not active plugins */
+   e_box_freeze(v->o_tabs);
+
+   EINA_LIST_FOREACH(v->tabs, l, tab)
+     {
+	e_box_unpack(tab->o_tab);
+	evas_object_hide(tab->o_tab);
+     }
+
+   /* show/update tabs of active plugins */
+   EINA_LIST_FOREACH(s->cur_plugins, l, p)
+     {
+	EINA_LIST_FOREACH(v->tabs, ll, tab)
+	  if (tab->plugin == p) break;
+
+	if (!tab)
+	  {
+	     tab = E_NEW(Tab, 1);
+	     tab->plugin = p;
+
+	     o = edje_object_add(v->evas);
+	     e_theme_edje_object_set(o, "base/theme/everything",
+				     "e/modules/everything/tab_item");
+	     edje_object_part_text_set(o, "e.text.label", p->name);
+
+	     tab->o_tab = o;
+
+	     edje_object_size_min_calc(o, &tab->cw, NULL);
+	     edje_object_size_min_get(o,  &tab->mw, NULL);
+
+	     v->tabs = eina_list_append(v->tabs, tab);
+	  }
+
+	if (!tab) continue;
+
+	o = tab->o_tab;
+	evas_object_show(o);
+	e_box_pack_end(v->o_tabs, o);
+
+	if (eina_list_count(s->cur_plugins) == 2)
+	  e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5,
+				 120, 10, 120, 9999);
+	else
+	  e_box_pack_options_set(o, 1, 1, 1, 0, 0.0, 0.5,
+				 (tab->mw < tab->cw ? tab->cw : tab->mw), 10,
+				 (w ? w/3 : 120), 9999);
+	if (s->plugin == p)
+	  edje_object_signal_emit(o, "e,state,selected", "e");
+	else
+	  edje_object_signal_emit(o, "e,state,unselected", "e");
+     }
+
+   e_box_thaw(v->o_tabs);
+
+   if (eina_list_count(s->cur_plugins) == 2)
+     {
+       e_box_align_set(v->o_tabs, 0.0, 0.5);       
+     }
+   else if (s->plugin)
+     _tab_scroll_to(v, s->plugin);
+}
+
+
+static void
+_tabs_clear(Tab_View *v)
+{
+   Eina_List *l;
+   Tab *tab;
+
+   e_box_freeze(v->o_tabs);
+   EINA_LIST_FOREACH(v->tabs, l, tab)
+     {
+	e_box_unpack(tab->o_tab);
+	evas_object_hide(tab->o_tab);
+     }
+   e_box_thaw(v->o_tabs);
+}
+
+static void
+_plugin_select(Tab_View *v, Evry_Plugin *p)
+{
+   evry_plugin_select(v->state, p);
+
+   _tabs_update(v);
+   _tab_scroll_to(v, p);
+   /* _tabs_update(v); */
+}
+
+static void
+_plugin_next(Tab_View *v)
+{
+   Eina_List *l;
+   Evry_Plugin *p = NULL;
+   const Evry_State *s = v->state;
+
+   if (!s->plugin) return;
+
+   l = eina_list_data_find_list(s->cur_plugins, s->plugin);
+
+   if (l && l->next)
+     p = l->next->data;
+   else if (s->plugin != s->cur_plugins->data)
+     p = s->cur_plugins->data;
+
+   if (p) _plugin_select(v, p);
+}
+
+static void
+_plugin_next_by_name(Tab_View *v, const char *key)
+{
+   Eina_List *l;
+   Evry_Plugin *p, *first = NULL, *next = NULL;
+   int found = 0;
+   const Evry_State *s = v->state;
+
+   if (!s->plugin) return;
+
+   EINA_LIST_FOREACH(s->cur_plugins, l, p)
+     {
+	if (p->name && (!strncasecmp(p->name, key, 1)))
+	  {
+	     if (!first) first = p;
+
+	     if (found && !next)
+	       next = p;
+	  }
+	if (p == s->plugin) found = 1;
+     }
+
+   if (next)
+     p = next;
+   else if (first != s->plugin)
+     p = first;
+   else
+     p = NULL;
+
+   if (p) _plugin_select(v, p);
+}
+
+static void
+_plugin_prev(Tab_View *v)
+{
+   Eina_List *l;
+   Evry_Plugin *p = NULL;
+   const Evry_State *s = v->state;
+
+   if (!s->plugin) return;
+
+   l = eina_list_data_find_list(s->cur_plugins, s->plugin);
+
+   if (l && l->prev)
+     p = l->prev->data;
+   else
+     {
+	l = eina_list_last(s->cur_plugins);
+	if (s->plugin != l->data)
+	  p = l->data;
+     }
+
+   if (p) _plugin_select(v, p);
+}
+
+
+static int
+_tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
+{
+   const char *key = ev->key;
+
+   if (!strcmp(key, "Next"))
+     {
+	_plugin_next(v);
+	return 1;
+     }
+   else if (!strcmp(key, "Prior"))
+     {
+	_plugin_prev(v);
+	return 1;
+     }
+     else if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
+     {
+	if (!strcmp(key, "Left"))
+	  {
+	     _plugin_prev(v);
+	     return 1;
+	  }
+	else if (!strcmp(key, "Right"))
+	  {
+	     _plugin_next(v);
+	     return 1;
+	  }
+	
+     }
+   else if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
+     {
+	if (!strcmp(key, "Left"))
+	  {
+	     _plugin_prev(v);
+	     return 1;
+	  }
+	else if (!strcmp(key, "Right"))
+	  {
+	     _plugin_next(v);
+	     return 1;
+	  }
+	else if (ev->compose)
+	  {
+	     _plugin_next_by_name(v, key);
+	     return 1;
+	  }
+     }
+
+   return 0;
+}
+
+
+EAPI Tab_View *
+evry_tab_view_new(const Evry_State *s, Evas *e)
+{
+   Tab_View *v;
+   Evas_Object *o;
+
+   v = E_NEW(Tab_View, 1);
+   v->update   = &_tabs_update;
+   v->clear    = &_tabs_clear;
+   v->key_down = &_tabs_key_down;
+   v->state = s;
+   
+   v->evas = e;
+   o = e_box_add(e);
+   e_box_orientation_set(o, 1);
+   e_box_homogenous_set(o, 1);
+   v->o_tabs = o;
+
+   return v;
+}
+
+EAPI void
+evry_tab_view_free(Tab_View *v)
+{
+   Tab *tab;
+   
+   EINA_LIST_FREE(v->tabs, tab)
+     {
+	e_box_unpack(tab->o_tab);
+	evas_object_del(tab->o_tab);
+	E_FREE(tab);
+     }
+
+   evas_object_del(v->o_tabs);   
+
+   E_FREE(v);
+}
diff --git a/src/modules/everything/module.desktop b/src/modules/everything/module.desktop
index 4e860c7..1c6c3a3 100644
--- a/src/modules/everything/module.desktop
+++ b/src/modules/everything/module.desktop
@@ -7,7 +7,7 @@ Name[eo]=Lanĉi komandojn
 Name[es]=Ejecutar comando
 Name[fr]=Tout exécuter
 Name[hu]=Parancs futtatása
-Name[it]=Lanciatore universale
+Name[it]=Pannello di esecuzione
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -20,9 +20,9 @@ Comment[cs]=<title>Modul dialogu Spustit</title><br>Poskytuje dialog pro spušt
 Comment[de]=
 Comment[eo]=<title>Modulo por lanĉi komandojn<title><br>La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj.
 Comment[es]=<title>Módulo para ejecutar comandos</title><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
-Comment[fr]=<title>Module Exécuter une commande</title><br>Fournit une fenêtre de commande pour lancer des applications.
+Comment[fr]=<title>Module Tout exécuter</title><br>Lanceur et explorateur de fichiers à vocation universelle.
 Comment[hu]=<title>Parancs futtatása modul</title><br>A parancs futtató modul egy alkalmazásindítót biztosít a számunkra.
-Comment[it]=<title>Modulo lanciatore universale</title><br>Questo modulo fornisce una finestra di dialogo per l'esecuzione di vari compiti.
+Comment[it]=<title>Modulo pannello di esecuzione</title><br>Questo modulo fornisce un pannello per l'esecuzione di vari compiti.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop.in
index 4e860c7..1c6c3a3 100644
--- a/src/modules/everything/module.desktop.in
+++ b/src/modules/everything/module.desktop.in
@@ -7,7 +7,7 @@ Name[eo]=Lanĉi komandojn
 Name[es]=Ejecutar comando
 Name[fr]=Tout exécuter
 Name[hu]=Parancs futtatása
-Name[it]=Lanciatore universale
+Name[it]=Pannello di esecuzione
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -20,9 +20,9 @@ Comment[cs]=<title>Modul dialogu Spustit</title><br>Poskytuje dialog pro spušt
 Comment[de]=
 Comment[eo]=<title>Modulo por lanĉi komandojn<title><br>La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj.
 Comment[es]=<title>Módulo para ejecutar comandos</title><br>El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
-Comment[fr]=<title>Module Exécuter une commande</title><br>Fournit une fenêtre de commande pour lancer des applications.
+Comment[fr]=<title>Module Tout exécuter</title><br>Lanceur et explorateur de fichiers à vocation universelle.
 Comment[hu]=<title>Parancs futtatása modul</title><br>A parancs futtató modul egy alkalmazásindítót biztosít a számunkra.
-Comment[it]=<title>Modulo lanciatore universale</title><br>Questo modulo fornisce una finestra di dialogo per l'esecuzione di vari compiti.
+Comment[it]=<title>Modulo pannello di esecuzione</title><br>Questo modulo fornisce un pannello per l'esecuzione di vari compiti.
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/everything/sources/Makefile.am b/src/modules/everything/sources/Makefile.am
new file mode 100644
index 0000000..a57169b
--- /dev/null
+++ b/src/modules/everything/sources/Makefile.am
@@ -0,0 +1,65 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+
+plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+
+evry_plug_appsdir = $(plugindir)
+evry_plug_apps_LTLIBRARIES = evry_plug_apps.la
+evry_plug_apps_la_SOURCES =  evry_plug_apps.c
+evry_plug_apps_la_LIBADD       = @e_libs@
+evry_plug_apps_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_apps_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_borderdir = $(plugindir)
+evry_plug_border_LTLIBRARIES = evry_plug_border.la
+evry_plug_border_la_SOURCES =  evry_plug_border.c
+evry_plug_border_la_LIBADD       = @e_libs@
+evry_plug_border_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_border_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_dir_browsedir = $(plugindir)
+evry_plug_dir_browse_LTLIBRARIES = evry_plug_dir_browse.la
+evry_plug_dir_browse_la_SOURCES =  evry_plug_dir_browse.c
+evry_plug_dir_browse_la_LIBADD       = @e_libs@
+evry_plug_dir_browse_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_dir_browse_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_trackerdir = $(plugindir)
+evry_plug_tracker_LTLIBRARIES = evry_plug_tracker.la
+evry_plug_tracker_la_SOURCES =  evry_plug_tracker.c
+evry_plug_tracker_la_LIBADD       = @e_libs@
+evry_plug_tracker_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_tracker_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_calcdir = $(plugindir)
+evry_plug_calc_LTLIBRARIES = evry_plug_calc.la
+evry_plug_calc_la_SOURCES =  evry_plug_calc.c
+evry_plug_calc_la_LIBADD       = @e_libs@
+evry_plug_calc_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_calc_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_configdir = $(plugindir)
+evry_plug_config_LTLIBRARIES = evry_plug_config.la
+evry_plug_config_la_SOURCES =  evry_plug_config.c
+evry_plug_config_la_LIBADD       = @e_libs@
+evry_plug_config_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_config_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_aspelldir = $(plugindir)
+evry_plug_aspell_LTLIBRARIES = evry_plug_aspell.la
+evry_plug_aspell_la_SOURCES =  evry_plug_aspell.c
+evry_plug_aspell_la_LIBADD       = @e_libs@
+evry_plug_aspell_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_aspell_la_LIBTOOLFLAGS = --tag=disable-static
+
+
diff --git a/src/modules/everything/sources/Makefile.in b/src/modules/everything/sources/Makefile.in
new file mode 100644
index 0000000..f972711
--- /dev/null
+++ b/src/modules/everything/sources/Makefile.in
@@ -0,0 +1,1021 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/everything/sources
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+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)$(evry_plug_appsdir)" \
+	"$(DESTDIR)$(evry_plug_aspelldir)" \
+	"$(DESTDIR)$(evry_plug_borderdir)" \
+	"$(DESTDIR)$(evry_plug_calcdir)" \
+	"$(DESTDIR)$(evry_plug_configdir)" \
+	"$(DESTDIR)$(evry_plug_dir_browsedir)" \
+	"$(DESTDIR)$(evry_plug_trackerdir)"
+evry_plug_appsLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_aspellLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_borderLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_calcLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_configLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_dir_browseLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_trackerLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(evry_plug_apps_LTLIBRARIES) \
+	$(evry_plug_aspell_LTLIBRARIES) \
+	$(evry_plug_border_LTLIBRARIES) $(evry_plug_calc_LTLIBRARIES) \
+	$(evry_plug_config_LTLIBRARIES) \
+	$(evry_plug_dir_browse_LTLIBRARIES) \
+	$(evry_plug_tracker_LTLIBRARIES)
+evry_plug_apps_la_DEPENDENCIES =
+am_evry_plug_apps_la_OBJECTS = evry_plug_apps_la-evry_plug_apps.lo
+evry_plug_apps_la_OBJECTS = $(am_evry_plug_apps_la_OBJECTS)
+evry_plug_apps_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_apps_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(evry_plug_apps_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+evry_plug_aspell_la_DEPENDENCIES =
+am_evry_plug_aspell_la_OBJECTS =  \
+	evry_plug_aspell_la-evry_plug_aspell.lo
+evry_plug_aspell_la_OBJECTS = $(am_evry_plug_aspell_la_OBJECTS)
+evry_plug_aspell_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_aspell_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_aspell_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_border_la_DEPENDENCIES =
+am_evry_plug_border_la_OBJECTS =  \
+	evry_plug_border_la-evry_plug_border.lo
+evry_plug_border_la_OBJECTS = $(am_evry_plug_border_la_OBJECTS)
+evry_plug_border_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_border_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_border_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_calc_la_DEPENDENCIES =
+am_evry_plug_calc_la_OBJECTS = evry_plug_calc_la-evry_plug_calc.lo
+evry_plug_calc_la_OBJECTS = $(am_evry_plug_calc_la_OBJECTS)
+evry_plug_calc_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_calc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(evry_plug_calc_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+evry_plug_config_la_DEPENDENCIES =
+am_evry_plug_config_la_OBJECTS =  \
+	evry_plug_config_la-evry_plug_config.lo
+evry_plug_config_la_OBJECTS = $(am_evry_plug_config_la_OBJECTS)
+evry_plug_config_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_config_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_config_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_dir_browse_la_DEPENDENCIES =
+am_evry_plug_dir_browse_la_OBJECTS =  \
+	evry_plug_dir_browse_la-evry_plug_dir_browse.lo
+evry_plug_dir_browse_la_OBJECTS =  \
+	$(am_evry_plug_dir_browse_la_OBJECTS)
+evry_plug_dir_browse_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_dir_browse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_dir_browse_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_tracker_la_DEPENDENCIES =
+am_evry_plug_tracker_la_OBJECTS =  \
+	evry_plug_tracker_la-evry_plug_tracker.lo
+evry_plug_tracker_la_OBJECTS = $(am_evry_plug_tracker_la_OBJECTS)
+evry_plug_tracker_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_tracker_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_tracker_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(evry_plug_apps_la_SOURCES) $(evry_plug_aspell_la_SOURCES) \
+	$(evry_plug_border_la_SOURCES) $(evry_plug_calc_la_SOURCES) \
+	$(evry_plug_config_la_SOURCES) \
+	$(evry_plug_dir_browse_la_SOURCES) \
+	$(evry_plug_tracker_la_SOURCES)
+DIST_SOURCES = $(evry_plug_apps_la_SOURCES) \
+	$(evry_plug_aspell_la_SOURCES) $(evry_plug_border_la_SOURCES) \
+	$(evry_plug_calc_la_SOURCES) $(evry_plug_config_la_SOURCES) \
+	$(evry_plug_dir_browse_la_SOURCES) \
+	$(evry_plug_tracker_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+plugindir = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+evry_plug_appsdir = $(plugindir)
+evry_plug_apps_LTLIBRARIES = evry_plug_apps.la
+evry_plug_apps_la_SOURCES = evry_plug_apps.c
+evry_plug_apps_la_LIBADD = @e_libs@
+evry_plug_apps_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_apps_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_borderdir = $(plugindir)
+evry_plug_border_LTLIBRARIES = evry_plug_border.la
+evry_plug_border_la_SOURCES = evry_plug_border.c
+evry_plug_border_la_LIBADD = @e_libs@
+evry_plug_border_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_border_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_dir_browsedir = $(plugindir)
+evry_plug_dir_browse_LTLIBRARIES = evry_plug_dir_browse.la
+evry_plug_dir_browse_la_SOURCES = evry_plug_dir_browse.c
+evry_plug_dir_browse_la_LIBADD = @e_libs@
+evry_plug_dir_browse_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_dir_browse_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_trackerdir = $(plugindir)
+evry_plug_tracker_LTLIBRARIES = evry_plug_tracker.la
+evry_plug_tracker_la_SOURCES = evry_plug_tracker.c
+evry_plug_tracker_la_LIBADD = @e_libs@
+evry_plug_tracker_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_tracker_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_calcdir = $(plugindir)
+evry_plug_calc_LTLIBRARIES = evry_plug_calc.la
+evry_plug_calc_la_SOURCES = evry_plug_calc.c
+evry_plug_calc_la_LIBADD = @e_libs@
+evry_plug_calc_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_calc_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_configdir = $(plugindir)
+evry_plug_config_LTLIBRARIES = evry_plug_config.la
+evry_plug_config_la_SOURCES = evry_plug_config.c
+evry_plug_config_la_LIBADD = @e_libs@
+evry_plug_config_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_config_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_aspelldir = $(plugindir)
+evry_plug_aspell_LTLIBRARIES = evry_plug_aspell.la
+evry_plug_aspell_la_SOURCES = evry_plug_aspell.c
+evry_plug_aspell_la_LIBADD = @e_libs@
+evry_plug_aspell_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_aspell_la_LIBTOOLFLAGS = --tag=disable-static
+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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/everything/sources/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/everything/sources/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
+install-evry_plug_appsLTLIBRARIES: $(evry_plug_apps_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_appsdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_appsdir)"
+	@list='$(evry_plug_apps_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_appsLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_appsdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_appsLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_appsdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_appsLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_apps_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_appsdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_appsdir)/$$p"; \
+	done
+
+clean-evry_plug_appsLTLIBRARIES:
+	-test -z "$(evry_plug_apps_LTLIBRARIES)" || rm -f $(evry_plug_apps_LTLIBRARIES)
+	@list='$(evry_plug_apps_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
+install-evry_plug_aspellLTLIBRARIES: $(evry_plug_aspell_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_aspelldir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_aspelldir)"
+	@list='$(evry_plug_aspell_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_aspellLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_aspelldir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_aspellLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_aspelldir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_aspellLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_aspell_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_aspelldir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_aspelldir)/$$p"; \
+	done
+
+clean-evry_plug_aspellLTLIBRARIES:
+	-test -z "$(evry_plug_aspell_LTLIBRARIES)" || rm -f $(evry_plug_aspell_LTLIBRARIES)
+	@list='$(evry_plug_aspell_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
+install-evry_plug_borderLTLIBRARIES: $(evry_plug_border_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_borderdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_borderdir)"
+	@list='$(evry_plug_border_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_borderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_borderdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_borderLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_borderdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_borderLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_border_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_borderdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_borderdir)/$$p"; \
+	done
+
+clean-evry_plug_borderLTLIBRARIES:
+	-test -z "$(evry_plug_border_LTLIBRARIES)" || rm -f $(evry_plug_border_LTLIBRARIES)
+	@list='$(evry_plug_border_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
+install-evry_plug_calcLTLIBRARIES: $(evry_plug_calc_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_calcdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_calcdir)"
+	@list='$(evry_plug_calc_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_calcLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_calcdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_calcLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_calcdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_calcLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_calc_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_calcdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_calcdir)/$$p"; \
+	done
+
+clean-evry_plug_calcLTLIBRARIES:
+	-test -z "$(evry_plug_calc_LTLIBRARIES)" || rm -f $(evry_plug_calc_LTLIBRARIES)
+	@list='$(evry_plug_calc_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
+install-evry_plug_configLTLIBRARIES: $(evry_plug_config_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_configdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_configdir)"
+	@list='$(evry_plug_config_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_configLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_configdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_configLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_configdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_configLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_config_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_configdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_configdir)/$$p"; \
+	done
+
+clean-evry_plug_configLTLIBRARIES:
+	-test -z "$(evry_plug_config_LTLIBRARIES)" || rm -f $(evry_plug_config_LTLIBRARIES)
+	@list='$(evry_plug_config_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
+install-evry_plug_dir_browseLTLIBRARIES: $(evry_plug_dir_browse_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_dir_browsedir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_dir_browsedir)"
+	@list='$(evry_plug_dir_browse_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_dir_browseLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_dir_browsedir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_dir_browseLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_dir_browsedir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_dir_browseLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_dir_browse_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_dir_browsedir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_dir_browsedir)/$$p"; \
+	done
+
+clean-evry_plug_dir_browseLTLIBRARIES:
+	-test -z "$(evry_plug_dir_browse_LTLIBRARIES)" || rm -f $(evry_plug_dir_browse_LTLIBRARIES)
+	@list='$(evry_plug_dir_browse_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
+install-evry_plug_trackerLTLIBRARIES: $(evry_plug_tracker_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_trackerdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_trackerdir)"
+	@list='$(evry_plug_tracker_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_trackerLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_trackerdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_trackerLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_trackerdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_trackerLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_tracker_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_trackerdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_trackerdir)/$$p"; \
+	done
+
+clean-evry_plug_trackerLTLIBRARIES:
+	-test -z "$(evry_plug_tracker_LTLIBRARIES)" || rm -f $(evry_plug_tracker_LTLIBRARIES)
+	@list='$(evry_plug_tracker_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
+evry_plug_apps.la: $(evry_plug_apps_la_OBJECTS) $(evry_plug_apps_la_DEPENDENCIES) 
+	$(evry_plug_apps_la_LINK) -rpath $(evry_plug_appsdir) $(evry_plug_apps_la_OBJECTS) $(evry_plug_apps_la_LIBADD) $(LIBS)
+evry_plug_aspell.la: $(evry_plug_aspell_la_OBJECTS) $(evry_plug_aspell_la_DEPENDENCIES) 
+	$(evry_plug_aspell_la_LINK) -rpath $(evry_plug_aspelldir) $(evry_plug_aspell_la_OBJECTS) $(evry_plug_aspell_la_LIBADD) $(LIBS)
+evry_plug_border.la: $(evry_plug_border_la_OBJECTS) $(evry_plug_border_la_DEPENDENCIES) 
+	$(evry_plug_border_la_LINK) -rpath $(evry_plug_borderdir) $(evry_plug_border_la_OBJECTS) $(evry_plug_border_la_LIBADD) $(LIBS)
+evry_plug_calc.la: $(evry_plug_calc_la_OBJECTS) $(evry_plug_calc_la_DEPENDENCIES) 
+	$(evry_plug_calc_la_LINK) -rpath $(evry_plug_calcdir) $(evry_plug_calc_la_OBJECTS) $(evry_plug_calc_la_LIBADD) $(LIBS)
+evry_plug_config.la: $(evry_plug_config_la_OBJECTS) $(evry_plug_config_la_DEPENDENCIES) 
+	$(evry_plug_config_la_LINK) -rpath $(evry_plug_configdir) $(evry_plug_config_la_OBJECTS) $(evry_plug_config_la_LIBADD) $(LIBS)
+evry_plug_dir_browse.la: $(evry_plug_dir_browse_la_OBJECTS) $(evry_plug_dir_browse_la_DEPENDENCIES) 
+	$(evry_plug_dir_browse_la_LINK) -rpath $(evry_plug_dir_browsedir) $(evry_plug_dir_browse_la_OBJECTS) $(evry_plug_dir_browse_la_LIBADD) $(LIBS)
+evry_plug_tracker.la: $(evry_plug_tracker_la_OBJECTS) $(evry_plug_tracker_la_DEPENDENCIES) 
+	$(evry_plug_tracker_la_LINK) -rpath $(evry_plug_trackerdir) $(evry_plug_tracker_la_OBJECTS) $(evry_plug_tracker_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_apps_la-evry_plug_apps.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_aspell_la-evry_plug_aspell.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_border_la-evry_plug_border.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_calc_la-evry_plug_calc.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_config_la-evry_plug_config.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_dir_browse_la-evry_plug_dir_browse.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_tracker_la-evry_plug_tracker.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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 $@ $<
+
+evry_plug_apps_la-evry_plug_apps.lo: evry_plug_apps.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_apps_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_apps_la-evry_plug_apps.lo -MD -MP -MF $(DEPDIR)/evry_plug_apps_la-evry_plug_apps.Tpo -c -o evry_plug_apps_la-evry_plug_apps.lo `test -f 'evry_plug_apps.c' || echo '$(srcdir)/'`evry_plug_apps.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_apps_la-evry_plug_apps.Tpo $(DEPDIR)/evry_plug_apps_la-evry_plug_apps.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_apps.c' object='evry_plug_apps_la-evry_plug_apps.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_apps_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_apps_la-evry_plug_apps.lo `test -f 'evry_plug_apps.c' || echo '$(srcdir)/'`evry_plug_apps.c
+
+evry_plug_aspell_la-evry_plug_aspell.lo: evry_plug_aspell.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_aspell_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_aspell_la-evry_plug_aspell.lo -MD -MP -MF $(DEPDIR)/evry_plug_aspell_la-evry_plug_aspell.Tpo -c -o evry_plug_aspell_la-evry_plug_aspell.lo `test -f 'evry_plug_aspell.c' || echo '$(srcdir)/'`evry_plug_aspell.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_aspell_la-evry_plug_aspell.Tpo $(DEPDIR)/evry_plug_aspell_la-evry_plug_aspell.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_aspell.c' object='evry_plug_aspell_la-evry_plug_aspell.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_aspell_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_aspell_la-evry_plug_aspell.lo `test -f 'evry_plug_aspell.c' || echo '$(srcdir)/'`evry_plug_aspell.c
+
+evry_plug_border_la-evry_plug_border.lo: evry_plug_border.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_border_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_border_la-evry_plug_border.lo -MD -MP -MF $(DEPDIR)/evry_plug_border_la-evry_plug_border.Tpo -c -o evry_plug_border_la-evry_plug_border.lo `test -f 'evry_plug_border.c' || echo '$(srcdir)/'`evry_plug_border.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_border_la-evry_plug_border.Tpo $(DEPDIR)/evry_plug_border_la-evry_plug_border.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_border.c' object='evry_plug_border_la-evry_plug_border.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_border_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_border_la-evry_plug_border.lo `test -f 'evry_plug_border.c' || echo '$(srcdir)/'`evry_plug_border.c
+
+evry_plug_calc_la-evry_plug_calc.lo: evry_plug_calc.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_calc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_calc_la-evry_plug_calc.lo -MD -MP -MF $(DEPDIR)/evry_plug_calc_la-evry_plug_calc.Tpo -c -o evry_plug_calc_la-evry_plug_calc.lo `test -f 'evry_plug_calc.c' || echo '$(srcdir)/'`evry_plug_calc.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_calc_la-evry_plug_calc.Tpo $(DEPDIR)/evry_plug_calc_la-evry_plug_calc.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_calc.c' object='evry_plug_calc_la-evry_plug_calc.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_calc_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_calc_la-evry_plug_calc.lo `test -f 'evry_plug_calc.c' || echo '$(srcdir)/'`evry_plug_calc.c
+
+evry_plug_config_la-evry_plug_config.lo: evry_plug_config.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_config_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_config_la-evry_plug_config.lo -MD -MP -MF $(DEPDIR)/evry_plug_config_la-evry_plug_config.Tpo -c -o evry_plug_config_la-evry_plug_config.lo `test -f 'evry_plug_config.c' || echo '$(srcdir)/'`evry_plug_config.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_config_la-evry_plug_config.Tpo $(DEPDIR)/evry_plug_config_la-evry_plug_config.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_config.c' object='evry_plug_config_la-evry_plug_config.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_config_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_config_la-evry_plug_config.lo `test -f 'evry_plug_config.c' || echo '$(srcdir)/'`evry_plug_config.c
+
+evry_plug_dir_browse_la-evry_plug_dir_browse.lo: evry_plug_dir_browse.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_dir_browse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_dir_browse_la-evry_plug_dir_browse.lo -MD -MP -MF $(DEPDIR)/evry_plug_dir_browse_la-evry_plug_dir_browse.Tpo -c -o evry_plug_dir_browse_la-evry_plug_dir_browse.lo `test -f 'evry_plug_dir_browse.c' || echo '$(srcdir)/'`evry_plug_dir_browse.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_dir_browse_la-evry_plug_dir_browse.Tpo $(DEPDIR)/evry_plug_dir_browse_la-evry_plug_dir_browse.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_dir_browse.c' object='evry_plug_dir_browse_la-evry_plug_dir_browse.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_dir_browse_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_dir_browse_la-evry_plug_dir_browse.lo `test -f 'evry_plug_dir_browse.c' || echo '$(srcdir)/'`evry_plug_dir_browse.c
+
+evry_plug_tracker_la-evry_plug_tracker.lo: evry_plug_tracker.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_tracker_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_tracker_la-evry_plug_tracker.lo -MD -MP -MF $(DEPDIR)/evry_plug_tracker_la-evry_plug_tracker.Tpo -c -o evry_plug_tracker_la-evry_plug_tracker.lo `test -f 'evry_plug_tracker.c' || echo '$(srcdir)/'`evry_plug_tracker.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_tracker_la-evry_plug_tracker.Tpo $(DEPDIR)/evry_plug_tracker_la-evry_plug_tracker.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_tracker.c' object='evry_plug_tracker_la-evry_plug_tracker.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_tracker_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_tracker_la-evry_plug_tracker.lo `test -f 'evry_plug_tracker.c' || echo '$(srcdir)/'`evry_plug_tracker.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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)
+installdirs:
+	for dir in "$(DESTDIR)$(evry_plug_appsdir)" "$(DESTDIR)$(evry_plug_aspelldir)" "$(DESTDIR)$(evry_plug_borderdir)" "$(DESTDIR)$(evry_plug_calcdir)" "$(DESTDIR)$(evry_plug_configdir)" "$(DESTDIR)$(evry_plug_dir_browsedir)" "$(DESTDIR)$(evry_plug_trackerdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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-evry_plug_appsLTLIBRARIES \
+	clean-evry_plug_aspellLTLIBRARIES \
+	clean-evry_plug_borderLTLIBRARIES \
+	clean-evry_plug_calcLTLIBRARIES \
+	clean-evry_plug_configLTLIBRARIES \
+	clean-evry_plug_dir_browseLTLIBRARIES \
+	clean-evry_plug_trackerLTLIBRARIES clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-evry_plug_appsLTLIBRARIES \
+	install-evry_plug_aspellLTLIBRARIES \
+	install-evry_plug_borderLTLIBRARIES \
+	install-evry_plug_calcLTLIBRARIES \
+	install-evry_plug_configLTLIBRARIES \
+	install-evry_plug_dir_browseLTLIBRARIES \
+	install-evry_plug_trackerLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-evry_plug_appsLTLIBRARIES \
+	uninstall-evry_plug_aspellLTLIBRARIES \
+	uninstall-evry_plug_borderLTLIBRARIES \
+	uninstall-evry_plug_calcLTLIBRARIES \
+	uninstall-evry_plug_configLTLIBRARIES \
+	uninstall-evry_plug_dir_browseLTLIBRARIES \
+	uninstall-evry_plug_trackerLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-evry_plug_appsLTLIBRARIES \
+	clean-evry_plug_aspellLTLIBRARIES \
+	clean-evry_plug_borderLTLIBRARIES \
+	clean-evry_plug_calcLTLIBRARIES \
+	clean-evry_plug_configLTLIBRARIES \
+	clean-evry_plug_dir_browseLTLIBRARIES \
+	clean-evry_plug_trackerLTLIBRARIES clean-generic clean-libtool \
+	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-dvi install-dvi-am \
+	install-evry_plug_appsLTLIBRARIES \
+	install-evry_plug_aspellLTLIBRARIES \
+	install-evry_plug_borderLTLIBRARIES \
+	install-evry_plug_calcLTLIBRARIES \
+	install-evry_plug_configLTLIBRARIES \
+	install-evry_plug_dir_browseLTLIBRARIES \
+	install-evry_plug_trackerLTLIBRARIES install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am 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-evry_plug_appsLTLIBRARIES \
+	uninstall-evry_plug_aspellLTLIBRARIES \
+	uninstall-evry_plug_borderLTLIBRARIES \
+	uninstall-evry_plug_calcLTLIBRARIES \
+	uninstall-evry_plug_configLTLIBRARIES \
+	uninstall-evry_plug_dir_browseLTLIBRARIES \
+	uninstall-evry_plug_trackerLTLIBRARIES
+
+# 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/everything/sources/evry_plug_apps.c b/src/modules/everything/sources/evry_plug_apps.c
new file mode 100644
index 0000000..d572d85
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_apps.c
@@ -0,0 +1,989 @@
+#include "e_mod_main.h"
+
+
+typedef struct _Plugin Plugin;
+
+struct _Plugin
+{
+  Evry_Plugin base;
+  Eina_List *apps_mime;
+  Eina_List *apps_all;
+  const Evry_Item *candidate;
+  Eina_Hash *added;
+};
+
+/* taken from exebuf module */
+typedef struct _E_Exe E_Exe;
+typedef struct _E_Exe_List E_Exe_List;
+
+struct _E_Exe
+{
+  const char *path;
+};
+
+struct _E_Exe_List
+{
+  Eina_List *list;
+};
+
+static Plugin *p1 = NULL;
+static Plugin *p2 = NULL;
+static Evry_Action *act = NULL;
+static Evry_Action *act1 = NULL;
+static Evry_Action *act2 = NULL;
+static Evry_Action *act3 = NULL;
+static Evry_Action *act4 = NULL;
+static Evry_Action *act5 = NULL;
+
+static Eina_List *exe_path = NULL;
+static Ecore_Idler *exe_scan_idler = NULL;
+static E_Config_DD *exelist_exe_edd = NULL;
+static E_Config_DD *exelist_edd = NULL;
+static DIR       *exe_dir = NULL;
+static Eina_List *exe_list = NULL;
+static Eina_List *exe_list2 = NULL;
+static Eina_Hash *added = NULL;
+
+static int _scan_idler(void *data);
+
+
+static void _hash_free(void *data)
+{
+   ITEM_APP(app, data);
+   evry_item_free(EVRY_ITEM(app));
+}
+
+
+static Evry_Plugin *
+_begin_open_with(Evry_Plugin *plugin, const Evry_Item *item)
+{
+   PLUGIN(p, plugin);
+
+   const char *mime;
+
+   if (!item) return 0;
+
+   ITEM_FILE(file, item);
+   Efreet_Desktop *desktop;
+
+   if (!file->uri) return NULL;
+
+   if (!file->mime)
+     mime = efreet_mime_type_get(file->uri);
+   else
+     mime = file->mime;
+
+   if (!mime) return NULL;
+
+   p->candidate = item;
+   p->apps_mime = efreet_util_desktop_mime_list(mime);
+   desktop = e_exehist_mime_desktop_get(mime);
+   if (desktop)
+     {
+	efreet_desktop_ref(desktop);
+	p->apps_mime = eina_list_prepend(p->apps_mime, desktop);
+     }
+
+   p->added = added;
+   if (!p->added)
+     p->added = eina_hash_string_small_new(_hash_free);
+   added = p->added;
+
+   return plugin;
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *plugin, const Evry_Item *item)
+{
+   PLUGIN(p, plugin);
+
+   /* taken from exebuf module */
+   char *path, *pp, *last;
+   E_Exe_List *el;
+
+   el = e_config_domain_load("exebuf_exelist_cache", exelist_edd);
+   if (el)
+     {
+	E_Exe *ee;
+
+	EINA_LIST_FREE(el->list, ee)
+	  {
+	     exe_list = eina_list_append(exe_list, strdup(ee->path));
+	     eina_stringshare_del(ee->path);
+	     free(ee);
+	  }
+	free(el);
+     }
+   path = getenv("PATH");
+   if (path)
+     {
+	path = strdup(path);
+	last = path;
+	for (pp = path; pp[0]; pp++)
+	  {
+	     if (pp[0] == ':') pp[0] = '\0';
+	     if (pp[0] == 0)
+	       {
+		  exe_path = eina_list_append(exe_path, strdup(last));
+		  last = pp + 1;
+	       }
+	  }
+	if (pp > last)
+	  exe_path = eina_list_append(exe_path, strdup(last));
+	free(path);
+     }
+
+   exe_scan_idler = ecore_idler_add(_scan_idler, NULL);
+
+   p->added = eina_hash_string_small_new(_hash_free);
+
+   return plugin;
+}
+
+static void
+_item_free(Evry_Item *item)
+{
+   ITEM_APP(app, item);
+
+   if (app->desktop)
+     efreet_desktop_free(app->desktop);
+   if (app->file)
+     eina_stringshare_del(app->file);
+
+   E_FREE(app);
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+   Efreet_Desktop *desktop;
+   char *str;
+
+   /* TODO popup end func !!!
+      - cleanup hash for open-with plugin */
+   if (added)
+     eina_hash_free(added);
+   added = NULL;
+
+   if (p->added)
+     eina_hash_free(p->added);
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   EINA_LIST_FREE(p->apps_all, desktop)
+     efreet_desktop_free(desktop);
+
+   if (exe_dir)
+     {
+	closedir(exe_dir);
+	exe_dir = NULL;
+     }
+   EINA_LIST_FREE(exe_path, str)
+     free(str);
+
+   if (exe_scan_idler)
+     {
+	ecore_idler_del(exe_scan_idler);
+	exe_scan_idler = NULL;
+     }
+   EINA_LIST_FREE(exe_list, str)
+     free(str);
+   EINA_LIST_FREE(exe_list2, str)
+     free(str);
+}
+
+static void
+_cleanup_open_with(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+   Efreet_Desktop *desktop;
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   EINA_LIST_FREE(p->apps_mime, desktop)
+     efreet_desktop_free(desktop);
+
+   EINA_LIST_FREE(p->apps_all, desktop)
+     efreet_desktop_free(desktop);
+}
+
+static Evry_Item_App *
+_item_add(Plugin *p, Efreet_Desktop *desktop, char *file, int match)
+{
+   Evry_Item_App *app;
+   Efreet_Desktop *d2;
+   int already_refd = 0;
+   char *exe;
+
+   if (file)
+     {
+	Eina_List *l;
+	int len;
+	char buf[1024];
+	char *tmp;
+
+	if ((app = eina_hash_find(p->added, file)))
+	  {
+	     if (!eina_list_data_find_list(EVRY_PLUGIN(p)->items, app))
+	       {
+		  EVRY_ITEM(app)->fuzzy_match = match;
+		  EVRY_ITEM(app)->plugin = EVRY_PLUGIN(p);
+		  EVRY_PLUGIN_ITEM_APPEND(p, app);
+	       }
+	     return app;
+	  }
+
+	len = strlen(file);
+	tmp = ecore_file_app_exe_get(file);
+	snprintf(buf, sizeof(buf), "%s*", tmp);
+	l = efreet_util_desktop_exec_glob_list(buf);
+
+	EINA_LIST_FREE(l, d2)
+	  {
+	     if (!desktop && d2->exec && !strncmp(file, d2->exec, len))
+	       {
+		  desktop = d2;
+		  already_refd = 1;
+		  efreet_desktop_ref(desktop);
+	       }
+	     efreet_desktop_free(d2);
+	  }
+	free(tmp);
+     }
+
+   if (desktop)
+     exe = desktop->exec;
+   else
+     exe = file;
+
+   if (!exe) return NULL;
+
+   if ((app = eina_hash_find(p->added, exe)) &&
+       (!desktop || (desktop == app->desktop)))
+     {
+	if (!eina_list_data_find_list(EVRY_PLUGIN(p)->items, app))
+	  {
+	     EVRY_ITEM(app)->fuzzy_match = match;
+	     EVRY_ITEM(app)->plugin = EVRY_PLUGIN(p);
+	     EVRY_PLUGIN_ITEM_APPEND(p, app);
+	  }
+	return app;
+     }
+
+   if (desktop && !already_refd)
+     efreet_desktop_ref(desktop);
+
+   app = E_NEW(Evry_Item_App, 1);
+
+   if (desktop)
+     {
+       evry_item_new(EVRY_ITEM(app), EVRY_PLUGIN(p), desktop->name, _item_free);
+       EVRY_ITEM(app)->id = eina_stringshare_add(desktop->exec);
+     }
+   else
+     {
+       evry_item_new(EVRY_ITEM(app), EVRY_PLUGIN(p), file, _item_free);
+       EVRY_ITEM(app)->id = eina_stringshare_add(file);
+     }
+   
+   app->desktop = desktop;
+
+   /* XXX check required ? */
+   if (file)
+     app->file = eina_stringshare_add(file);
+   
+   eina_hash_add(p->added, exe, app);
+
+   if (desktop)
+     {
+	const char *tmp = ecore_file_file_get(desktop->exec);
+
+	if (tmp && strcmp(exe, tmp))
+	  {
+	     evry_item_ref(EVRY_ITEM(app));
+	     eina_hash_add(p->added, tmp, app);
+	  }
+     }
+   if (file && strcmp(exe, file))
+     {
+	evry_item_ref(EVRY_ITEM(app));
+	eina_hash_add(p->added, file, app);
+     }
+
+   EVRY_ITEM(app)->fuzzy_match = match;
+   EVRY_PLUGIN_ITEM_APPEND(p, app);
+
+   return app;
+}
+
+static void
+_add_desktop_list(Plugin *p, Eina_List *apps, const char *input)
+{
+   Efreet_Desktop *desktop;
+   Eina_List *l;
+   int m1, m2;
+
+   EINA_LIST_FOREACH(apps, l, desktop)
+     {
+	if (eina_list_count(EVRY_PLUGIN(p)->items) > 199) continue;
+	if (!desktop->name || !desktop->exec) continue;
+
+	char *exec = strrchr(desktop->exec, '/');
+	if (!exec++ || !exec) exec = desktop->exec;
+
+	m1 = evry_fuzzy_match(exec, input);
+	m2 = evry_fuzzy_match(desktop->name, input);
+
+	if (!m1 || (m2 && m2 < m1))
+	  m1 = m2;
+
+	if (m1) _item_add(p, desktop, NULL, m1);
+     }
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+   const char *e1, *e2;
+   double t1, t2;
+
+   ITEM_APP(app1, it1);
+   ITEM_APP(app2, it2);
+
+   if (app1->desktop)
+     e1 = app1->desktop->exec;
+   else
+     e1 = app1->file;
+
+   if (app2->desktop)
+     e2 = app2->desktop->exec;
+   else
+     e2 = app2->file;
+
+   t1 = e_exehist_newest_run_get(e1);
+   t2 = e_exehist_newest_run_get(e2);
+
+   if (it1->fuzzy_match && !it2->fuzzy_match)
+     return -1;
+
+   if (!it1->fuzzy_match && it2->fuzzy_match)
+     return 1;
+
+   t1 = t1 / (double)it1->fuzzy_match;
+   t2 = t2 / (double)it2->fuzzy_match;
+
+   if ((int)(t2 - t1))
+     return (int)(t2 - t1);
+
+   if (it1->fuzzy_match - it2->fuzzy_match)
+     return (it1->fuzzy_match - it2->fuzzy_match);
+
+   else return 0;
+}
+
+static Eina_Bool
+_hist_items_add_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+{
+  History_Entry *he = data;
+  History_Item *hi;
+  Plugin *p = fdata;
+  Efreet_Desktop *d;
+  Eina_List *l;
+    
+  EINA_LIST_FOREACH(he->items, l, hi)
+    {
+      if (hi->plugin != p->base.name)
+	continue;
+      
+      if ((d = efreet_util_desktop_exec_find(key)))
+	_item_add(p, d, NULL, 1);
+      else
+	_item_add(p, NULL, (char *) key, 1);
+    }
+  return EINA_TRUE;
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   PLUGIN(p, plugin);
+   Eina_List *l;
+   Efreet_Desktop *desktop;
+   Evry_Item *it;
+   char *file;
+   int prio = 0;
+   int len = input ? strlen(input) : 0;
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   /* add apps for a given mimetype */
+   if (plugin->type == type_action)
+     {
+	if (input)
+	  _add_desktop_list(p, p->apps_mime, input);
+	else
+	  {
+	     EINA_LIST_FOREACH(p->apps_mime, l, desktop)
+	       _item_add(p, desktop, NULL, 1);
+	  }
+     }
+
+   /* add apps matching input */
+   if (input)
+     {
+	if (!p->apps_all)
+	  {
+	     Eina_List *apps = NULL;
+	     Eina_List *cat_ss, *cat_app, *cat_sys, *cat_set;
+	     Eina_List *l, *ll;
+
+	     apps = efreet_util_desktop_name_glob_list("*");
+	     cat_ss = efreet_util_desktop_category_list("Screensaver");
+
+	     EINA_LIST_FOREACH(cat_ss, l, desktop)
+	       {
+		  ll = eina_list_data_find_list(apps, desktop);
+		  if (ll)
+		    {
+		       efreet_desktop_free(desktop);
+		       apps = eina_list_remove_list(apps, ll);
+		    }
+	       }
+	     cat_sys = efreet_util_desktop_category_list("System");
+	     cat_app = efreet_util_desktop_category_list("Applications");
+	     cat_set = efreet_util_desktop_category_list("Settings");
+
+	     EINA_LIST_FOREACH(cat_sys, l, desktop)
+	       {
+		  if (eina_list_data_find_list(cat_set, desktop)) continue;
+		  if (eina_list_data_find_list(cat_app, desktop)) continue;
+
+		  ll = eina_list_data_find_list(apps, desktop);
+		  if (ll)
+		    {
+		       efreet_desktop_free(desktop);
+		       apps = eina_list_remove_list(apps, ll);
+		    }
+	       }
+
+	     p->apps_all = apps;
+	  }
+
+	_add_desktop_list(p, p->apps_all, input);
+     }
+   /* add exe history items */
+   else if (!plugin->items)
+     {
+   	/* l = e_exehist_list_get();
+   	 * EINA_LIST_FREE(l, file)
+   	 *   _item_add(p, NULL, file, 1); */
+
+	eina_hash_foreach(evry_hist->subjects, _hist_items_add_cb, p);
+     }
+
+   /* add executables */
+   if (input && len > 2)
+     {
+	char *space;
+	Evry_Item_App *app;
+	char buf[256];
+	if ((space = strchr(input, ' ')))
+	  len = (space - input);
+
+	EINA_LIST_FOREACH(exe_list, l, file)
+	  {
+	     if (!strncmp(file, input, len))
+	       {
+		  app = _item_add(p, NULL, file, 100);
+
+		  if (!app) continue;
+
+		  eina_stringshare_del(EVRY_ITEM(app)->label);
+		  if (!space)
+		    EVRY_ITEM(app)->label = eina_stringshare_add(file);
+		  else
+		    {
+		       snprintf(buf, sizeof(buf), "%s%s", file, space);
+		       EVRY_ITEM(app)->label = eina_stringshare_add(buf);
+		       eina_stringshare_del(app->file);
+		       app->file = eina_stringshare_add(buf);
+		    }
+	       }
+	  }
+     }
+
+   if (!plugin->items) return 0;
+
+   if (plugin->type != type_action || input)
+     EVRY_PLUGIN_ITEMS_SORT(plugin, _cb_sort);
+
+   EINA_LIST_FOREACH(plugin->items, l, it)
+     it->priority = prio++;
+
+   return 1;
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   ITEM_APP(app, it);
+   Evas_Object *o = NULL;
+
+   if (app->desktop)
+     o = e_util_desktop_icon_add(app->desktop, 64, e);
+
+   if (!o)
+     o = evry_icon_theme_get("system-run", e);
+
+   return o;
+}
+
+static int
+_exec_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   /* ITEM_APP(app, it); */
+
+   /* if (app->desktop)
+    *   return 1; */
+
+   /* run in terminal or do a .desktop entry! it's easy now */
+   /* if (app->file && strlen(app->file) > 0)
+    *   return 1; */
+
+   return 1;
+}
+
+static int
+_exec_app_action(Evry_Action *act)
+{
+   return evry_util_exec_app(act->item1, act->item2);
+}
+
+static int
+_exec_term_action(Evry_Action *act)
+{
+   ITEM_APP(app, act->item1);
+   Evry_Item_App *tmp;
+   char buf[1024];
+   int ret;
+   char *escaped = ecore_file_escape_name(app->file);
+   
+   tmp = E_NEW(Evry_Item_App, 1);
+   snprintf(buf, sizeof(buf), "%s -hold -e %s",
+	    evry_conf->cmd_terminal,
+	    (escaped ? escaped : app->file));
+
+   tmp->file = buf;
+   ret = evry_util_exec_app(EVRY_ITEM(tmp), NULL);
+
+   E_FREE(tmp);
+   E_FREE(escaped);
+   
+   return ret;
+}
+
+static int
+_exec_term_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   ITEM_APP(app, it);
+
+   if (app->file)
+     return 1;
+
+   return 0;
+}
+
+static int
+_exec_sudo_action(Evry_Action *act)
+{
+   ITEM_APP(app, act->item1);
+   Evry_Item_App *tmp;
+   char buf[1024];
+   int ret;
+
+   tmp = E_NEW(Evry_Item_App, 1);
+   snprintf(buf, sizeof(buf), "%s %s",
+	    evry_conf->cmd_sudo,
+	    (app->desktop ? app->desktop->exec : app->file));
+
+   tmp->file = buf;
+   ret = evry_util_exec_app(EVRY_ITEM(tmp), NULL);
+
+   E_FREE(tmp);
+
+   return ret;
+}
+
+static int
+_open_with_action(Evry_Plugin *plugin, const Evry_Item *it)
+{
+   PLUGIN(p, plugin);
+
+   if (p->candidate)
+     return evry_util_exec_app(it, p->candidate);
+
+   return 0;
+}
+
+static int
+_edit_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   ITEM_APP(app, it);
+
+   if (app->desktop)
+     return 1;
+
+   return 0;
+}
+
+static int
+_edit_app_action(Evry_Action *act)
+{
+   Efreet_Desktop *desktop;
+   ITEM_APP(app, act->item1);
+
+   if (app->desktop)
+     desktop = app->desktop;
+   else
+     {
+	char buf[128];
+	snprintf(buf, 128, "%s/.local/share/applications/%s.desktop",
+		 e_user_homedir_get(), app->file);
+	desktop = efreet_desktop_empty_new(eina_stringshare_add(buf));
+	/* XXX check if this is freed by efreet*/
+	desktop->exec = strdup(app->file);
+     }
+
+   e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
+
+   return 1;
+}
+
+static int
+_new_app_check_item(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   ITEM_APP(app, it);
+
+   if (app->desktop)
+     return 1;
+
+   if (app->file && strlen(app->file) > 0)
+     return 1;
+
+   return 0;
+}
+
+static int
+_new_app_action(Evry_Action *act)
+{
+   char *name;
+   char buf[4096];
+   char *end;
+   Efreet_Desktop *desktop;
+   int i;
+
+   ITEM_APP(app, act->item1);
+
+   if (app->desktop)
+     name = strdup(app->desktop->name);
+   else
+     /* TODO replace '/' and remove other special characters */
+     name = strdup(app->file);
+
+   if ((end = strchr(name, ' ')))
+     name[end - name] = '\0';
+
+   for (i = 0; i < 10; i++)
+     {
+	snprintf(buf, 4096, "%s/.local/share/applications/%s-%d.desktop",
+		 e_user_homedir_get(), name, i);
+	if (ecore_file_exists(buf))
+	  {
+	     buf[0] = '\0';
+	     continue;
+	  }
+	else break;
+     }
+
+   free(name);
+
+   if (strlen(buf) == 0)
+     return 0;
+
+   if (!app->desktop)
+     {
+	desktop = efreet_desktop_empty_new(buf);
+	desktop->exec = strdup(app->file);
+     }
+   else
+     {
+	efreet_desktop_save_as(app->desktop, buf);
+	desktop = efreet_desktop_new(buf);
+     }
+
+   e_desktop_edit(e_container_current_get(e_manager_current_get()), desktop);
+
+   return 1;
+}
+
+#define TIME_FACTOR(_now) (1.0 - (evry_hist->begin / _now)) / 1000000000000000.0
+
+static Eina_Bool
+_init(void)
+{
+   p1 = E_NEW(Plugin, 1);
+   evry_plugin_new(EVRY_PLUGIN(p1), "Applications", type_subject, "", "APPLICATION", 0, NULL, NULL,
+		   _begin, _cleanup, _fetch, NULL, _icon_get, NULL, NULL);
+
+   p2 = E_NEW(Plugin, 1);
+   evry_plugin_new(EVRY_PLUGIN(p2), "Open With...", type_action, "FILE", "", 0, NULL, NULL,
+		   _begin_open_with, _cleanup_open_with, _fetch, _open_with_action,
+		   _icon_get, NULL, NULL);
+
+   evry_plugin_register(EVRY_PLUGIN(p1), 1);
+   evry_plugin_register(EVRY_PLUGIN(p2), 1);
+
+   act = evry_action_new("Launch", "APPLICATION", NULL, NULL,
+			 "everything-launch",
+			 _exec_app_action, _exec_app_check_item,
+			 NULL, NULL,NULL);
+
+   act1 = evry_action_new("Open File...", "APPLICATION", "FILE", "APPLICATION",
+			  "document-open",
+			  _exec_app_action, _exec_app_check_item,
+			  NULL, NULL, NULL);
+
+   act2 = evry_action_new("Run in Terminal", "APPLICATION", NULL, NULL,
+			  "system-run",
+			  _exec_term_action, _exec_term_check_item,
+			  NULL, NULL, NULL);
+
+   act3 = evry_action_new("Edit Application Entry", "APPLICATION", NULL, NULL,
+			  "everything-launch",
+			  _edit_app_action, _edit_app_check_item,
+			  NULL, NULL, NULL);
+
+   act4 = evry_action_new("New Application Entry", "APPLICATION", NULL, NULL,
+			  "everything-launch",
+			  _new_app_action, _new_app_check_item,
+			  NULL, NULL, NULL);
+
+   act5 = evry_action_new("Run with Sudo", "APPLICATION", NULL, NULL,
+			  "system-run",
+			  _exec_sudo_action, NULL, NULL, NULL, NULL);
+
+   evry_action_register(act,  0);
+   evry_action_register(act1, 1);
+   evry_action_register(act2, 2);
+   evry_action_register(act3, 3);
+   evry_action_register(act4, 4);
+   evry_action_register(act5, 5);
+
+   Eina_List *l, *ll;
+   const char *file, *name;
+   History_Entry *he;
+   History_Item *hi;
+   name = EVRY_PLUGIN(p1)->name;
+   double t;
+   int found = 0;
+
+   evry_history_load();
+   
+   EINA_LIST_FOREACH(e_exehist_list_get(), l, file)
+     {
+	t = e_exehist_newest_run_get(file);
+	he = eina_hash_find(evry_hist->subjects, file);
+
+	if (!he)
+	  {
+	     he = E_NEW(History_Entry, 1);
+	     eina_hash_add(evry_hist->subjects, file, he);
+	  }
+	else
+	  {
+	     EINA_LIST_FOREACH(he->items, ll, hi)
+	       {
+		  if (hi->plugin != name) continue;
+
+		  if (t > hi->last_used - 1.0)
+		    {
+		       hi->last_used = t;
+		       hi->usage += TIME_FACTOR(hi->last_used);
+		       hi->count = e_exehist_popularity_get(file);
+		    }
+		  found = 1;
+		  break;
+	       }
+
+	  }
+	
+	if (!found)
+	  {
+	     hi = E_NEW(History_Item, 1);
+	     hi->plugin = eina_stringshare_ref(name);
+	     hi->last_used = t;
+	     hi->count = e_exehist_popularity_get(file);
+	     hi->usage += TIME_FACTOR(hi->last_used);
+	     he->items = eina_list_append(he->items, hi);
+	  }
+	found = 0;
+     }
+   evry_history_unload();
+   
+   /* taken from e_exebuf.c */
+   exelist_exe_edd = E_CONFIG_DD_NEW("E_Exe", E_Exe);
+#undef T
+#undef D
+#define T E_Exe
+#define D exelist_exe_edd
+   E_CONFIG_VAL(D, T, path, STR);
+
+   exelist_edd = E_CONFIG_DD_NEW("E_Exe_List", E_Exe_List);
+#undef T
+#undef D
+#define T E_Exe_List
+#define D exelist_edd
+   E_CONFIG_LIST(D, T, list, exelist_exe_edd);
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(p1);
+   EVRY_PLUGIN_FREE(p2);
+
+   evry_action_free(act);
+   evry_action_free(act1);
+   evry_action_free(act2);
+   evry_action_free(act3);
+   evry_action_free(act4);
+   evry_action_free(act5);
+
+   E_CONFIG_DD_FREE(exelist_edd);
+   E_CONFIG_DD_FREE(exelist_exe_edd);
+}
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
+
+
+/* taken from e_exebuf.c */
+static int
+_scan_idler(void *data)
+{
+   struct stat st;
+   struct dirent *dp;
+   char *dir;
+   char buf[4096];
+
+   /* no more path items left - stop scanning */
+   if (!exe_path)
+     {
+	Eina_List *l, *l2;
+	E_Exe_List *el;
+	E_Exe *ee;
+	int different = 0;
+
+	/* FIXME: check wheter they match or not */
+	for (l = exe_list, l2 = exe_list2; l && l2; l = l->next, l2 = l2->next)
+	  {
+	     if (strcmp(l->data, l2->data))
+	       {
+		  different = 1;
+		  break;
+	       }
+	  }
+	if ((l) || (l2)) different = 1;
+	if (exe_list2)
+	  {
+	     while (exe_list)
+	       {
+		  free(eina_list_data_get(exe_list));
+		  exe_list = eina_list_remove_list(exe_list, exe_list);
+	       }
+	     exe_list = exe_list2;
+	     exe_list2 = NULL;
+	  }
+	if (different)
+	  {
+	     el = calloc(1, sizeof(E_Exe_List));
+	     if (el)
+	       {
+		  el->list = NULL;
+		  for (l = exe_list; l; l = l->next)
+		    {
+		       ee = malloc(sizeof(E_Exe));
+		       if (ee)
+			 {
+			    ee->path = eina_stringshare_add(l->data);
+			    el->list = eina_list_append(el->list, ee);
+			 }
+		    }
+		  e_config_domain_save("exebuf_exelist_cache", exelist_edd, el);
+		  while (el->list)
+		    {
+		       ee = eina_list_data_get(el->list);
+		       eina_stringshare_del(ee->path);
+		       free(ee);
+		       el->list = eina_list_remove_list(el->list, el->list);
+		    }
+		  free(el);
+	       }
+	  }
+	exe_scan_idler = NULL;
+	return 0;
+     }
+   /* no dir is open - open the first path item */
+   if (!exe_dir)
+     {
+	dir = exe_path->data;
+	exe_dir = opendir(dir);
+     }
+   /* if we have an opened dir - scan the next item */
+   if (exe_dir)
+     {
+	dir = exe_path->data;
+
+	dp = readdir(exe_dir);
+	if (dp)
+	  {
+	     if ((strcmp(dp->d_name, ".")) && (strcmp(dp->d_name, "..")))
+	       {
+		  snprintf(buf, sizeof(buf), "%s/%s", dir, dp->d_name);
+		  if ((stat(buf, &st) == 0) &&
+		      ((!S_ISDIR(st.st_mode)) &&
+		       (!access(buf, X_OK))))
+		    {
+		       if (!exe_list)
+			 exe_list = eina_list_append(exe_list, strdup(dp->d_name));
+		       else
+			 exe_list2 = eina_list_append(exe_list2, strdup(dp->d_name));
+		    }
+	       }
+	  }
+	else
+	  {
+	     /* we reached the end of a dir - remove the dir at the head
+	      * of the path list so we advance and next loop we will pick up
+	      * the next item, or if null- abort
+	      */
+	     closedir(exe_dir);
+	     exe_dir = NULL;
+	     free(eina_list_data_get(exe_path));
+	     exe_path = eina_list_remove_list(exe_path, exe_path);
+	  }
+     }
+   /* obviously the dir open failed - so remove the first path item */
+   else
+     {
+	free(eina_list_data_get(exe_path));
+	exe_path = eina_list_remove_list(exe_path, exe_path);
+     }
+   /* we have mroe scannign to do */
+   return 1;
+}
diff --git a/src/modules/everything/sources/evry_plug_aspell.c b/src/modules/everything/sources/evry_plug_aspell.c
new file mode 100644
index 0000000..1f419e7
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_aspell.c
@@ -0,0 +1,342 @@
+#include "Evry.h"
+#include <ctype.h>
+
+static const char TRIGGER[] = "aspell ";
+static const char LANG_MODIFIER[] = "lang=";
+
+typedef struct _Plugin Plugin;
+
+
+struct _Plugin
+{
+   Evry_Plugin base;
+   struct
+   {
+      Ecore_Event_Handler *data;
+      Ecore_Event_Handler *del;
+   } handler;
+   Ecore_Exe *exe;
+   const char *lang;
+   const char *input;
+   Eina_Bool is_first;
+};
+
+static Plugin *plugin = NULL;
+
+static Eina_Bool
+_exe_restart(Plugin *p)
+{
+   char cmd[1024];
+   const char *lang_opt, *lang_val;
+   int len;
+
+   if (p->lang && (p->lang[0] != '\0'))
+     {
+	lang_opt = "-l";
+	lang_val = p->lang;
+     }
+   else
+     {
+	lang_opt = "";
+	lang_val = "";
+     }
+
+   len = snprintf(cmd, sizeof(cmd),
+		  "aspell -a --encoding=UTF-8 %s%s",
+		  lang_opt, lang_val);
+   if (len >= (int)sizeof(cmd))
+     return 0;
+
+   if (p->exe)
+     ecore_exe_quit(p->exe);
+   p->exe = ecore_exe_pipe_run
+     (cmd,
+      ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+      ECORE_EXE_PIPE_WRITE,
+      NULL);
+   p->is_first = 1;
+   return !!p->exe;
+}
+
+static const char *
+_space_skip(const char *line)
+{
+   for (; *line != '\0'; line++)
+     if (!isspace(*line))
+       break;
+   return line;
+}
+
+static const char *
+_space_find(const char *line)
+{
+   for (; *line != '\0'; line++)
+     if (isspace(*line))
+       break;
+   return line;
+}
+
+static void
+_item_add(Plugin *p, const char *word, int word_size, int prio)
+{
+   Evry_Item *it;
+
+   it = evry_item_new(NULL, EVRY_PLUGIN(p), NULL, NULL);
+   if (!it) return;
+   it->priority = prio;
+   it->label = eina_stringshare_add_length(word, word_size);
+
+   EVRY_PLUGIN_ITEM_APPEND(p, it);
+}
+
+static void
+_suggestions_add(Plugin *p, const char *line)
+{
+   const char *s;
+
+   s = strchr(line, ':');
+   if (!s)
+     {
+	fprintf(stderr, "ASPELL: ERROR missing suggestion delimiter: '%s'\n",
+		line);
+	return;
+     }
+   s++;
+
+   line = _space_skip(s);
+   while (*line)
+     {
+	int len;
+
+	s = strchr(line, ',');
+	if (s)
+	  len = s - line;
+	else
+	  len = strlen(line);
+
+	_item_add(p, line, len, 1);
+
+	if (s)
+	  line = _space_skip(s + 1);
+	else
+	  break;
+     }
+}
+
+static int
+_cb_data(void *data, int type __UNUSED__, void *event)
+{
+   PLUGIN(p, data);
+   Ecore_Exe_Event_Data *e = event;
+   Ecore_Exe_Event_Data_Line *l;
+   const char *word;
+
+   if (e->exe != p->exe)
+     return 1;
+
+   EVRY_PLUGIN_ITEMS_FREE(p);
+
+   word = p->input;
+   for (l = e->lines; l && l->line; l++)
+     {
+	const char *word_end;
+	int word_size;
+
+	if (p->is_first)
+	  {
+	     fprintf(stderr, "ASPELL: %s\n", l->line);
+	     p->is_first = 0;
+	     continue;
+	  }
+
+	word_end = _space_find(word);
+	word_size = word_end - word;
+
+	switch (l->line[0])
+	  {
+	   case '*':
+	      _item_add(plugin, word, word_size, 1);
+	      break;
+	   case '&':
+	      _item_add(plugin, word, word_size, 1);
+	      _suggestions_add(plugin, l->line);
+	      break;
+	   case '#':
+	      break;
+	   case '\0':
+	      break;
+	   default:
+	      fprintf(stderr, "ASPELL: unknown output: '%s'\n", l->line);
+	  }
+
+	if (*word_end)
+	  word = _space_skip(word_end + 1);
+     }
+
+   if (EVRY_PLUGIN(p)->items)
+     {
+	evry_list_win_show();
+     }
+
+   evry_plugin_async_update(EVRY_PLUGIN(p), EVRY_ASYNC_UPDATE_ADD);
+
+   return 1;
+}
+
+static int
+_cb_del(void *data, int type __UNUSED__, void *event)
+{
+   Plugin *p = data;
+   Ecore_Exe_Event_Del *e = event;
+
+   if (e->exe != p->exe)
+     return 1;
+
+   p->exe = NULL;
+   return 1;
+}
+
+static int
+_begin(Evry_Plugin *plugin, const Evry_Item *it __UNUSED__)
+{
+   PLUGIN(p, plugin);
+
+   if (!p->handler.data)
+     p->handler.data = ecore_event_handler_add
+       (ECORE_EXE_EVENT_DATA, _cb_data, p);
+   if (!p->handler.del)
+     p->handler.del = ecore_event_handler_add
+       (ECORE_EXE_EVENT_DEL, _cb_del, p);
+
+   return _exe_restart(p);
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   PLUGIN(p, plugin);
+   const char *s;
+   int len;
+
+   if (!input) return 0;
+
+   if (!p->handler.data && !_begin(plugin, NULL)) return 0;
+
+   len = sizeof(LANG_MODIFIER) - 1;
+   if (strncmp(input, LANG_MODIFIER, len) == 0)
+     {
+	const char *lang;
+
+	EVRY_PLUGIN_ITEMS_FREE(p);
+
+	input += len;
+	for (s = input; *s != '\0'; s++)
+	  if (isspace(*s) || *s == ';')
+	    break;
+
+	if (*s == '\0') /* just apply language on ' ' or ';' */
+	  return 1;
+
+	if (s - input > 0)
+	  lang = eina_stringshare_add_length(input, s - input);
+	else
+	  lang = NULL;
+
+	if (p->lang) eina_stringshare_del(p->lang);
+	if (p->lang != lang)
+	  {
+	     p->lang = lang;
+	     if (!_exe_restart(p))
+	       return 0;
+	  }
+
+	if (*s == '\0')
+	  return 1;
+
+	input = s + 1;
+     }
+
+   input = _space_skip(input);
+   for (s = input; *s != '\0'; s++)
+     ;
+   for (s--; s > input; s--)
+     if (!isspace(*s))
+       break;
+
+   len = s - input + 1;
+   if (len < 1)
+     return 1;
+   input = eina_stringshare_add_length(input, len);
+   if (p->input) eina_stringshare_del(p->input);
+   if (p->input == input)
+     return 1;
+
+   p->input = input;
+   if (!p->exe)
+     return 1;
+
+   ecore_exe_send(p->exe, (char *)p->input, len);
+   ecore_exe_send(p->exe, "\n", 1);
+
+   return 1;
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+
+   EVRY_PLUGIN_ITEMS_FREE(p)
+
+   if (p->handler.data)
+     {
+	ecore_event_handler_del(p->handler.data);
+	p->handler.data = NULL;
+     }
+   if (p->handler.del)
+     {
+	ecore_event_handler_del(p->handler.del);
+	p->handler.del = NULL;
+     }
+   if (p->exe)
+     {
+	ecore_exe_quit(p->exe);
+	ecore_exe_free(p->exe);
+	p->exe = NULL;
+     }
+   if (p->lang)
+     {
+	eina_stringshare_del(p->lang);
+	p->lang = NULL;
+     }
+   if (p->input)
+     {
+	eina_stringshare_del(p->input);
+	p->input = NULL;
+     }
+}
+
+static Eina_Bool
+_init(void)
+{
+   Plugin *p;
+
+   p = E_NEW(Plugin, 1);
+   evry_plugin_new(EVRY_PLUGIN(p), "Spell Checker", type_subject, "", "TEXT", 1,
+		   "accessories-dictionary", TRIGGER,
+		   NULL, _cleanup, _fetch, NULL, NULL, NULL, NULL);
+
+   evry_plugin_register(EVRY_PLUGIN(p), 100);
+
+   plugin = p;
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(plugin);
+}
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/sources/evry_plug_border.c b/src/modules/everything/sources/evry_plug_border.c
new file mode 100644
index 0000000..d2d2789
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_border.c
@@ -0,0 +1,263 @@
+#include "e.h"
+#include "e_mod_main.h"
+
+static Evry_Plugin *plugin;
+static Eina_List *handlers = NULL;
+static Eina_Hash *border_hash = NULL;
+
+static int
+_cb_border_remove(void *data, int type,  void *event)
+{
+   Evry_Plugin *p = data;
+   E_Event_Border_Remove *ev;
+   Eina_List *l;
+   Evry_Item *it;
+
+   ev = event;
+
+   EINA_LIST_FOREACH(p->items, l, it)
+     {
+	if (it->data == ev->border)
+	  {
+	     p->items = eina_list_remove(p->items, it);
+	     if (border_hash)
+	       eina_hash_del_by_key(border_hash, ev->border);
+	     evry_item_free(it);
+	     evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
+	     break;
+	  }
+     }
+
+   return 1;
+}
+
+static void _hash_free(void *data)
+{
+   Evry_Item *it = data;
+   evry_item_free(it);
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *p, const Evry_Item *it)
+{
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+      (E_EVENT_BORDER_REMOVE, _cb_border_remove, p));
+
+   border_hash = eina_hash_pointer_new(_hash_free); 
+   
+   return p;
+}
+
+static void
+_cleanup(Evry_Plugin *p)
+{
+   Ecore_Event_Handler *h;
+      
+   EINA_LIST_FREE(handlers, h)
+     ecore_event_handler_del(h);
+
+   if (border_hash) eina_hash_free(border_hash);
+   border_hash = NULL;
+   
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+}
+
+static void
+_item_free(Evry_Item *it)
+{
+   if (it->data)
+     e_object_unref(E_OBJECT(it->data));
+
+   E_FREE(it);
+}
+
+static void
+_item_add(Evry_Plugin *p, E_Border *bd, int match, int *prio)
+{
+   Evry_Item *it = NULL;
+
+   if ((it = eina_hash_find(border_hash, &bd)))
+     {
+	it->priority = *prio;
+	EVRY_PLUGIN_ITEM_APPEND(p, it);
+	it->fuzzy_match = match;
+	*prio += 1;
+	return;
+     }
+   
+   it = evry_item_new(NULL, p, e_border_name_get(bd), _item_free);
+
+   e_object_ref(E_OBJECT(bd));
+   it->data = bd;
+   it->fuzzy_match = match;
+   it->priority = *prio;
+   it->transient = EINA_TRUE;
+   it->id = eina_stringshare_add(e_util_winid_str_get(bd->win));
+   
+   *prio += 1;
+
+   eina_hash_add(border_hash, &bd, it);
+   
+   EVRY_PLUGIN_ITEM_APPEND(p, it);
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->fuzzy_match - it2->fuzzy_match)
+     return (it1->fuzzy_match - it2->fuzzy_match);
+
+   return (it1->priority - it2->priority);
+}
+
+static int
+_fetch(Evry_Plugin *p, const char *input)
+{
+   E_Zone *zone;
+   E_Border *bd;
+   Eina_List *l;
+   int prio = 0;
+   int m1, m2;
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   zone = e_util_zone_current_get(e_manager_current_get());
+
+   EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
+     {
+	if (zone == bd->zone)
+	  {
+	     if (!input)
+	       _item_add(p, bd, 0, &prio);
+	     else
+	       {
+		  m1 = evry_fuzzy_match(e_border_name_get(bd), input);
+
+		  if (bd->client.icccm.name)
+		    {
+		       m2 = evry_fuzzy_match(bd->client.icccm.name, input);
+		       if (!m1 || (m2 && m2 < m1))
+			 m1 = m2;
+		    }
+
+		  if (bd->desktop)
+		    {
+		       m2 = evry_fuzzy_match(bd->desktop->name, input);
+		       if (!m1 || (m2 && m2 < m1))
+			 m1 = m2;
+		    }
+
+		  if (m1)
+		    _item_add(p, bd, m1, &prio);
+	       }
+	  }
+     }
+
+   if (!p->items) return 0;
+   
+   EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+
+   return 1;
+}
+
+static Evas_Object *
+_item_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   Evas_Object *o = NULL;
+   E_Border *bd = it->data;
+
+   if (bd->internal)
+     {
+	o = edje_object_add(e);
+	if (!bd->internal_icon)
+	  e_util_edje_icon_set(o, "enlightenment/e");
+	else
+	  {
+	     if (!bd->internal_icon_key)
+	       {
+		  char *ext;
+		  ext = strrchr(bd->internal_icon, '.');
+		  if ((ext) && ((!strcmp(ext, ".edj"))))
+		    {
+		       if (!edje_object_file_set(o, bd->internal_icon, "icon"))
+			 e_util_edje_icon_set(o, "enlightenment/e");
+		    }
+		  else if (ext)
+		    {
+		       evas_object_del(o);
+		       o = e_icon_add(e);
+		       e_icon_file_set(o, bd->internal_icon);
+		    }
+		  else
+		    {
+		       if (!e_util_edje_icon_set(o, bd->internal_icon))
+			 e_util_edje_icon_set(o, "enlightenment/e");
+		    }
+	       }
+	     else
+	       {
+		  edje_object_file_set(o, bd->internal_icon,
+				       bd->internal_icon_key);
+	       }
+	  }
+	return o;
+     }
+
+   if (!o && bd->desktop)
+     o = e_util_desktop_icon_add(bd->desktop, 128, e);
+
+   if (!o && bd->client.netwm.icons)
+     {
+	int i, size, tmp, found = 0;
+	o = e_icon_add(e);
+
+	size = bd->client.netwm.icons[0].width;
+
+	for (i = 1; i < bd->client.netwm.num_icons; i++)
+	  {
+	     if ((tmp = bd->client.netwm.icons[i].width) > size)
+	       {
+		  size = tmp;
+		  found = i;
+	       }
+	  }
+
+	e_icon_data_set(o, bd->client.netwm.icons[found].data,
+			bd->client.netwm.icons[found].width,
+			bd->client.netwm.icons[found].height);
+	e_icon_alpha_set(o, 1);
+	return o;
+     }
+
+   if (!o)
+     o = e_border_icon_add(bd, e);
+
+   return o;
+}
+
+
+
+static Eina_Bool
+_init(void)
+{
+   plugin = evry_plugin_new(NULL, "Windows", type_subject, NULL, "BORDER", 0, NULL, NULL,
+		       _begin, _cleanup, _fetch, NULL, _item_icon_get, NULL, NULL);
+
+   evry_plugin_register(plugin, 2);
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(plugin);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/sources/evry_plug_calc.c b/src/modules/everything/sources/evry_plug_calc.c
new file mode 100644
index 0000000..2b95db1
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_calc.c
@@ -0,0 +1,231 @@
+#include "Evry.h"
+
+
+static int  _cb_data(void *data, int type, void *event);
+static int  _cb_error(void *data, int type, void *event);
+static int  _cb_del(void *data, int type, void *event);
+
+static Evry_Plugin *p1;
+static Ecore_Exe *exe = NULL;
+static Eina_List *history = NULL;
+static Eina_List *handlers = NULL;
+
+static int error = 0;
+
+
+
+static Evry_Plugin *
+_begin(Evry_Plugin *p, const Evry_Item *item __UNUSED__)
+{
+   Evry_Item *it;
+
+   if (history)
+     {
+	const char *result;
+
+	EINA_LIST_FREE(history, result)
+	  {
+	     it = evry_item_new(NULL, p, result, NULL);
+	     p->items = eina_list_prepend(p->items, it);
+	     eina_stringshare_del(result);
+	  }
+     }
+
+   it = evry_item_new(NULL, p, "0", NULL);
+   p->items = eina_list_prepend(p->items, it);
+
+   return p;
+}
+
+static int
+_run_bc(Evry_Plugin *p)
+{
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+      (ECORE_EXE_EVENT_DATA, _cb_data, p));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+      (ECORE_EXE_EVENT_ERROR, _cb_error, p));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+      (ECORE_EXE_EVENT_DEL, _cb_del, p));
+
+   exe = ecore_exe_pipe_run("bc -l",
+			    ECORE_EXE_PIPE_READ |
+			    ECORE_EXE_PIPE_READ_LINE_BUFFERED |
+			    ECORE_EXE_PIPE_WRITE |
+			    ECORE_EXE_PIPE_ERROR |
+			    ECORE_EXE_PIPE_ERROR_LINE_BUFFERED,
+			    NULL);
+   return !!exe;
+}
+
+
+static void
+_cleanup(Evry_Plugin *p)
+{
+   Ecore_Event_Handler *h;
+   Evry_Item *it;
+   int items = 10;
+
+   if (p->items)
+     {
+	evry_item_free(p->items->data);
+	p->items = eina_list_remove_list(p->items, p->items);
+     }
+
+   EINA_LIST_FREE(p->items, it)
+     {
+	if (items-- > 0)
+	  history = eina_list_prepend(history, eina_stringshare_add(it->label));
+
+	evry_item_free(it);
+     }
+
+   EINA_LIST_FREE(handlers, h)
+     ecore_event_handler_del(h);
+
+   if (exe)
+     {
+	ecore_exe_quit(exe);
+	ecore_exe_free(exe);
+	exe = NULL;
+     }
+}
+
+static int
+_action(Evry_Plugin *p, const Evry_Item *it)
+{
+   Eina_List *l;
+   Evry_Item *it2;
+
+   /* remove duplicates */
+   if (p->items->next)
+     {
+	it = p->items->data;
+
+	EINA_LIST_FOREACH(p->items->next, l, it2)
+	  {
+	     if (!strcmp(it->label, it2->label))
+	       break;
+	     it2 = NULL;
+	  }
+
+	if (it2)
+	  {
+	     p->items = eina_list_remove(p->items, it2);
+	     evry_item_free(it2);
+	  }
+     }
+
+   it = p->items->data;
+
+   it2 = evry_item_new(NULL, p, it->label, NULL);
+   p->items = eina_list_prepend(p->items, it2);
+
+   evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
+
+   return EVRY_ACTION_FINISHED;
+}
+
+static int
+_fetch(Evry_Plugin *p, const char *input)
+{
+   char buf[1024];
+
+   if (!input) return 0;
+
+   if (!exe && !_run_bc(p)) return 0;
+
+   if (!strncmp(input, "scale=", 6))
+     snprintf(buf, 1024, "%s\n", input);
+   else
+     snprintf(buf, 1024, "scale=3;%s\n", input);
+
+   ecore_exe_send(exe, buf, strlen(buf));
+
+   /* XXX after error we get no response for first input ?! - send a
+      second time...*/
+   if (error)
+     {
+	ecore_exe_send(exe, buf, strlen(buf));
+	error = 0;
+     }
+
+   return 1;
+}
+
+static int
+_cb_data(void *data, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Data *ev = event;
+   Evry_Plugin *p = data;
+   Evry_Item *it;
+
+   if (ev->exe != exe) return 1;
+
+   if (ev->lines)
+     {
+	it = p->items->data;
+	p->items = eina_list_remove(p->items, it);
+	evry_item_free(it);
+
+	it = evry_item_new(NULL, p, ev->lines->line, NULL);
+	p->items = eina_list_prepend(p->items, it);
+     }
+
+   evry_plugin_async_update(p, EVRY_ASYNC_UPDATE_ADD);
+
+   return 1;
+}
+
+static int
+_cb_error(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Data *ev = event;
+
+   if (ev->exe != exe)
+     return 1;
+
+   error = 1;
+
+   return 1;
+}
+
+static int
+_cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
+{
+   Ecore_Exe_Event_Del *e = event;
+
+   if (e->exe != exe)
+     return 1;
+
+   exe = NULL;
+   return 1;
+}
+
+static Eina_Bool
+_init(void)
+{
+   p1 = evry_plugin_new(NULL, "Calculator", type_subject, NULL, "TEXT", 1, "accessories-calculator", "=",
+			_begin, _cleanup, _fetch, _action, NULL, NULL, NULL);
+
+   evry_plugin_register(p1, 0);
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   char *result;
+
+   EINA_LIST_FREE(history, result)
+     eina_stringshare_del(result);
+
+   EVRY_PLUGIN_FREE(p1);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/sources/evry_plug_config.c b/src/modules/everything/sources/evry_plug_config.c
new file mode 100644
index 0000000..b6a8129
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_config.c
@@ -0,0 +1,140 @@
+#include "Evry.h"
+
+static Evry_Plugin *p;
+static Evry_Action *act;
+
+
+static void
+_cleanup(Evry_Plugin *p)
+{
+   EVRY_PLUGIN_ITEMS_FREE(p);
+}
+
+static void
+_item_add(Evry_Plugin *p, E_Configure_It *eci, int match, int prio)
+{
+   Evry_Item *it;
+
+   it = evry_item_new(NULL, p, eci->label, NULL);
+   it->data = eci;
+   it->priority = prio;
+   it->fuzzy_match = match;
+
+   EVRY_PLUGIN_ITEM_APPEND(p, it);
+}
+
+static int
+_fetch(Evry_Plugin *p, const char *input)
+{
+   Eina_List *l, *ll;
+   E_Configure_Cat *ecat;
+   E_Configure_It *eci;
+   int match;
+
+   _cleanup(p);
+
+   EINA_LIST_FOREACH(e_configure_registry, l, ecat)
+     {
+	if ((ecat->pri < 0) || (!ecat->items)) continue;
+	if (!strcmp(ecat->cat, "system")) continue;
+
+	EINA_LIST_FOREACH(ecat->items, ll, eci)
+	  {
+	     if (eci->pri >= 0)
+	       {
+		  if ((match = evry_fuzzy_match(eci->label, input)))
+		    _item_add(p, eci, match, 0);
+		  else if ((match = evry_fuzzy_match(ecat->label, input)))
+		    _item_add(p, eci, match, 1);
+	       }
+	  }
+     }
+
+   if (eina_list_count(p->items) > 0)
+     {
+	p->items = evry_fuzzy_match_sort(p->items);
+	return 1;
+     }
+
+   return 0;
+}
+
+static Evas_Object *
+_item_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   Evas_Object *o = NULL;
+   E_Configure_It *eci = it->data;
+
+   if (eci->icon)
+     {
+	if (!(o = evry_icon_theme_get(eci->icon, e)))
+	  {
+	     o = e_util_icon_add(eci->icon, e);
+	  }
+     }
+
+   return o;
+}
+
+static int
+_action(Evry_Action *act)
+{
+   E_Configure_It *eci, *eci2;
+   E_Container *con;
+   E_Configure_Cat *ecat;
+   Eina_List *l, *ll;
+   char buf[1024];
+   int found = 0;
+
+   eci = act->item1->data;
+   con = e_container_current_get(e_manager_current_get());
+
+   EINA_LIST_FOREACH(e_configure_registry, l, ecat)
+     {
+	if (found) break;
+
+	EINA_LIST_FOREACH(ecat->items, ll, eci2)
+	  {
+	     if (eci == eci2)
+	       {
+		  snprintf(buf, sizeof(buf), "%s/%s",
+			   ecat->cat,
+			   eci->item);
+		  found = 1;
+		  break;
+	       }
+	  }
+     }
+
+   if (found)
+     e_configure_registry_call(buf, con, NULL);
+
+   return EVRY_ACTION_FINISHED;
+}
+
+static Eina_Bool
+_init(void)
+{
+   p = evry_plugin_new(NULL, "Settings", type_subject, NULL, "E_SETTINGS", 0, NULL, NULL,
+		       NULL, _cleanup, _fetch, NULL, _item_icon_get, NULL, NULL);
+
+   act = evry_action_new("Show Dialog", "E_SETTINGS", NULL, NULL, "preferences-advanced",
+			 _action, NULL, NULL, NULL, NULL);
+
+   evry_plugin_register(p, 10);
+
+   evry_action_register(act, 0);
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(p);
+
+   evry_action_free(act);
+}
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/sources/evry_plug_dir_browse.c b/src/modules/everything/sources/evry_plug_dir_browse.c
new file mode 100644
index 0000000..145dddd
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_dir_browse.c
@@ -0,0 +1,510 @@
+#include "e_mod_main.h"
+
+#define MAX_ITEMS 100
+#define TERM_ACTION_DIR "%s"
+
+typedef struct _Plugin Plugin;
+typedef struct _Data Data;
+
+struct _Plugin
+{
+  Evry_Plugin base;
+
+  const char *directory;
+  /* all files of directory */
+  Eina_List  *files;
+  /* current list of files */
+  Eina_List  *cur;
+  Eina_Bool command;
+
+  const char *input;
+};
+
+struct _Data
+{
+  Plugin *plugin;
+  long id;
+  int level;
+  int cnt;
+  Eina_List *files;
+};
+
+static Evry_Plugin *p1 = NULL;
+static Evry_Plugin *p2 = NULL;
+static Evry_Action *act1 = NULL;
+static Evry_Action *act2 = NULL;
+
+static long thread_cnt = 0;
+static long thread_last = 0;
+
+static const char *mime_folder;
+
+
+static void
+_item_fill(Evry_Item_File *file)
+{
+   const char *mime;
+
+   if (file->mime) return;
+
+   if ((mime = efreet_mime_type_get(file->uri)))
+     {
+	file->mime = eina_stringshare_add(mime);
+	EVRY_ITEM(file)->context = eina_stringshare_ref(file->mime);
+	  
+	if ((!strcmp(mime, "inode/directory")) ||
+	    (!strcmp(mime, "inode/mount-point")))
+	  EVRY_ITEM(file)->browseable = EINA_TRUE;
+
+	return;
+     }
+
+   file->mime = eina_stringshare_add("None");
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1 = data1;
+   const Evry_Item *it2 = data2;
+
+   if (it1->browseable && !it2->browseable)
+     return -1;
+
+   if (!it1->browseable && it2->browseable)
+     return 1;
+
+   if (it1->fuzzy_match && it2->fuzzy_match)
+     if (it1->fuzzy_match - it2->fuzzy_match)
+       return (it1->fuzzy_match - it2->fuzzy_match);
+
+   return strcasecmp(it1->label, it2->label);
+}
+
+static void
+_item_free(Evry_Item *it)
+{
+   ITEM_FILE(file, it);
+   if (file->uri) eina_stringshare_del(file->uri);
+   if (file->mime) eina_stringshare_del(file->mime);
+
+   E_FREE(file);
+}
+
+static void
+_scan_func(void *data)
+{
+   Data *d = data;
+   Plugin *p = d->plugin;
+   Eina_List *files;
+   char *filename;
+   Evry_Item_File *file;
+   char buf[4096];
+
+   files = ecore_file_ls(p->directory);
+
+   EINA_LIST_FREE(files, filename)
+     {
+	if (filename[0] == '.')
+	  {
+	     free(filename);
+	     continue;
+	  }
+
+	file = E_NEW(Evry_Item_File, 1);
+	if (!file)
+	  {
+	     free(filename);
+	     continue;
+	  }
+
+	evry_item_new(EVRY_ITEM(file), EVRY_PLUGIN(p), NULL, _item_free);
+
+	EVRY_ITEM(file)->data = filename;
+
+	snprintf(buf, sizeof(buf), "%s/%s", p->directory, filename);
+	file->uri = strdup(buf);
+	
+	if (ecore_file_is_dir(file->uri))
+	  EVRY_ITEM(file)->browseable = EINA_TRUE;
+
+	d->files = eina_list_append(d->files, file);
+     }
+}
+
+static int
+_append_file(Plugin *p, Evry_Item_File *file)
+{
+   int match;
+
+   if (p->input && (match = evry_fuzzy_match(EVRY_ITEM(file)->label, p->input)))
+     {
+	EVRY_ITEM(file)->fuzzy_match = match;
+	EVRY_PLUGIN_ITEM_APPEND(p, file);
+	return 1;
+     }
+   else if (!p->input)
+     {
+	EVRY_PLUGIN_ITEM_APPEND(p, file);
+	return 1;
+     }
+
+   return 0;
+}
+
+static const char *
+_item_id(const char *uri)
+{
+   const char *s1, *s2, *s3;
+   s1 = s2 = s3 = uri;
+   
+   while (s1 && ++s1 && (s1 = strchr(s1, '/')))
+     {
+	s3 = s2;
+	s2 = s1;
+     }
+   
+   return s3;
+}
+
+static void
+_scan_end_func(void *data)
+{
+   Data *d = data;
+   Plugin *p = d->plugin;
+   int cnt = 0;
+   Evry_Item *item;
+   char *filename, *uri;
+
+   if (d->id != thread_last)
+     {
+	EINA_LIST_FREE(d->files, item)
+	  {
+	     filename = item->data;
+	     free(filename);
+	     evry_item_free(item);
+	  }
+	E_FREE(d);
+	return;
+     }
+
+   EINA_LIST_FREE(d->files, item)
+     {
+	ITEM_FILE(file, item);
+
+	filename = item->data;
+	uri = (char *) file->uri;
+	file->uri = eina_stringshare_add(uri);
+	item->id = eina_stringshare_add(_item_id(uri));
+	item->label = eina_stringshare_add(filename);
+	free(filename);
+	free(uri);
+
+	p->files = eina_list_append(p->files, file);
+
+	if (item->browseable)
+	  {
+	     file->mime = eina_stringshare_ref(mime_folder);
+	     EVRY_ITEM(file)->context = eina_stringshare_ref(file->mime);
+	  }
+	
+	if (p->command || cnt >= MAX_ITEMS) continue;
+	cnt += _append_file(p, file);
+     }
+
+   if (!p->command)
+     {
+	EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+	evry_plugin_async_update(EVRY_PLUGIN(p), EVRY_ASYNC_UPDATE_ADD);
+     }
+
+   E_FREE(d);
+}
+
+static void
+_read_directory(Plugin *p)
+{
+   thread_last = ++thread_cnt;
+
+   Data *d = E_NEW(Data, 1);
+   d->plugin = p;
+   d->id = thread_cnt;
+   ecore_thread_run(_scan_func, _scan_end_func, NULL, d);
+}
+
+static Evry_Plugin *
+_begin(Evry_Plugin *plugin, const Evry_Item *it)
+{
+   Plugin *p = NULL;
+
+   /* is FILE ? */
+   if (it && (it->plugin->type_out == plugin->type_in))
+     {
+	ITEM_FILE(file, it);
+
+	if (!file->uri || !ecore_file_is_dir(file->uri))
+	  return NULL;
+
+	p = E_NEW(Plugin, 1);
+	p->base = *plugin;
+	p->base.items = NULL;
+
+	p->directory = eina_stringshare_add(file->uri);
+     }
+   else
+     {
+	p = E_NEW(Plugin, 1);
+	p->base = *plugin;
+	p->base.items = NULL;
+	p->directory = eina_stringshare_add(e_user_homedir_get());
+     }
+
+   _read_directory(p);
+
+   return EVRY_PLUGIN(p);
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+
+   Evry_Item_File *file;
+
+   /* if a thread for this plugin returns
+      it will free its data if its id is smaller
+      than thread_last */
+   thread_last = ++thread_cnt;
+
+   if (p->directory)
+     eina_stringshare_del(p->directory);
+
+   EINA_LIST_FREE(p->files, file)
+     evry_item_free(EVRY_ITEM(file));
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   E_FREE(p);
+}
+
+static void
+_folder_item_add(Plugin *p, const char *path)
+{
+   Evry_Item_File *file = E_NEW(Evry_Item_File, 1);
+
+   if (!file) return;
+
+   evry_item_new(EVRY_ITEM(file), EVRY_PLUGIN(p), path, _item_free);
+   file->uri = eina_stringshare_add(path);
+   file->mime = eina_stringshare_ref(mime_folder);
+   EVRY_ITEM(file)->browseable = EINA_TRUE;
+   EVRY_PLUGIN_ITEM_APPEND(p, file);
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   PLUGIN(p, plugin);
+   Evry_Item_File *file;
+   Eina_List *l;
+   int cnt = 0;
+
+   if (!p->command)
+     EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   p->input = input;
+
+   /* input is command ? */
+   if (input)
+     {
+   	if (!strncmp(input, "/", 1))
+   	  {
+	     if (p->command) return 1;
+
+	     _folder_item_add(p, "/");
+	     p->command = EINA_TRUE;
+	     return 1;
+   	  }
+   	else if (!strncmp(input, "..", 2))
+   	  {
+   	     char *end;
+   	     char dir[4096];
+   	     char *tmp;
+   	     int prio = 0;
+
+   	     if (p->command) return 1;
+	     if (strncmp(p->directory, "/", 1)) return 0;
+   	     if (!strcmp(p->directory, "/")) return 0;
+	     
+   	     snprintf(dir, 4096, "%s", p->directory);
+   	     end = strrchr(dir, '/');
+
+   	     while (end != dir)
+   	       {
+   		  tmp = strdup(dir);
+   		  snprintf(dir, (end - dir) + 1, "%s", tmp);
+
+		  _folder_item_add(p, dir);
+
+   		  end = strrchr(dir, '/');
+   		  free(tmp);
+   		  prio--;
+   	       }
+
+	     _folder_item_add(p, "/");
+
+   	     p->command = EINA_TRUE;
+   	     return 1;
+   	  }
+     }
+
+   if (p->command)
+     {
+   	p->command = EINA_FALSE;
+	EVRY_PLUGIN_ITEMS_FREE(p);
+     }
+
+   EINA_LIST_FOREACH(p->files, l, file)
+     {
+	if (cnt >= MAX_ITEMS);
+	cnt += _append_file(p, file);
+     }
+
+   if (!EVRY_PLUGIN(p)->items)
+     return 0;
+
+   EVRY_PLUGIN_ITEMS_SORT(p, _cb_sort);
+   
+   return 1;
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   Evas_Object *o = NULL;
+   ITEM_FILE(file, it);
+
+   if (!file->mime)
+     _item_fill(file);
+
+   if (!file->mime) return NULL;
+
+   if (it->browseable)
+     o = evry_icon_theme_get("folder", e);
+   else
+     o = evry_icon_mime_get(file->mime, e);
+
+   return o;
+}
+
+
+static int
+_open_folder_check(Evry_Action *act __UNUSED__, const Evry_Item *it)
+{
+   return (it->browseable && e_action_find("fileman"));
+}
+
+static int
+_open_folder_action(Evry_Action *act)
+{
+   E_Action *action = e_action_find("fileman");
+   char *path;
+   Eina_List *m;
+
+   if (!action) return 0;
+
+   m = e_manager_list();
+
+   ITEM_FILE(file, act->item1);
+
+   if (!act->item1->browseable)
+     {
+	path = ecore_file_dir_get(file->uri);
+	if (!path) return 0;
+	action->func.go(E_OBJECT(m->data), path);
+	free(path);
+     }
+   else
+     {
+	action->func.go(E_OBJECT(m->data), file->uri);
+     }
+
+   return 1;
+}
+
+static int
+_open_term_action(Evry_Action *act)
+{
+   ITEM_FILE(file, act->item1);
+   Evry_Item_App *tmp;
+   char cwd[4096];
+   char *dir;
+   int ret = 0;
+
+   if (act->item1->browseable)
+     dir = strdup(file->uri);
+   else
+     dir = ecore_file_dir_get(file->uri);
+
+   if (dir)
+     {
+	getcwd(cwd, sizeof(cwd));
+	chdir(dir);
+	
+	tmp = E_NEW(Evry_Item_App, 1);
+	tmp->file = evry_conf->cmd_terminal;
+
+	ret = evry_util_exec_app(EVRY_ITEM(tmp), NULL);
+	E_FREE(tmp);
+	E_FREE(dir);
+	chdir(cwd);
+     }
+   
+   return ret;
+}
+
+static Eina_Bool
+_init(void)
+{
+   p1 = evry_plugin_new(NULL, "Files", type_subject, "FILE", "FILE", 0, NULL, NULL,
+			_begin, _cleanup, _fetch, NULL, _icon_get,
+			NULL, NULL);
+
+   p2 = evry_plugin_new(NULL, "Files", type_object, "FILE", "FILE", 0, NULL, NULL,
+			_begin, _cleanup, _fetch, NULL, _icon_get,
+			NULL, NULL);
+   
+   evry_plugin_register(p1, 3);
+   evry_plugin_register(p2, 1);
+
+   act1 = evry_action_new("Open Folder (EFM)", "FILE", NULL, NULL, "folder-open",
+			 _open_folder_action, _open_folder_check, NULL, NULL, NULL);   
+   evry_action_register(act1, 0);
+
+   act2 = evry_action_new("Open Terminal here", "FILE", NULL, NULL,
+			  "system-run",
+			  _open_term_action, NULL, NULL, NULL, NULL);
+   evry_action_register(act2, 2);
+
+
+   
+   
+   mime_folder = eina_stringshare_add("inode/directory");
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   EVRY_PLUGIN_FREE(p1);
+   EVRY_PLUGIN_FREE(p2);
+
+   eina_stringshare_del(mime_folder);
+
+   evry_action_free(act1);
+   evry_action_free(act2);
+}
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/sources/evry_plug_tracker.c b/src/modules/everything/sources/evry_plug_tracker.c
new file mode 100644
index 0000000..bfe315f
--- /dev/null
+++ b/src/modules/everything/sources/evry_plug_tracker.c
@@ -0,0 +1,484 @@
+#include "e_mod_main.h"
+
+/* TODO check if trackerd is running and version */
+
+typedef struct _Plugin Plugin;
+
+struct _Plugin
+{
+  Evry_Plugin base;
+
+  int active;
+  char *condition;
+  char *service;
+  int max_hits;
+  const char *input;
+  const char *matched;
+  Eina_List *files;
+};
+
+static E_DBus_Connection *conn = NULL;
+static Eina_List *plugins = NULL;
+static int _prio = 5;
+static int active = 0;
+
+static Evry_Plugin *
+_begin(Evry_Plugin *plugin, const Evry_Item *it)
+{
+   PLUGIN(p, plugin);
+
+   p->active = 0;
+
+   /* is APPLICATION ? */
+   if (it && it->plugin->type_out == plugin->type_in)
+     {
+	ITEM_APP(app, it);
+	Eina_List *l;
+	const char *mime;
+	char mime_entry[256];
+	char rdf_query[32768];
+	int len = 0;
+
+	if (p->condition[0]) free (p->condition);
+	p->condition = "";
+
+	if (!app->desktop || !app->desktop->mime_types)
+	  return NULL;
+
+	rdf_query[0] = '\0';
+	strcat(rdf_query, "<rdfq:Condition><rdfq:or>");
+
+	EINA_LIST_FOREACH(app->desktop->mime_types, l, mime)
+	  {
+	     if (!strcmp(mime, "x-directory/normal"))
+	       return NULL;
+
+	     snprintf(mime_entry, 256,
+		      "<rdfq:contains>"
+		      "<rdfq:Property name=\"File:Mime\" />"
+		      "<rdf:String>%s</rdf:String> "
+		      "</rdfq:contains>",
+		      mime);
+
+	     strcat(rdf_query, mime_entry);
+	     len += 256;
+	     if (len > 32000) break;
+	  }
+	strcat(rdf_query, "</rdfq:or></rdfq:Condition>");
+
+	p->condition = strdup(rdf_query);
+     }
+
+   return plugin;
+}
+
+static void
+_item_free(Evry_Item *it)
+{
+   ITEM_FILE(file, it);
+   if (file->uri) eina_stringshare_del(file->uri);
+   if (file->mime) eina_stringshare_del(file->mime);
+
+   E_FREE(file);
+}
+
+
+static const char *
+_item_id(const char *uri)
+{
+   const char *s1, *s2, *s3;
+   s1 = s2 = s3 = uri;
+   
+   while (s1 && ++s1 && (s1 = strchr(s1, '/')))
+     {
+	s3 = s2;
+	s2 = s1;
+     }
+   
+   return s3;
+}
+
+static Evry_Item_File *
+_item_add(Plugin *p, char *path, char *mime, int prio)
+{
+   Evry_Item_File *file;
+
+   const char *filename;
+   int folder = (!strcmp(mime, "Folder"));
+
+   /* folders are specifically searched */
+   if (folder && EVRY_PLUGIN(p)->begin)
+     return NULL;
+
+   filename = ecore_file_file_get(path);
+
+   if (!filename)
+     return NULL;
+
+   file = E_NEW(Evry_Item_File, 1);
+   if (!file) return NULL;
+
+   evry_item_new(EVRY_ITEM(file), EVRY_PLUGIN(p), filename, _item_free);
+   EVRY_ITEM(file)->id = eina_stringshare_add(_item_id(path));
+   file->uri = eina_stringshare_add(path);
+
+   if (folder)
+     {
+	EVRY_ITEM(file)->browseable = EINA_TRUE;
+	EVRY_ITEM(file)->priority = 1;
+	file->mime = eina_stringshare_add("x-directory/normal");
+     }
+   else
+     file->mime = eina_stringshare_add(mime);
+
+   return file;
+}
+
+static void
+_cleanup(Evry_Plugin *plugin)
+{
+   PLUGIN(p, plugin);
+   Evry_Item_File *file;
+
+   p->active = 0;
+
+   if (p->input)
+     eina_stringshare_del(p->input);
+   p->input = NULL;
+
+   if (p->matched)
+     eina_stringshare_del(p->matched);
+   p->matched = NULL;
+
+   EINA_LIST_FREE(p->files, file)
+     evry_item_free(EVRY_ITEM(file));
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+}
+
+static int
+_cb_sort(const void *data1, const void *data2)
+{
+   const Evry_Item *it1, *it2;
+
+   it1 = data1;
+   it2 = data2;
+
+   if (it1->priority - it2->priority)
+     return (it1->priority - it2->priority);
+
+   return strcasecmp(it1->label, it2->label);
+}
+
+static void
+_dbus_cb_reply(void *data, DBusMessage *msg, DBusError *error)
+{
+   DBusMessageIter array, iter, item;
+   char *uri, *mime, *date;
+   Evry_Item_File *file;
+   Eina_List *files = NULL;
+   Plugin *p = data;
+
+   if (p->active) p->active--;
+
+   if (dbus_error_is_set(error))
+     {
+	_cleanup(EVRY_PLUGIN(p));
+	active = 0;
+	printf("Error: %s - %s\n", error->name, error->message);
+	return;
+     }
+
+   if (p->active) return;
+
+   dbus_message_iter_init(msg, &array);
+   if(dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_ARRAY)
+     {
+	dbus_message_iter_recurse(&array, &item);
+	while(dbus_message_iter_get_arg_type(&item) == DBUS_TYPE_ARRAY)
+	  {
+	     dbus_message_iter_recurse(&item, &iter);
+
+	     if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING)
+	       {
+		  dbus_message_iter_get_basic(&iter, &uri);
+		  dbus_message_iter_next(&iter);
+		  /* dbus_message_iter_get_basic(&iter, &service); */
+		  dbus_message_iter_next(&iter);
+		  dbus_message_iter_get_basic(&iter, &mime);
+
+		  dbus_message_iter_next(&iter);
+		  dbus_message_iter_get_basic(&iter, &date);
+
+		  if (uri && mime && date)
+		    {
+		       file = _item_add(p, uri, mime, atoi(date));
+		       if (file) files = eina_list_append(files, file);
+		    }
+	       }
+	     dbus_message_iter_next(&item);
+	  }
+     }
+
+   EVRY_PLUGIN_ITEMS_CLEAR(p);
+
+   if (files)
+     {
+	Eina_List *l;
+
+	EINA_LIST_FREE(p->files, file)
+	  evry_item_free(EVRY_ITEM(file));
+
+	files = eina_list_sort(files, eina_list_count(files), _cb_sort);
+	p->files = files;
+
+	EINA_LIST_FOREACH(p->files, l, file)
+	  EVRY_PLUGIN_ITEM_APPEND(p, file);
+
+	if (p->matched)
+	  eina_stringshare_del(p->matched);
+	if (p->input)
+	  p->matched = eina_stringshare_add(p->input);
+	else
+	  p->matched = NULL;
+     }
+   else if (p->files && p->input && p->matched &&
+	    (strlen(p->input) > strlen(p->matched)))
+     {
+	Eina_List *l;
+
+	EINA_LIST_FOREACH(p->files, l, file)
+	  if (evry_fuzzy_match(EVRY_ITEM(file)->label, (p->input + strlen(p->matched))))
+	    EVRY_PLUGIN_ITEM_APPEND(p, file);
+     }
+   else
+     {
+	EINA_LIST_FREE(p->files, file)
+	  evry_item_free(EVRY_ITEM(file));
+
+	if (p->input)
+	  eina_stringshare_del(p->input);
+	p->input = NULL;
+
+	if (p->matched)
+	  eina_stringshare_del(p->matched);
+	p->matched = NULL;
+     }
+
+   evry_plugin_async_update(EVRY_PLUGIN(p), EVRY_ASYNC_UPDATE_ADD);
+}
+
+static void
+_dbus_cb_version(void *data, DBusMessage *msg, DBusError *error)
+{
+   DBusMessageIter iter;
+   int version = 0;
+
+   if (dbus_error_is_set(error))
+     {
+	printf("Error: %s - %s\n", error->name, error->message);
+	return;
+     }
+
+   dbus_message_iter_init(msg, &iter);
+
+   if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_INT32)
+     dbus_message_iter_get_basic(&iter, &version);
+
+   printf("tracker version %d\n", version);
+   
+   if (version < 690)
+     active = 0;
+   else
+     active = 2;
+}
+
+static void
+_get_version(void)
+{
+   DBusMessage *msg;
+
+   msg = dbus_message_new_method_call("org.freedesktop.Tracker",
+				      "/org/freedesktop/Tracker",
+				      "org.freedesktop.Tracker",
+				      "GetVersion");
+
+   e_dbus_message_send(conn, msg, _dbus_cb_version, -1, NULL);
+   dbus_message_unref(msg);
+
+   active = 1;
+}
+
+static int
+_fetch(Evry_Plugin *plugin, const char *input)
+{
+   PLUGIN(p, plugin);
+
+   DBusMessage *msg;
+   int live_query_id = 0;
+   int max_hits = p->max_hits;
+   int offset = 0;
+   int sort_descending = 1;
+   int sort_by_service = 0;
+   int sort_by_access = 0;
+   char *search_text;
+   char *fields[2];
+   char *keywords[1];
+   char *sort_fields[1];
+   fields[0] = "File:Mime";
+   fields[1] = "File:Accessed";
+   keywords[0] = "";
+   sort_fields[0] = "File:Accessed";
+   char **_fields = fields;
+   char **_keywords = keywords;
+   char **_sort_fields = sort_fields;
+
+   if (p->input)
+     eina_stringshare_del(p->input);
+   p->input = NULL;
+
+   if (!conn)
+     {
+	_cleanup(plugin);
+	return 0;
+     }
+
+   if (input && (strlen(input) > 2))
+     {
+	p->input = eina_stringshare_add(input);
+	search_text = malloc(sizeof(char) * strlen(input) + 1);
+	sprintf(search_text, "%s", input);
+	max_hits = 100;
+     }
+   else if (!input && !plugin->begin && plugin->type == type_object)
+     {
+	sort_by_access = 1;
+	search_text = "";
+     }
+   else
+     {
+	_cleanup(plugin);
+	return 0;
+     }
+
+
+   if (!active)
+     _get_version();
+
+   if (active != 2)
+     return 0;
+   
+   p->active++;
+
+   msg = dbus_message_new_method_call("org.freedesktop.Tracker",
+				      "/org/freedesktop/Tracker/Search",
+				      "org.freedesktop.Tracker.Search",
+				      "Query");
+   dbus_message_append_args(msg,
+			    DBUS_TYPE_INT32,   &live_query_id,
+			    DBUS_TYPE_STRING,  &p->service,
+			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING,
+			    &_fields, 2,
+			    DBUS_TYPE_STRING,  &search_text,
+			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING,
+			    &_keywords, 0,
+			    DBUS_TYPE_STRING,  &p->condition,
+			    DBUS_TYPE_BOOLEAN, &sort_by_service,
+			    DBUS_TYPE_ARRAY,   DBUS_TYPE_STRING,
+			    &_sort_fields, sort_by_access,
+			    DBUS_TYPE_BOOLEAN, &sort_descending,
+			    DBUS_TYPE_INT32,   &offset,
+			    DBUS_TYPE_INT32,   &max_hits,
+			    DBUS_TYPE_INVALID);
+
+   e_dbus_message_send(conn, msg, _dbus_cb_reply, -1, p);
+   dbus_message_unref(msg);
+
+   if (input && (strlen(input) > 2))
+     free(search_text);
+
+   if (p->files) return 1;
+
+   return 0;
+}
+
+static Evas_Object *
+_icon_get(Evry_Plugin *p __UNUSED__, const Evry_Item *it, Evas *e)
+{
+   ITEM_FILE(file, it);
+
+   if (it->browseable)
+     return evry_icon_theme_get("folder", e);
+   else
+     return evry_icon_mime_get(file->mime, e);
+
+   return NULL;
+}
+
+static void
+_plugin_new(const char *name, int type, char *service, int max_hits, int begin)
+{
+   Plugin *p;
+
+   p = E_NEW(Plugin, 1);
+   p->condition = "";
+   p->service = service;
+   p->max_hits = max_hits;
+   p->active = 0;
+
+   if (!begin)
+     evry_plugin_new(EVRY_PLUGIN(p), name, type, "", "FILE", 1, NULL, NULL,
+		     NULL, _cleanup, _fetch,
+		     NULL, _icon_get, NULL, NULL);
+   else if (type == type_object)
+     evry_plugin_new(EVRY_PLUGIN(p), name, type, "APPLICATION", "FILE", 1, NULL, NULL,
+		   _begin, _cleanup, _fetch,
+		   NULL, _icon_get, NULL, NULL);
+   
+   plugins = eina_list_append(plugins, p);
+
+   evry_plugin_register(EVRY_PLUGIN(p), _prio++);
+}
+
+
+
+
+static Eina_Bool
+_init(void)
+{
+   conn = e_dbus_bus_get(DBUS_BUS_SESSION);
+
+   if (!conn) return EINA_FALSE;
+
+   _plugin_new("Folders",    type_subject, "Folders", 20, 0);
+   _plugin_new("Images",     type_subject, "Images", 20, 0);
+   _plugin_new("Music",      type_subject, "Music", 20, 0);
+   _plugin_new("Videos",     type_subject, "Videos", 20, 0);
+   _plugin_new("Documents",  type_subject, "Documents", 20, 0);
+
+   _plugin_new("Find Files", type_object,  "Files", 20, 1);
+   _plugin_new("Folders",    type_object,  "Folders", 20, 0);
+   
+   _get_version();
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   Plugin *p;
+
+   if (conn) e_dbus_connection_close(conn);
+
+   EINA_LIST_FREE(plugins, p)
+     {
+	if (p->condition[0]) free(p->condition);
+
+	EVRY_PLUGIN_FREE(p);
+     }
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/views/Makefile.am b/src/modules/everything/views/Makefile.am
new file mode 100644
index 0000000..66b9e61
--- /dev/null
+++ b/src/modules/everything/views/Makefile.am
@@ -0,0 +1,37 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+
+
+evry_plug_previewdir = $(plugindir)
+evry_plug_preview_LTLIBRARIES = evry_plug_preview.la
+evry_plug_preview_la_SOURCES =  evry_plug_preview.c
+evry_plug_preview_la_LIBADD       = @e_libs@
+evry_plug_preview_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_preview_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_view_helpdir = $(plugindir)
+evry_plug_view_help_LTLIBRARIES = evry_plug_view_help.la
+evry_plug_view_help_la_SOURCES =  evry_plug_view_help.c
+evry_plug_view_help_la_LIBADD       = @e_libs@
+evry_plug_view_help_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_view_help_la_LIBTOOLFLAGS = --tag=disable-static
+
+evry_plug_view_thumbdir = $(plugindir)
+evry_plug_view_thumb_LTLIBRARIES = evry_plug_view_thumb.la
+evry_plug_view_thumb_la_SOURCES =  evry_plug_view_thumb.c
+evry_plug_view_thumb_la_LIBADD       = @e_libs@
+evry_plug_view_thumb_la_LDFLAGS      = -no-undefined -module -avoid-version
+evry_plug_view_thumb_la_LIBTOOLFLAGS = --tag=disable-static
+
+
diff --git a/src/modules/everything/views/Makefile.in b/src/modules/everything/views/Makefile.in
new file mode 100644
index 0000000..db5b268
--- /dev/null
+++ b/src/modules/everything/views/Makefile.in
@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/everything/views
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+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)$(evry_plug_previewdir)" \
+	"$(DESTDIR)$(evry_plug_view_helpdir)" \
+	"$(DESTDIR)$(evry_plug_view_thumbdir)"
+evry_plug_previewLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_view_helpLTLIBRARIES_INSTALL = $(INSTALL)
+evry_plug_view_thumbLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(evry_plug_preview_LTLIBRARIES) \
+	$(evry_plug_view_help_LTLIBRARIES) \
+	$(evry_plug_view_thumb_LTLIBRARIES)
+evry_plug_preview_la_DEPENDENCIES =
+am_evry_plug_preview_la_OBJECTS =  \
+	evry_plug_preview_la-evry_plug_preview.lo
+evry_plug_preview_la_OBJECTS = $(am_evry_plug_preview_la_OBJECTS)
+evry_plug_preview_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_preview_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_preview_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_view_help_la_DEPENDENCIES =
+am_evry_plug_view_help_la_OBJECTS =  \
+	evry_plug_view_help_la-evry_plug_view_help.lo
+evry_plug_view_help_la_OBJECTS = $(am_evry_plug_view_help_la_OBJECTS)
+evry_plug_view_help_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_view_help_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_view_help_la_LDFLAGS) $(LDFLAGS) -o $@
+evry_plug_view_thumb_la_DEPENDENCIES =
+am_evry_plug_view_thumb_la_OBJECTS =  \
+	evry_plug_view_thumb_la-evry_plug_view_thumb.lo
+evry_plug_view_thumb_la_OBJECTS =  \
+	$(am_evry_plug_view_thumb_la_OBJECTS)
+evry_plug_view_thumb_la_LINK = $(LIBTOOL) --tag=CC \
+	$(evry_plug_view_thumb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(evry_plug_view_thumb_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(evry_plug_preview_la_SOURCES) \
+	$(evry_plug_view_help_la_SOURCES) \
+	$(evry_plug_view_thumb_la_SOURCES)
+DIST_SOURCES = $(evry_plug_preview_la_SOURCES) \
+	$(evry_plug_view_help_la_SOURCES) \
+	$(evry_plug_view_thumb_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = everything
+
+# 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@
+
+plugindir = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+evry_plug_previewdir = $(plugindir)
+evry_plug_preview_LTLIBRARIES = evry_plug_preview.la
+evry_plug_preview_la_SOURCES = evry_plug_preview.c
+evry_plug_preview_la_LIBADD = @e_libs@
+evry_plug_preview_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_preview_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_view_helpdir = $(plugindir)
+evry_plug_view_help_LTLIBRARIES = evry_plug_view_help.la
+evry_plug_view_help_la_SOURCES = evry_plug_view_help.c
+evry_plug_view_help_la_LIBADD = @e_libs@
+evry_plug_view_help_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_view_help_la_LIBTOOLFLAGS = --tag=disable-static
+evry_plug_view_thumbdir = $(plugindir)
+evry_plug_view_thumb_LTLIBRARIES = evry_plug_view_thumb.la
+evry_plug_view_thumb_la_SOURCES = evry_plug_view_thumb.c
+evry_plug_view_thumb_la_LIBADD = @e_libs@
+evry_plug_view_thumb_la_LDFLAGS = -no-undefined -module -avoid-version
+evry_plug_view_thumb_la_LIBTOOLFLAGS = --tag=disable-static
+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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/everything/views/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/everything/views/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
+install-evry_plug_previewLTLIBRARIES: $(evry_plug_preview_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_previewdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_previewdir)"
+	@list='$(evry_plug_preview_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_previewLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_previewdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_previewLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_previewdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_previewLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_preview_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_previewdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_previewdir)/$$p"; \
+	done
+
+clean-evry_plug_previewLTLIBRARIES:
+	-test -z "$(evry_plug_preview_LTLIBRARIES)" || rm -f $(evry_plug_preview_LTLIBRARIES)
+	@list='$(evry_plug_preview_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
+install-evry_plug_view_helpLTLIBRARIES: $(evry_plug_view_help_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_view_helpdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_view_helpdir)"
+	@list='$(evry_plug_view_help_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_view_helpLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_view_helpdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_view_helpLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_view_helpdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_view_helpLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_view_help_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_view_helpdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_view_helpdir)/$$p"; \
+	done
+
+clean-evry_plug_view_helpLTLIBRARIES:
+	-test -z "$(evry_plug_view_help_LTLIBRARIES)" || rm -f $(evry_plug_view_help_LTLIBRARIES)
+	@list='$(evry_plug_view_help_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
+install-evry_plug_view_thumbLTLIBRARIES: $(evry_plug_view_thumb_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(evry_plug_view_thumbdir)" || $(MKDIR_P) "$(DESTDIR)$(evry_plug_view_thumbdir)"
+	@list='$(evry_plug_view_thumb_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f=$(am__strip_dir) \
+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_view_thumbLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(evry_plug_view_thumbdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(evry_plug_view_thumbLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(evry_plug_view_thumbdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-evry_plug_view_thumbLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(evry_plug_view_thumb_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(evry_plug_view_thumbdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(evry_plug_view_thumbdir)/$$p"; \
+	done
+
+clean-evry_plug_view_thumbLTLIBRARIES:
+	-test -z "$(evry_plug_view_thumb_LTLIBRARIES)" || rm -f $(evry_plug_view_thumb_LTLIBRARIES)
+	@list='$(evry_plug_view_thumb_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
+evry_plug_preview.la: $(evry_plug_preview_la_OBJECTS) $(evry_plug_preview_la_DEPENDENCIES) 
+	$(evry_plug_preview_la_LINK) -rpath $(evry_plug_previewdir) $(evry_plug_preview_la_OBJECTS) $(evry_plug_preview_la_LIBADD) $(LIBS)
+evry_plug_view_help.la: $(evry_plug_view_help_la_OBJECTS) $(evry_plug_view_help_la_DEPENDENCIES) 
+	$(evry_plug_view_help_la_LINK) -rpath $(evry_plug_view_helpdir) $(evry_plug_view_help_la_OBJECTS) $(evry_plug_view_help_la_LIBADD) $(LIBS)
+evry_plug_view_thumb.la: $(evry_plug_view_thumb_la_OBJECTS) $(evry_plug_view_thumb_la_DEPENDENCIES) 
+	$(evry_plug_view_thumb_la_LINK) -rpath $(evry_plug_view_thumbdir) $(evry_plug_view_thumb_la_OBJECTS) $(evry_plug_view_thumb_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_preview_la-evry_plug_preview.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_view_help_la-evry_plug_view_help.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/evry_plug_view_thumb_la-evry_plug_view_thumb.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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 $@ $<
+
+evry_plug_preview_la-evry_plug_preview.lo: evry_plug_preview.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_preview_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_preview_la-evry_plug_preview.lo -MD -MP -MF $(DEPDIR)/evry_plug_preview_la-evry_plug_preview.Tpo -c -o evry_plug_preview_la-evry_plug_preview.lo `test -f 'evry_plug_preview.c' || echo '$(srcdir)/'`evry_plug_preview.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_preview_la-evry_plug_preview.Tpo $(DEPDIR)/evry_plug_preview_la-evry_plug_preview.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_preview.c' object='evry_plug_preview_la-evry_plug_preview.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_preview_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_preview_la-evry_plug_preview.lo `test -f 'evry_plug_preview.c' || echo '$(srcdir)/'`evry_plug_preview.c
+
+evry_plug_view_help_la-evry_plug_view_help.lo: evry_plug_view_help.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_view_help_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_view_help_la-evry_plug_view_help.lo -MD -MP -MF $(DEPDIR)/evry_plug_view_help_la-evry_plug_view_help.Tpo -c -o evry_plug_view_help_la-evry_plug_view_help.lo `test -f 'evry_plug_view_help.c' || echo '$(srcdir)/'`evry_plug_view_help.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_view_help_la-evry_plug_view_help.Tpo $(DEPDIR)/evry_plug_view_help_la-evry_plug_view_help.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_view_help.c' object='evry_plug_view_help_la-evry_plug_view_help.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_view_help_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_view_help_la-evry_plug_view_help.lo `test -f 'evry_plug_view_help.c' || echo '$(srcdir)/'`evry_plug_view_help.c
+
+evry_plug_view_thumb_la-evry_plug_view_thumb.lo: evry_plug_view_thumb.c
+ at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(evry_plug_view_thumb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT evry_plug_view_thumb_la-evry_plug_view_thumb.lo -MD -MP -MF $(DEPDIR)/evry_plug_view_thumb_la-evry_plug_view_thumb.Tpo -c -o evry_plug_view_thumb_la-evry_plug_view_thumb.lo `test -f 'evry_plug_view_thumb.c' || echo '$(srcdir)/'`evry_plug_view_thumb.c
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/evry_plug_view_thumb_la-evry_plug_view_thumb.Tpo $(DEPDIR)/evry_plug_view_thumb_la-evry_plug_view_thumb.Plo
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='evry_plug_view_thumb.c' object='evry_plug_view_thumb_la-evry_plug_view_thumb.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(evry_plug_view_thumb_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o evry_plug_view_thumb_la-evry_plug_view_thumb.lo `test -f 'evry_plug_view_thumb.c' || echo '$(srcdir)/'`evry_plug_view_thumb.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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)
+installdirs:
+	for dir in "$(DESTDIR)$(evry_plug_previewdir)" "$(DESTDIR)$(evry_plug_view_helpdir)" "$(DESTDIR)$(evry_plug_view_thumbdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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-evry_plug_previewLTLIBRARIES \
+	clean-evry_plug_view_helpLTLIBRARIES \
+	clean-evry_plug_view_thumbLTLIBRARIES clean-generic \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-evry_plug_previewLTLIBRARIES \
+	install-evry_plug_view_helpLTLIBRARIES \
+	install-evry_plug_view_thumbLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-evry_plug_previewLTLIBRARIES \
+	uninstall-evry_plug_view_helpLTLIBRARIES \
+	uninstall-evry_plug_view_thumbLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+	clean-evry_plug_previewLTLIBRARIES \
+	clean-evry_plug_view_helpLTLIBRARIES \
+	clean-evry_plug_view_thumbLTLIBRARIES clean-generic \
+	clean-libtool 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-dvi install-dvi-am \
+	install-evry_plug_previewLTLIBRARIES \
+	install-evry_plug_view_helpLTLIBRARIES \
+	install-evry_plug_view_thumbLTLIBRARIES install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am 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-evry_plug_previewLTLIBRARIES \
+	uninstall-evry_plug_view_helpLTLIBRARIES \
+	uninstall-evry_plug_view_thumbLTLIBRARIES
+
+# 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/everything/views/evry_plug_preview.c b/src/modules/everything/views/evry_plug_preview.c
new file mode 100644
index 0000000..df86ebf
--- /dev/null
+++ b/src/modules/everything/views/evry_plug_preview.c
@@ -0,0 +1,263 @@
+#include "Evry.h"
+
+typedef struct _Image_View Image_View;
+
+
+struct _Image_View
+{
+  Evry_View view;
+  Evas *evas;
+
+  const Evry_State *state;
+
+  Evas_Object *o_main;
+
+  Eina_List *items;
+  Evas_Object *o_thumb[4];
+};
+
+
+static Evry_View *view = NULL;
+static const char *view_types = NULL;
+
+static int
+_check_item(const Evry_Item *it)
+{
+   if (!it || it->plugin->type_out != view_types) return 0;
+
+   ITEM_FILE(file, it);
+
+   if (!file->uri || !file->mime) return 0;
+
+   if (!strncmp(file->mime, "image/", 6))
+     return 1;
+
+   return 0;
+}
+
+static void
+_cb_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Coord w, h;
+   Image_View *v = data;
+
+   e_icon_size_get(v->o_thumb[1], &w, &h);
+   edje_extern_object_min_size_set(v->o_thumb[1], w, h);
+   edje_object_part_swallow(v->o_main, "e.swallow.icon2", v->o_thumb[1]);
+   evas_object_show(v->o_thumb[1]);
+}
+
+void
+_show_item(Image_View *v, const Evry_Item_File *file, int dir)
+{
+   int w, h;
+
+   if (v->o_thumb[1 + dir])
+     {
+	e_thumb_icon_end(v->o_thumb[1+dir]);
+	edje_object_part_unswallow(v->o_main, v->o_thumb[1+dir]);
+	evas_object_hide(v->o_thumb[1+dir]);
+	evas_object_del(v->o_thumb[1+dir]);
+     }
+
+   if (dir && v->o_thumb[1])
+     {
+	edje_object_part_unswallow(v->o_main, v->o_thumb[1]);
+
+	if (dir > 0)
+	  {
+	     v->o_thumb[2] = v->o_thumb[1];
+	     edje_object_part_swallow(v->o_main, "e.swallow.icon1", v->o_thumb[2]);
+	  }
+	else
+	  {
+	     v->o_thumb[0] = v->o_thumb[1];
+	     edje_object_part_swallow(v->o_main, "e.swallow.icon3", v->o_thumb[0]);
+	  }
+     }
+
+   v->o_thumb[1] = e_thumb_icon_add(v->evas);
+   e_thumb_icon_file_set(v->o_thumb[1], file->uri, NULL);
+   evas_object_smart_callback_add(v->o_thumb[1], "e_thumb_gen", _cb_preview_thumb_gen, v);
+   edje_object_part_geometry_get(v->o_main, "e.swallow.icon2", NULL, NULL, &w, &h);
+   e_thumb_icon_size_set(v->o_thumb[1], w, h);
+   e_thumb_icon_begin(v->o_thumb[1]);
+
+   if (dir)
+     {
+	if (dir > 0)
+	  edje_object_signal_emit(v->o_main, "e,signal,slide_left", "e");
+	else
+	  edje_object_signal_emit(v->o_main, "e,signal,slide_right", "e");
+     }
+}
+
+static int
+_cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
+{
+   Image_View *v = (Image_View *) view;
+
+   Eina_List *l;
+   Evry_Item_File *file = NULL;
+
+   ITEM_FILE(cur_item, v->state->cur_item);
+
+   if (!strcmp(ev->key, "Down"))
+     {
+	if (!v->items) return 1;
+
+	l = eina_list_data_find_list(v->items, cur_item);
+
+	if (l && l->next)
+	  file = l->next->data;
+	else
+	  file = v->items->data;
+
+	if (file && (file != cur_item))
+	  {
+	     _show_item(v, file, 1);
+	     evry_item_select(v->state, EVRY_ITEM(file));
+	  }
+	return 1;
+     }
+   else if (!strcmp(ev->key, "Up"))
+     {
+	if (!v->items) return 1;
+
+	l = eina_list_data_find_list(v->items, cur_item);
+
+	if (l && l->prev)
+	  file = l->prev->data;
+	else
+	  file = eina_list_last(v->items)->data;
+
+	if (file && (file != cur_item))
+	  {
+	     _show_item(v, file, -1);
+	     evry_item_select(v->state, EVRY_ITEM(file));
+	  }
+	return 1;
+     }
+
+   return 0;
+}
+
+static void
+_view_clear(Evry_View *view)
+{
+   Image_View *v = (Image_View *) view;
+
+   if (v->o_thumb[0]) evas_object_del(v->o_thumb[0]);
+   v->o_thumb[0] = NULL;
+   if (v->o_thumb[1]) evas_object_del(v->o_thumb[1]);
+   v->o_thumb[1] = NULL;
+   if (v->o_thumb[2]) evas_object_del(v->o_thumb[2]);
+   v->o_thumb[2] = NULL;
+   if (v->items) eina_list_free(v->items);
+   v->items = NULL;
+}
+
+static Eina_List *
+_get_list(const Evry_State *s)
+{
+   Eina_List *l, *items = NULL;
+   Evry_Item *it;
+
+   EINA_LIST_FOREACH(s->plugin->items, l, it)
+     if (_check_item(it))
+       items = eina_list_append(items, it);
+
+   return items;
+}
+
+static int
+_view_update(Evry_View *view)
+{
+   Image_View *v = (Image_View *) view;
+   Evry_Item_File *file;
+   Evry_Item *selected = v->state->cur_item;
+
+   v->items = _get_list(v->state);
+   if (!v->items) return 0;
+
+   file = eina_list_data_find(v->items, selected);
+   if (!file)
+     {
+	file = v->items->data;
+	evry_item_select(v->state, EVRY_ITEM(file));
+     }
+
+   _show_item(v, file, 0);
+
+   return 1;
+}
+
+static Evry_View *
+_view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
+{
+   Image_View *v;
+   int w, h, x, y;
+
+   if (!s->plugin)
+     return NULL;
+
+   if (!_get_list(s))
+     return NULL;
+
+   v = E_NEW(Image_View, 1);
+   v->view = *view;
+   v->state = s;
+   v->evas = evas_object_evas_get(swallow);
+   v->o_main = edje_object_add(v->evas);
+   e_theme_edje_object_set(v->o_main, "base/theme/everything",
+			   "e/modules/everything/preview");
+
+   edje_object_part_geometry_get(swallow, "e.swallow.list", &x, &y, &w, &h);
+   edje_extern_object_min_size_set(v->o_main, w * 3, 100);
+   evas_object_resize(v->o_main, w * 3, h);
+
+   EVRY_VIEW(v)->o_list = v->o_main;
+
+   return EVRY_VIEW(v);
+}
+
+static void
+_view_destroy(Evry_View *view)
+{
+   Image_View *v = (Image_View *) view;
+
+   _view_clear(view);
+   evas_object_del(v->o_main);
+
+   E_FREE(v);
+}
+
+static Eina_Bool
+_init(void)
+{
+   view = E_NEW(Evry_View, 1);
+   view->id = view;
+   view->name = "Image Viewer";
+   view->create = &_view_create;
+   view->destroy = &_view_destroy;
+   view->update = &_view_update;
+   view->clear = &_view_clear;
+   view->cb_key_down = &_cb_key_down;
+   evry_view_register(view, 3);
+
+   view_types = eina_stringshare_add("FILE");
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   eina_stringshare_del(view_types);
+   evry_view_unregister(view);
+   E_FREE(view);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/views/evry_plug_view_help.c b/src/modules/everything/views/evry_plug_view_help.c
new file mode 100644
index 0000000..7c207ae
--- /dev/null
+++ b/src/modules/everything/views/evry_plug_view_help.c
@@ -0,0 +1,136 @@
+#include "Evry.h"
+
+static Evry_View *view;
+static Evas_Object *o_text = NULL;
+
+static void
+_view_clear(Evry_View *v)
+{
+   v->active = 0;
+   evas_object_del(v->o_list);
+   evas_object_del(o_text);
+   o_text = NULL;
+}
+
+
+static int
+_view_update(Evry_View *v)
+{
+   return 1;
+}
+
+static int
+_cb_key_down(Evry_View *v, const Ecore_Event_Key *ev)
+{
+   Evas_Object *o;
+   double align;
+   int h;
+
+   if (!strcmp(ev->key, "Down"))
+     {
+	o = v->o_list;
+	evas_object_geometry_get(o, NULL, NULL, NULL, &h);
+	e_box_align_get(o, NULL, &align);
+
+	align = align - (double)10/(double)h;
+	if (align < 0.0) align = 0.0;
+
+	e_box_align_set(v->o_list, 0.5, align);
+
+	return 1;
+     }
+   else if (!strcmp(ev->key, "Up"))
+     {
+	o = v->o_list;
+	evas_object_geometry_get(o, NULL, NULL, NULL, &h);
+	e_box_align_get(o, NULL, &align);
+
+	align = align + (double)10/(double)h;
+	if (align > 1.0) align = 1.0;
+
+	e_box_align_set(v->o_list, 0.5, align);
+	return 1;
+     }
+
+   return 0;
+}
+
+static Evry_View *
+_view_create(Evry_View *v, const Evry_State *s, const Evas_Object *swallow)
+{
+   Evas_Object *o;
+   int mw, mh;
+
+   char *text =
+     "<title><b>Welcome!</b></title>"
+     "Ok, here comes the explanation of <hilight>everything</hilight>...<br>"
+     "Just type a few letters of the thing you are looking for. <br>"
+     "Use cursor <hilight>&lt;up/down&gt;</hilight> to choose from the list of things.<br>"
+     "Press  <hilight>&lt;tab&gt;</hilight> to select "
+     "an action, then press  <hilight>&lt;return&gt;</hilight>.<br>"
+     /* "You might want to know <br>some mo keybinding to ease your experience though.<br>" */
+     "<hilight>&lt;space&gt;&lt;?&gt;</hilight> show this page<br>"
+     "<hilight>&lt;ctrl+letter&gt;</hilight> jump to plugin beginning with 'letter'<br>"
+     "<hilight>&lt;ctrl+left/right&gt;</hilight>"
+     "cycle through plugins<br>"
+     "<hilight>&lt;ctrl+1&gt;</hilight> "
+     "choose a different view (e.g. for images)<br>";
+
+   if (v->active) return v;
+
+   o = e_box_add(evas_object_evas_get(swallow));
+   e_box_orientation_set(o, 0);
+   e_box_align_set(o, 0.5, 1.0);
+   v->o_list = o;
+   e_box_freeze(v->o_list);
+   o = edje_object_add(evas_object_evas_get(swallow));
+   e_theme_edje_object_set(o, "base/theme/widgets",
+			   "e/widgets/textblock");
+
+   edje_object_part_text_set(o, "e.textblock.text", text);
+   e_box_pack_start(v->o_list, o);
+   edje_object_size_min_calc(o, &mw, &mh);
+   e_box_pack_options_set(o, 1, 0, 1, 0, 0.5, 0.5, mw, mh + 200, 999, 999);
+   e_box_thaw(v->o_list);
+   evas_object_show(o);
+   o_text = o;
+
+   v->active = 1;
+
+   return v;
+}
+
+static void
+_view_destroy(Evry_View *v)
+{
+   v->active = 0;
+}
+
+static Eina_Bool
+_init(void)
+{
+   view = E_NEW(Evry_View, 1);
+   view->id = view;
+   view->name = "Help";
+   view->create = &_view_create;
+   view->destroy = &_view_destroy;
+   view->update = &_view_update;
+   view->clear = &_view_clear;
+   view->cb_key_down = &_cb_key_down;
+   view->trigger = "?";
+   /* view->types = "NONE"; */
+   evry_view_register(view, 2);
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   evry_view_unregister(view);
+   E_FREE(view);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
diff --git a/src/modules/everything/views/evry_plug_view_thumb.c b/src/modules/everything/views/evry_plug_view_thumb.c
new file mode 100644
index 0000000..e4f57b7
--- /dev/null
+++ b/src/modules/everything/views/evry_plug_view_thumb.c
@@ -0,0 +1,1028 @@
+#include "e_mod_main.h"
+
+typedef struct _View View;
+typedef struct _Smart_Data Smart_Data;
+typedef struct _Item Item;
+
+struct _View
+{
+  Evry_View view;
+  Tab_View *tabs;
+
+  const Evry_State *state;
+  const Evry_Plugin *plugin;
+
+  Evas *evas;
+  Evas_Object *bg, *sframe, *span;
+  int          iw, ih;
+  int          zoom;
+  int         list_mode;
+};
+
+/* smart object based on wallpaper module */
+struct _Smart_Data
+{
+  View        *view;
+  Eina_List   *items;
+  Item        *cur_item;
+  Ecore_Idle_Enterer *idle_enter;
+  Ecore_Idle_Enterer *thumb_idler;
+  Ecore_Idle_Enterer *update_idler;
+  Ecore_Animator *animator;
+  Evas_Coord   x, y, w, h;
+  Evas_Coord   cx, cy, cw, ch;
+  Evas_Coord   sx, sy;
+  double       selmove;
+  Eina_Bool    update : 1;
+  Eina_Bool    switch_mode : 1;
+};
+
+struct _Item
+{
+  Evry_Item *item;
+  Evas_Object *obj;
+  Evas_Coord x, y, w, h;
+  Evas_Object *frame, *image, *thumb;
+  Eina_Bool selected : 1;
+  Eina_Bool have_thumb : 1;
+  Eina_Bool do_thumb : 1;
+  Eina_Bool get_thumb : 1;
+  Eina_Bool showing : 1;
+  Eina_Bool visible : 1;
+  Eina_Bool changed : 1;
+  int pos;
+};
+
+static View *view = NULL;
+static const char *view_types = NULL;
+
+static void
+_thumb_gen(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Coord w, h;
+   Item *it = data;
+
+   if (!it->frame) return;
+
+   e_icon_size_get(it->thumb, &w, &h);
+   edje_extern_object_aspect_set(it->thumb, EDJE_ASPECT_CONTROL_BOTH, w, h);
+   edje_object_part_swallow(it->frame, "e.swallow.thumb", it->thumb);
+   evas_object_show(it->thumb);
+   it->have_thumb = EINA_TRUE;
+   it->do_thumb = EINA_FALSE;
+
+   if (it->image) evas_object_del(it->image);
+   it->image = NULL;
+
+}
+
+static int
+_thumb_idler(void *data)
+{
+   Smart_Data *sd = data;
+   Eina_List *l;
+   Item *it;
+   int cnt = 0;
+
+   EINA_LIST_FOREACH(sd->items, l, it)
+     {
+	if (it->thumb && !(it->have_thumb || it->do_thumb))
+	  {
+	     ITEM_FILE(file, it->item);
+
+	     evas_object_smart_callback_add(it->thumb, "e_thumb_gen", _thumb_gen, it);
+
+	     e_thumb_icon_file_set(it->thumb, file->uri, NULL);
+	     e_thumb_icon_size_set(it->thumb, it->w, it->h);
+	     e_thumb_icon_begin(it->thumb);
+	     it->do_thumb = EINA_TRUE;
+
+	     cnt++;
+	  }
+
+	if (cnt > 4)
+	  {
+	     e_util_wakeup();
+	     return 1;
+	  }
+     }
+
+   sd->thumb_idler = NULL;
+
+   return 0;
+}
+
+static int
+_check_item(const Evry_Item *it)
+{
+   if (it->plugin->type_out != view_types) return 0;
+
+   ITEM_FILE(file, it);
+
+   if (!file->uri || !file->mime) return 0;
+
+   if (!strncmp(file->mime, "image/", 6))
+     return 1;
+
+   return 0;
+}
+
+static int
+_e_smart_reconfigure_do(void *data)
+{
+   Evas_Object *obj = data;
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   Eina_List *l;
+   Item *it;
+   int iw, redo = 0, changed = 0;
+   static int recursion = 0;
+   Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox = 0, oy = 0;
+   Evas_Coord aspect_w, aspect_h;
+
+   if (!sd) return 0;
+   if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
+   if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
+   if (sd->cx < 0) sd->cx = 0;
+   if (sd->cy < 0) sd->cy = 0;
+
+   aspect_w = sd->w;
+   aspect_h = sd->h;
+
+   if (sd->view->list_mode)
+     {
+	iw = sd->w;
+     }
+   else if (sd->view->zoom == 0)
+     {
+	int cnt = eina_list_count(sd->items);
+
+	aspect_w *= 3;
+	aspect_w /= 4;
+
+	if (cnt < 3)
+	  iw = (double)sd->w / 2.5;
+	else if (cnt < 7)
+	  iw = sd->w / 3;
+	else
+	  iw = sd->w / 4;
+     }
+   else if (sd->view->zoom == 1)
+     {
+	aspect_w *= 2;
+	aspect_w /= 3;
+	iw = sd->w / 3;
+     }
+   else /* if (sd->zoom == 2) */
+     {
+	iw = sd->w;
+     }
+
+   if (aspect_w <= 0) aspect_w = 1;
+   if (aspect_h <= 0) aspect_h = 1;
+
+   x = 0;
+   y = 0;
+   ww = iw;
+   if (sd->view->list_mode)
+     hh = 32;
+   else
+     hh = (aspect_h * iw) / (aspect_w);
+
+   mw = mh = 0;
+   EINA_LIST_FOREACH(sd->items, l, it)
+     {
+        if (x > (sd->w - ww))
+          {
+             x = 0;
+             y += hh;
+          }
+
+        it->x = x;
+        it->y = y;
+        it->w = ww;
+        it->h = hh;
+
+        if ((x + ww) > mw) mw = x + ww;
+        if ((y + hh) > mh) mh = y + hh;
+        x += ww;
+     }
+
+   if ((mw != sd->cw) || (mh != sd->ch))
+     {
+        sd->cw = mw;
+        sd->ch = mh;
+        if (sd->cx > (sd->cw - sd->w))
+          {
+             sd->cx = sd->cw - sd->w;
+             redo = 1;
+          }
+        if (sd->cy > (sd->ch - sd->h))
+          {
+             sd->cy = sd->ch - sd->h;
+             redo = 1;
+          }
+        if (sd->cx < 0)
+          {
+             sd->cx = 0;
+             redo = 1;
+          }
+        if (sd->cy < 0)
+          {
+             sd->cy = 0;
+             redo = 1;
+          }
+        if (redo)
+   	  {
+   	     recursion = 1;
+   	     _e_smart_reconfigure_do(obj);
+   	     recursion = 0;
+   	  }
+        changed = 1;
+     }
+
+   if (sd->switch_mode) 
+     {
+	if (changed)
+	  evas_object_smart_callback_call(obj, "changed", NULL);
+	
+	sd->update = EINA_TRUE;
+	sd->switch_mode = EINA_FALSE;
+
+	if (recursion == 0)
+	  sd->idle_enter = NULL;
+	return 0;
+     }
+   
+   if (!sd->view->list_mode)
+     {
+	if (sd->w > sd->cw) ox = (sd->w - sd->cw) / 2;
+	if (sd->h > sd->ch) oy = (sd->h - sd->ch) / 2;
+     }
+     
+   EINA_LIST_FOREACH(sd->items, l, it)
+     {
+        xx = sd->x - sd->cx + it->x + ox;
+        yy = sd->y - sd->cy + it->y + oy;
+
+        if (E_INTERSECTS(xx, yy, it->w, it->h, 0, sd->y - (it->h*4),
+			 sd->x + sd->w, sd->y + sd->h + it->h*8))
+          {
+	     if (!it->visible)
+	       {
+		  it->frame = edje_object_add(sd->view->evas);
+		  if (sd->view->list_mode)
+		    e_theme_edje_object_set(it->frame, "base/theme/widgets",
+					    "e/modules/everything/thumbview/item/list");
+		  else
+		    e_theme_edje_object_set(it->frame, "base/theme/widgets",
+					    "e/modules/everything/thumbview/item/thumb");
+
+		  evas_object_smart_member_add(it->frame, obj);
+		  evas_object_clip_set(it->frame, evas_object_clip_get(obj));
+
+		  edje_object_part_text_set(it->frame, "e.text.label", it->item->label);
+		  evas_object_show(it->frame);
+
+		  if (it->changed)
+		    {
+		       edje_object_signal_emit(it->frame, "e,action,thumb,show_delayed", "e");
+		    }
+		  else
+		    {
+		       edje_object_signal_emit(it->frame, "e,action,thumb,show", "e");
+		    }
+
+		  if (it->item->browseable)
+		    edje_object_signal_emit(it->frame, "e,state,browseable", "e");
+		  
+
+		  it->visible = EINA_TRUE;
+	       }
+
+	     if (!it->image && !it->have_thumb &&
+		 it->item->plugin && it->item->plugin->icon_get)
+	       {
+		  it->image = it->item->plugin->icon_get
+		    (it->item->plugin, it->item, sd->view->evas);
+
+		  if (it->image)
+		    {
+		       edje_object_part_swallow(it->frame, "e.swallow.icon", it->image);
+		       evas_object_show(it->image);
+		    }
+
+		  /* dirbrowse fetches the mimetype for icon_get */
+		  if (!it->get_thumb && _check_item(it->item))
+		    it->get_thumb = EINA_TRUE;
+
+	       }
+
+	     evas_object_move(it->frame, xx, yy);
+	     evas_object_resize(it->frame, it->w, it->h);
+
+	     if (sd->update || it->changed)
+	       {
+		  if (it->selected && sd->view->zoom < 2)
+		    edje_object_signal_emit(it->frame, "e,state,selected", "e");
+		  else
+		    edje_object_signal_emit(it->frame, "e,state,unselected", "e");
+	       }
+
+	     if (it->get_thumb && !it->thumb)
+	       {
+		  it->thumb = e_thumb_icon_add(sd->view->evas);
+
+		  if (!sd->thumb_idler)
+		    sd->thumb_idler = ecore_idle_enterer_before_add(_thumb_idler, sd);
+	       }
+	     
+	     it->changed = EINA_FALSE;
+	     
+          }
+        else if (it->visible)
+	  {
+	     if (it->do_thumb) e_thumb_icon_end(it->thumb);
+	     if (it->thumb) evas_object_del(it->thumb);
+	     if (it->image) evas_object_del(it->image);
+	     if (it->frame) evas_object_del(it->frame);
+
+	     it->thumb = NULL;
+	     it->image = NULL;
+	     it->frame = NULL;
+
+	     it->have_thumb = EINA_FALSE;
+	     it->do_thumb = EINA_FALSE;
+	     it->visible = EINA_FALSE;
+	  }
+	it->changed = EINA_FALSE;
+     }
+
+   if (changed)
+     evas_object_smart_callback_call(obj, "changed", NULL);
+
+   sd->update = EINA_TRUE;
+
+   if (recursion == 0)
+     sd->idle_enter = NULL;
+   return 0;
+}
+
+static void
+_e_smart_reconfigure(Evas_Object *obj)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+
+   if (sd->idle_enter) return;
+   sd->idle_enter = ecore_idle_enterer_before_add(_e_smart_reconfigure_do, obj);
+}
+
+static void
+_e_smart_add(Evas_Object *obj)
+{
+   Smart_Data *sd = calloc(1, sizeof(Smart_Data));
+   if (!sd) return;
+   sd->x = sd->y = sd->w = sd->h = 0;
+   sd->sx = sd->sy = -1;
+   evas_object_smart_data_set(obj, sd);
+}
+
+static void
+_e_smart_del(Evas_Object *obj)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   Item *it;
+
+   if (sd->idle_enter)
+     ecore_idle_enterer_del(sd->idle_enter);
+   if (sd->thumb_idler)
+     ecore_idle_enterer_del(sd->thumb_idler);
+
+   // sd->view is just referenced
+   // sd->child_obj is unused
+   EINA_LIST_FREE(sd->items, it)
+     {
+	if (it->do_thumb) e_thumb_icon_end(it->thumb);
+        if (it->thumb) evas_object_del(it->thumb);
+        if (it->frame) evas_object_del(it->frame);
+        if (it->image) evas_object_del(it->image);
+	evry_item_free(it->item);
+        free(it);
+     }
+   free(sd);
+   evas_object_smart_data_set(obj, NULL);
+}
+
+static void
+_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   sd->x = x;
+   sd->y = y;
+   _e_smart_reconfigure(obj);
+}
+
+static void
+_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   sd->w = w;
+   sd->h = h;
+   _e_smart_reconfigure(obj);
+   evas_object_smart_callback_call(obj, "changed", NULL);
+}
+
+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 Evas_Object *
+_pan_add(Evas *evas)
+{
+   static Evas_Smart *smart = NULL;
+   static const Evas_Smart_Class sc =
+     {
+       "wp_pan",
+       EVAS_SMART_CLASS_VERSION,
+       _e_smart_add,
+       _e_smart_del,
+       _e_smart_move,
+       _e_smart_resize,
+       _e_smart_show,
+       _e_smart_hide,
+       _e_smart_color_set,
+       _e_smart_clip_set,
+       _e_smart_clip_unset,
+       NULL,
+       NULL,
+       NULL,
+       NULL
+     };
+   smart = evas_smart_class_new(&sc);
+   return evas_object_smart_add(evas, smart);
+}
+
+static void
+_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (x > (sd->cw - sd->w)) x = sd->cw - sd->w;
+   if (y > (sd->ch - sd->h)) y = sd->ch - sd->h;
+   if (x < 0) x = 0;
+   if (y < 0) y = 0;
+   if ((sd->cx == x) && (sd->cy == y)) return;
+   sd->cx = x;
+   sd->cy = y;
+   _e_smart_reconfigure(obj);
+}
+
+static void
+_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (x) *x = sd->cx;
+   if (y) *y = sd->cy;
+}
+
+static void
+_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (x)
+     {
+        if (sd->w < sd->cw) *x = sd->cw - sd->w;
+        else *x = 0;
+     }
+   if (y)
+     {
+        if (sd->h < sd->ch) *y = sd->ch - sd->h;
+        else *y = 0;
+     }
+}
+
+static void
+_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (w) *w = sd->cw;
+   if (h) *h = sd->ch;
+}
+
+static void
+_pan_view_set(Evas_Object *obj, View *view)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   sd->view = view;
+}
+
+static Item *
+_pan_item_add(Evas_Object *obj, Evry_Item *item)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   Item *it;
+
+   it = E_NEW(Item, 1);
+   if (!it) return NULL;
+
+   sd->items = eina_list_append(sd->items, it);
+   it->obj = obj;
+   it->item = item;
+   it->changed = EINA_TRUE;
+
+   if (_check_item(item))
+     it->get_thumb = EINA_TRUE;
+
+   evry_item_ref(item);
+
+   _e_smart_reconfigure(obj);
+
+   return it;
+}
+
+static void
+_pan_item_remove(Evas_Object *obj, Item *it)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+
+   sd->items = eina_list_remove(sd->items, it);
+   if (it->do_thumb) e_thumb_icon_end(it->thumb);
+   if (it->thumb) evas_object_del(it->thumb);
+   if (it->frame) evas_object_del(it->frame);
+   if (it->image) evas_object_del(it->image);
+
+   evry_item_free(it->item);
+   E_FREE(it);
+
+   _e_smart_reconfigure(obj);
+}
+
+static void
+_pan_item_select(Evas_Object *obj, Item *it)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   int align = -1;
+
+   if (sd->cur_item)
+     {
+	sd->cur_item->selected = EINA_FALSE;
+	edje_object_signal_emit(sd->cur_item->frame, "e,state,unselected", "e");
+     }
+
+   if (it)
+     {
+	sd->update = EINA_FALSE;
+
+	sd->cur_item = it;
+	sd->cur_item->selected = EINA_TRUE;
+
+	if (sd->view->list_mode)
+	  align = it->y - (double)it->y / (double)sd->ch * (sd->h - it->h);
+	else if ((it->y + it->h) - sd->cy > sd->h)
+	  align = it->y - (2 - sd->view->zoom) * it->h;
+	else if (it->y < sd->cy)
+	  align = it->y;
+
+	if (align >= 0)
+	  e_scrollframe_child_pos_set(sd->view->sframe, 0, align);
+
+	if (sd->view->zoom < 2)
+	  edje_object_signal_emit(sd->cur_item->frame, "e,state,selected", "e");
+
+	if (sd->idle_enter) ecore_idle_enterer_del(sd->idle_enter);
+	sd->idle_enter = ecore_idle_enterer_before_add(_e_smart_reconfigure_do, obj);
+     }
+}
+
+static void
+_view_clear(Evry_View *view)
+{
+   View *v = (View*) view;
+   Smart_Data *sd = evas_object_smart_data_get(v->span);
+   Item *it;
+
+   EINA_LIST_FREE(sd->items, it)
+     {
+	if (it->do_thumb) e_thumb_icon_end(it->thumb);
+   	if (it->thumb) evas_object_del(it->thumb);
+   	if (it->frame) evas_object_del(it->frame);
+   	if (it->image) evas_object_del(it->image);
+   	evry_item_free(it->item);
+   	E_FREE(it);
+     }
+
+   if (sd->idle_enter) ecore_idle_enterer_del(sd->idle_enter);
+   sd->idle_enter = ecore_idle_enterer_before_add(_e_smart_reconfigure_do, v->span);
+
+   v->tabs->clear(v->tabs);
+}
+
+static int
+_sort_cb(const void *data1, const void *data2)
+{
+   const Item *it1 = data1;
+   const Item *it2 = data2;
+
+   return it1->pos - it2->pos;
+}
+
+static int
+_update_frame(Evas_Object *obj)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   sd->switch_mode = EINA_TRUE;
+   _e_smart_reconfigure_do(obj);
+   sd->switch_mode = EINA_FALSE;
+   _pan_item_select(obj, sd->cur_item); 
+
+   return 0;
+}
+
+static int
+_view_update(Evry_View *view)
+{
+   VIEW(v, view);
+   Smart_Data *sd = evas_object_smart_data_get(v->span);
+   Item *v_it;
+   Evry_Item *p_it;
+   Eina_List *l, *ll, *p_items, *v_remove = NULL, *v_items = NULL;
+   int pos, last_pos, last_vis = 0, first_vis = 0;
+   Eina_Bool update = EINA_FALSE;
+   
+   if (!v->state->plugin)
+     {
+	_view_clear(view);
+	return 1;
+     }
+   
+   p_items = v->state->plugin->items;
+
+   /* go through current view items */
+   EINA_LIST_FOREACH(sd->items, l, v_it)
+     {
+	last_pos = v_it->pos;
+	v_it->pos = 0;
+	pos = 1;	
+	
+	/* go through plugins current items */
+	EINA_LIST_FOREACH(p_items, ll, p_it)
+	  {
+	     if (v_it->item == p_it)
+	       {
+		  if (pos != last_pos)
+		    v_it->changed = EINA_TRUE;
+		  
+		  v_it->pos = pos;
+
+		  /* set selected state -> TODO remove*/
+		  if (p_it == v->state->cur_item)
+		    {
+		       sd->cur_item = v_it;
+		       v_it->selected = EINA_TRUE;
+		    }
+		  else
+		    v_it->selected = EINA_FALSE;
+
+		  break;
+	       }
+	     pos++;
+	  }
+
+	if (v_it->visible)
+	  {
+	     if (!first_vis)
+	       first_vis = v_it->pos;
+	     last_vis = v_it->pos;
+	  }
+	
+	/* view item is in list of current items */
+	if (v_it->pos)
+	  {
+	     v_items = eina_list_append(v_items, v_it->item);
+
+	     if (_check_item(v_it->item))
+	       v_it->get_thumb = EINA_TRUE;
+	     
+	     if (v_it->visible && v_it->changed)
+	       update = EINA_TRUE;
+	  }
+	else
+	  {
+	     if (v_it->visible) update = EINA_TRUE;
+	     v_remove = eina_list_append(v_remove, v_it);
+	  }
+     }
+
+   EINA_LIST_FREE(v_remove, v_it)
+     _pan_item_remove(v->span, v_it);
+
+   /* go through plugins current items */
+   pos = 1;
+   EINA_LIST_FOREACH(p_items, l, p_it)
+     {
+	/* item is not already in view */
+	if (!eina_list_data_find_list(v_items, p_it))
+	  {
+	     v_it = _pan_item_add(v->span, p_it);
+
+	     if (!v_it) continue;
+
+	     v_it->pos = pos;
+
+	     /* TODO no needed */
+	     if (p_it == v->state->cur_item)
+	       {
+		  sd->cur_item = v_it;
+		  v_it->selected = EINA_TRUE;
+	       }
+
+	     if (pos > first_vis && pos < last_vis)
+	       update = EINA_TRUE;
+	  }
+	pos++;
+     }
+
+   sd->items = eina_list_sort(sd->items, eina_list_count(sd->items), _sort_cb);
+
+   if (update || !last_vis || v->plugin != v->state->plugin)
+     {
+	v->plugin = v->state->plugin;
+	
+	sd->update = EINA_TRUE;
+	_update_frame(v->span);
+     }
+   
+   if (v_items) eina_list_free(v_items);
+   
+   v->tabs->update(v->tabs);
+
+   sd->update_idler = NULL;
+   
+   return 0;
+}
+
+static void
+_clear_items(Evas_Object *obj)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   Eina_List *l;
+   Item *it;
+
+   EINA_LIST_FOREACH(sd->items, l, it)
+     {
+	if (it->do_thumb)
+	  e_thumb_icon_end(it->thumb);
+	if (it->frame) evas_object_del(it->frame);
+	if (it->image) evas_object_del(it->image);
+	if (it->thumb) evas_object_del(it->thumb);
+	it->frame = NULL;
+	it->image = NULL;
+	it->thumb = NULL;
+	it->have_thumb = EINA_FALSE;
+	it->do_thumb = EINA_FALSE;
+	it->visible = EINA_FALSE;
+     }
+}
+
+static int
+_cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
+{
+   View *v = (View *) view;
+   Smart_Data *sd = evas_object_smart_data_get(v->span);
+   Eina_List *l = NULL, *ll;
+   Item *it = NULL;
+
+   if (!v->state->plugin)
+     return 0;
+
+   if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
+       (!strcmp(ev->key, "2")))
+     {
+	v->list_mode = v->list_mode ? EINA_FALSE : EINA_TRUE;
+	v->zoom = 0;
+	_clear_items(v->span);
+	_update_frame(v->span);
+     }
+   else if ((ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
+       ((!strcmp(ev->key, "plus")) ||
+	(!strcmp(ev->key, "3"))))
+     {
+	v->zoom++;
+	if (v->zoom > 2) v->zoom = 0;
+	if (v->zoom == 2)
+	  _clear_items(v->span);
+
+	_update_frame(v->span);
+	goto end;
+     }
+
+   if (v->tabs->key_down(v->tabs, ev))
+     {
+	_view_update(view);
+	return 1;
+     }
+
+   if (sd->items)
+     l = eina_list_data_find_list(sd->items, sd->cur_item);
+
+   if (!v->list_mode && !evry_conf->cycle_mode)
+     {
+	if (!strcmp(ev->key, "Right"))
+	  {
+	     if (l && l->next)
+	       it = l->next->data;
+
+	     if (it)
+	       {
+		  _pan_item_select(v->span, it);
+		  evry_item_select(v->state, it->item);
+	       }
+	     goto end;
+	  }
+	else if (!strcmp(ev->key, "Left"))
+	  {
+	     if (!sd->items) return 1;
+
+	     if (l && l->prev)
+	       it = l->prev->data;
+
+	     if (it)
+	       {
+		  _pan_item_select(v->span, it);
+		  evry_item_select(v->state, it->item);
+	       }
+	     goto end;
+	  }
+     }
+   if (!strcmp(ev->key, "Down"))
+     {
+	if (!sd->items) return 1;
+
+	if (!evry_conf->cycle_mode)
+	  {
+	     EINA_LIST_FOREACH(l, ll, it)
+	       {
+		  if (it->y > sd->cur_item->y &&
+		      it->x >= sd->cur_item->x)
+		    break;
+	       }
+	  }
+
+	if (!it && l && l->next)
+	  it = l->next->data;
+
+	if (it)
+	  {
+	     _pan_item_select(v->span, it);
+	     evry_item_select(v->state, it->item);
+	  }
+	goto end;
+     }
+   else if (!strcmp(ev->key, "Up"))
+     {
+	if (!sd->items) return 1;
+
+	if (!evry_conf->cycle_mode)
+	  {
+	     for(ll = l; ll; ll = ll->prev)
+	       {
+		  it = ll->data;
+		  
+		  if (it->y < sd->cur_item->y &&
+		      it->x <= sd->cur_item->x)
+		    break;
+	       }
+	  }
+
+	if (!it && l && l->prev)
+	  it = l->prev->data;
+
+	if (it)
+	  {
+	     _pan_item_select(v->span, it);
+	     evry_item_select(v->state, it->item);
+	  }
+	goto end;
+     }
+   else if (!strcmp(ev->key, "Return"))
+     {
+	if (!v->list_mode)
+	  {
+	     if (evry_browse_item(NULL))
+	       goto end;
+	  }
+     }
+   
+   return 0;
+
+ end:
+   return 1;
+}
+
+static Evry_View *
+_view_create(Evry_View *view, const Evry_State *s, const Evas_Object *swallow)
+{
+   VIEW(parent, view);
+
+   View *v;
+
+   if (!s->plugin)
+     return NULL;
+
+   v = E_NEW(View, 1);
+   v->view = *view;
+   v->state = s;
+   v->evas = evas_object_evas_get(swallow);
+
+   if (parent->list_mode < 0)
+     v->list_mode = evry_conf->view_mode ? 0 : 1;
+   else
+     v->list_mode = parent->list_mode;
+
+   v->zoom = parent->zoom;
+   
+   v->bg = edje_object_add(v->evas);
+   e_theme_edje_object_set(v->bg, "base/theme/widgets",
+                           "e/modules/everything/thumbview/main/window");
+   // scrolled thumbs
+   v->span = _pan_add(v->evas);
+   _pan_view_set(v->span, v);
+
+   // the scrollframe holding the scrolled thumbs
+   v->sframe = e_scrollframe_add(v->evas);
+   e_scrollframe_custom_theme_set(v->sframe, "base/theme/widgets",
+                                  "e/modules/everything/thumbview/main/scrollframe");
+   e_scrollframe_extern_pan_set(v->sframe, v->span,
+                                _pan_set, _pan_get, _pan_max_get,
+                                _pan_child_size_get);
+   edje_object_part_swallow(v->bg, "e.swallow.list", v->sframe);
+   evas_object_show(v->sframe);
+   evas_object_show(v->span);
+
+   EVRY_VIEW(v)->o_list = v->bg;
+
+   v->tabs = evry_tab_view_new(s, v->evas);
+   v->view.o_bar = v->tabs->o_tabs;
+
+   return EVRY_VIEW(v);
+}
+
+static void
+_view_destroy(Evry_View *view)
+{
+   VIEW(v, view);
+
+   evas_object_del(v->bg);
+   evas_object_del(v->sframe);
+   evas_object_del(v->span);
+
+   evry_tab_view_free(v->tabs);
+
+   E_FREE(v);
+}
+
+static Eina_Bool
+_init(void)
+{
+   View *v = E_NEW(View, 1);
+   
+   v->view.id = EVRY_VIEW(v);
+   v->view.name = "Icon View";
+   v->view.create = &_view_create;
+   v->view.destroy = &_view_destroy;
+   v->view.update = &_view_update;
+   v->view.clear = &_view_clear;
+   v->view.cb_key_down = &_cb_key_down;
+
+   v->list_mode = -1;
+   
+   evry_view_register(EVRY_VIEW(v), 1);
+
+   view = v;
+
+   view_types = eina_stringshare_add("FILE");
+
+   return EINA_TRUE;
+}
+
+static void
+_shutdown(void)
+{
+   eina_stringshare_del(view_types);
+   evry_view_unregister(EVRY_VIEW(view));
+   E_FREE(view);
+}
+
+
+EINA_MODULE_INIT(_init);
+EINA_MODULE_SHUTDOWN(_shutdown);
+
diff --git a/src/modules/exebuf/Makefile.in b/src/modules/exebuf/Makefile.in
index 0abb466..98ad800 100644
--- a/src/modules/exebuf/Makefile.in
+++ b/src/modules/exebuf/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/exebuf/e_exebuf.c b/src/modules/exebuf/e_exebuf.c
index 073abac..ac0c0fc 100644
--- a/src/modules/exebuf/e_exebuf.c
+++ b/src/modules/exebuf/e_exebuf.c
@@ -826,6 +826,8 @@ _e_exebuf_backspace(void)
      }
 }
 
+/* unused */
+#if 0
 static void
 _e_exebuf_delete(void)
 {
@@ -923,6 +925,7 @@ _e_exebuf_delete(void)
 	  }
      }
 }
+#endif
 
 static void
 _e_exebuf_clear(void)
diff --git a/src/modules/fileman/Makefile.in b/src/modules/fileman/Makefile.in
index b75fd5c..82e9c42 100644
--- a/src/modules/fileman/Makefile.in
+++ b/src/modules/fileman/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -341,6 +341,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -386,8 +387,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -503,7 +504,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 1a143b3..58889b2 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -44,8 +44,6 @@ struct _E_Fwin
 
    Ecore_Event_Handler *zone_handler;
    Ecore_Event_Handler *zone_del_handler;
-
-   unsigned char        geom_save_ready : 1;
 };
 
 struct _E_Fwin_Page
@@ -148,7 +146,7 @@ static Eina_List *fwins = NULL;
 EAPI int
 e_fwin_init(void)
 {
-   eina_stringshare_init();
+   eina_init();
 
    return 1;
 }
@@ -161,7 +159,7 @@ e_fwin_shutdown(void)
    EINA_LIST_FREE(fwins, fwin)
      e_object_del(E_OBJECT(fwin));
 
-   eina_stringshare_shutdown();
+   eina_shutdown();
 
    return 1;
 }
@@ -172,55 +170,7 @@ e_fwin_shutdown(void)
 EAPI void
 e_fwin_new(E_Container *con, const char *dev, const char *path)
 {
-   E_Fwin *fwin;
-   E_Fm2_Custom_File *cf;
-   char buf[PATH_MAX];
-   int x, y, w, h;
-
-   fwin = _e_fwin_new(con, dev, path);
-
-   if (!fwin) return;
-
-   snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->cur_page->fm_obj));
-   cf = e_fm2_custom_file_get(buf);
-   if ((cf) && (cf->geom.valid))
-     {
-	int zx, zy, zw, zh;
-
-	x = cf->geom.x;
-	y = cf->geom.y;
-	w = cf->geom.w;
-	h = cf->geom.h;
-
-	e_zone_useful_geometry_get(fwin->win->border->zone,
-				   &zx, &zy, &zw, &zh);
-
-	/* checking width and height */
-	if (w < 24)
-	  w = 280 * e_scale;
-	else if (w > zw)
-	  w = zw;
-	if (h < 24)
-	  h = 200 * e_scale;
-	else if (h > zh)
-	  h = zh;
-
-	/* checking left-top corner */
-	if (x < zx)
-	  x = zx;
-	if (y < zy)
-	  y = zy;
-
-	/* checking right-bottom corner */
-	if ((zx + zw) < (x + w))
-	  x = zx + zw - w;
-	if ((zy + zh) < (y + h))
-	  y = zy + zh - h;
-
-	e_win_move_resize(fwin->win, x, y, w, h);
-     }
-
-   fwin->geom_save_ready = 1;
+   _e_fwin_new(con, dev, path);
 }
 
 EAPI void
@@ -409,7 +359,8 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
    E_Fwin *fwin;
    E_Fwin_Page *page;
    Evas_Object *o;
-
+   char buf[PATH_MAX];
+   
    fwin = E_OBJECT_ALLOC(E_Fwin, E_FWIN_TYPE, _e_fwin_free);
    if (!fwin) return NULL;
    fwin->win = e_win_new(con);
@@ -448,10 +399,10 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
    evas_object_pass_events_set(o, 1);
    fwin->over_obj = o;
 
-   e_win_name_class_set(fwin->win, "E", "e_fwin");
-
    e_fm2_path_set(page->fm_obj, dev, path);
    _e_fwin_window_title_set(page);
+   snprintf(buf, sizeof(buf), "e_fwin::%s", e_fm2_real_path_get(fwin->cur_page->fm_obj));
+   e_win_name_class_set(fwin->win, "E", buf);
 
    e_win_size_min_set(fwin->win, 24, 24);
    e_win_resize(fwin->win, 280 * e_scale, 200 * e_scale);
@@ -474,7 +425,6 @@ _e_fwin_free(E_Fwin *fwin)
 {
    E_Fwin_Page *page;
 
-
    if (!fwin) return; //safety
 
    EINA_LIST_FREE(fwin->pages, page)
@@ -487,7 +437,6 @@ _e_fwin_free(E_Fwin *fwin)
 				       _e_fwin_zone_cb_mouse_down);
      }
 
-
    if (fwin->zone_handler) 
      ecore_event_handler_del(fwin->zone_handler);
    if (fwin->zone_del_handler) 
@@ -638,7 +587,7 @@ _e_fwin_cb_page_change(void *data1, void *data2)
    E_Fwin *fwin = data1;
    E_Fwin_Page *page = data2, *prev;
 
-   if (!fwin || !page) return;
+   if ((!fwin) || (!page)) return;
    prev = eina_list_nth(fwin->pages, fwin->page_index);
    fwin->page_index = page->index;
 
@@ -1084,27 +1033,27 @@ _e_fwin_cb_delete(E_Win *win)
    e_object_del(E_OBJECT(fwin));
 }
 
-static void
-_e_fwin_geom_save(E_Fwin *fwin)
-{
-   char buf[PATH_MAX];
-   E_Fm2_Custom_File *cf;
-
-   if (!fwin->geom_save_ready) return;
-   snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->cur_page->fm_obj));
-   cf = e_fm2_custom_file_get(buf);
-   if (!cf)
-     {
-	cf = alloca(sizeof(E_Fm2_Custom_File));
-	memset(cf, 0, sizeof(E_Fm2_Custom_File));
-     }
-   cf->geom.x = fwin->win->x;
-   cf->geom.y = fwin->win->y;
-   cf->geom.w = fwin->win->w;
-   cf->geom.h = fwin->win->h;
-   cf->geom.valid = 1;
-   e_fm2_custom_file_set(buf, cf);
-}
+/* static void
+ * _e_fwin_geom_save(E_Fwin *fwin)
+ * {
+ *    char buf[PATH_MAX];
+ *    E_Fm2_Custom_File *cf;
+ * 
+ *    if (!fwin->geom_save_ready) return;
+ *    snprintf(buf, sizeof(buf), "dir::%s", e_fm2_real_path_get(fwin->cur_page->fm_obj));
+ *    cf = e_fm2_custom_file_get(buf);
+ *    if (!cf)
+ *      {
+ * 	cf = alloca(sizeof(E_Fm2_Custom_File));
+ * 	memset(cf, 0, sizeof(E_Fm2_Custom_File));
+ *      }
+ *    cf->geom.x = fwin->win->x;
+ *    cf->geom.y = fwin->win->y;
+ *    cf->geom.w = fwin->win->w;
+ *    cf->geom.h = fwin->win->h;
+ *    cf->geom.valid = 1;
+ *    e_fm2_custom_file_set(buf, cf);
+ * } */
 
 static void
 _e_fwin_cb_move(E_Win *win)
@@ -1113,7 +1062,7 @@ _e_fwin_cb_move(E_Win *win)
 
    if (!win) return; //safety
    fwin = win->data;
-   _e_fwin_geom_save(fwin);
+   /* _e_fwin_geom_save(fwin); */
 }
 
 static void
@@ -1139,7 +1088,7 @@ _e_fwin_cb_resize(E_Win *win)
 	  {
 	     int height;
 
-	     e_widget_min_size_get(fwin->tb_obj, NULL, &height);
+	     e_widget_size_min_get(fwin->tb_obj, NULL, &height);
 	     evas_object_resize(fwin->tb_obj, fwin->win->w, height);
 	  }
         EINA_LIST_FOREACH(fwin->pages, l, page)
@@ -1147,7 +1096,7 @@ _e_fwin_cb_resize(E_Win *win)
      }
    else if (fwin->zone)
      evas_object_resize(fwin->cur_page->scrollframe_obj, fwin->zone->w, fwin->zone->h);
-   _e_fwin_geom_save(fwin);
+   /* _e_fwin_geom_save(fwin); */
 }
 
 static void
@@ -1686,14 +1635,16 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
 		    {
 		       Evas_Object *oic;
 		       const char *itype = NULL;
-		       int ix, iy, iw, ih, nx, ny, nw, nh;
+		       int ix, iy, iw, ih, nx, ny, found = 0;
+		       E_Remember *rem = NULL;
+		       Eina_List *ll;
 
 		       oic = e_fm2_icon_get(evas_object_evas_get(page->fm_obj),
 					    ici->ic, NULL, NULL, 0, &itype);
 		       if (oic)
 			 {
 			    const char *file = NULL, *group = NULL;
-			    E_Fm2_Custom_File *cf;
+			    /* E_Fm2_Custom_File *cf; */
 			    
 			    if (fwin2->win->border->internal_icon)
 			      eina_stringshare_del(fwin2->win->border->internal_icon);
@@ -1721,41 +1672,22 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
 				   eina_stringshare_add(file);
 			      }
 			    evas_object_del(oic);
+
+			    snprintf(buf, sizeof(buf), "e_fwin::%s", e_fm2_real_path_get(fwin2->cur_page->fm_obj));
+			    EINA_LIST_FOREACH(e_config->remembers, ll, rem)
+			      if (rem->class && !strcmp(rem->class, buf))
+				{
+				   found = 1;
+				   break;
+				}
 			    
-			    snprintf(buf, sizeof(buf), "dir::%s",
-				     e_fm2_real_path_get(fwin2->cur_page->fm_obj));
-			    cf = e_fm2_custom_file_get(buf);
-			    if ((cf) && (cf->geom.valid))
-			      {
-				 nx = cf->geom.x;
-				 ny = cf->geom.y;
-				 nw = cf->geom.w;
-				 nh = cf->geom.h;
-				 /* if it ended up too small - fix to a decent size  */
-				 if (nw < 24) nw = 200 * e_scale;
-				 if (nh < 24) nh = 280 * e_scale;
-
-				 /* if it ended up out of the zone */
-				 if (nx < fwin2->win->border->zone->x)
-				   nx = fwin2->win->border->zone->x;
-				 if (ny < fwin2->win->border->zone->y)
-				   ny = fwin2->win->border->zone->y;
-				 if ((fwin2->win->border->zone->x + 
-				      fwin2->win->border->zone->w) <
-				     (fwin2->win->border->w + nx))
-				   nx = fwin2->win->border->zone->x + 
-				   fwin2->win->border->zone->w - 
-				     fwin2->win->border->w;
-				 if ((fwin2->win->border->zone->y + 
-				      fwin2->win->border->zone->h) <
-				     (fwin2->win->border->h + ny))
-				   ny = fwin2->win->border->zone->y + 
-				   fwin2->win->border->zone->h - 
-				   fwin2->win->border->h;
-				 e_win_move_resize(fwin2->win, nx, ny, nw, nh);
-			      }
-			    else
+			    if (!found)
 			      {
+				 int w, h, zw, zh;
+
+				 e_zone_useful_geometry_get(fwin2->win->border->zone,
+							    NULL, NULL, &zw, &zh);
+
 				 /* No custom info, so just put window near icon */
 				 e_fm2_icon_geometry_get(ici->ic, &ix, &iy, &iw, &ih);
 				 nx = (ix + (iw / 2));
@@ -1765,19 +1697,32 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
 				      nx += fwin->win->x;
 				      ny += fwin->win->y;
 				   }
+
+				 /* checking width and height */
+				 /* TODO add config for preffered
+				    initial size? */
+				 w = 5 * iw * e_scale;
+				 if (w > 400)
+				   w = 400;
+				 if (w > zw)
+				   w = zw;
+
+				 h = 4 * ih * e_scale;
+				 if (h > 300)
+				   h = 300;
+				 if (h > zh)
+				   h = zh;
+
 				 /* iff going out of zone - adjust to be in */
-				 if ((fwin2->win->border->zone->x + 
-				      fwin2->win->border->zone->w) <
-				     (fwin2->win->border->w + nx))
-				   nx -= fwin2->win->border->w;
-				 if ((fwin2->win->border->zone->y + 
-				      fwin2->win->border->zone->h) <
-				     (fwin2->win->border->h + ny))
-				   ny -= fwin2->win->border->h;
-				 e_win_move(fwin2->win, nx, ny);
+				 if ((fwin2->win->border->zone->x + fwin2->win->border->zone->w) < (w + nx))
+				   nx -= w;
+				 if ((fwin2->win->border->zone->y + fwin2->win->border->zone->h) < (h + ny))
+				   ny -= h;
+
+				 e_win_move_resize(fwin2->win, nx, ny, w, h);
+				 fwin2->win->border->placed = 1;
 			      }
 			 }
-		       fwin2->geom_save_ready = 1;
 		       if (ici->label)
 			 e_win_title_set(fwin2->win, ici->label);
 		       else if (ici->file)
@@ -1938,7 +1883,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
    e_widget_ilist_thaw(o);
    edje_thaw();
    evas_event_thaw(evas);
-   e_widget_min_size_set(o, 160, 240);
+   e_widget_size_min_set(o, 160, 240);
    e_widget_framelist_object_append(of, o);
    e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
 
@@ -1948,7 +1893,7 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
 				     _e_fwin_cb_exec_cmd_changed, fad, NULL);
    e_widget_table_object_append(ot, fad->o_entry, 0, 2, 1, 1, 1, 1, 1, 0);
 
-   e_widget_min_size_get(ot, &mw, &mh);
+   e_widget_size_min_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
    evas_object_event_callback_add(ot, EVAS_CALLBACK_KEY_DOWN, _e_fwin_file_open_dialog_cb_key_down, page);
    e_dialog_show(dia);
@@ -2290,7 +2235,7 @@ _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
 
    // add abort button callback with id of operation in registry
    edje_object_signal_callback_add(o, "e,fm,operation,abort", "", 
-                                   _e_fwin_op_registry_abort_cb, (void*)ere->id);
+                                   _e_fwin_op_registry_abort_cb, (void*)(long)ere->id);
    
    //Listen to progress changes
    e_fm2_op_registry_entry_listener_add(ere, _e_fwin_op_registry_listener_cb,
@@ -2316,7 +2261,7 @@ _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission,
 {
    int id;
    
-   id = (int)data;
+   id = (long)data;
    if (!id) return;
    
    e_fm2_operation_abort(id);
diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c
index f68a0cb..cf986a8 100644
--- a/src/modules/fileman/e_mod_config.c
+++ b/src/modules/fileman/e_mod_config.c
@@ -85,7 +85,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
    
-   if (e_config_dialog_find("E", "_config_fileman_dialog")) return NULL;
+   if (e_config_dialog_find("E", "fileman/fileman")) return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
    v->create_cfdata = _create_data;
    v->free_cfdata = _free_data;
@@ -93,7 +93,7 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
    v->basic.check_changed = _basic_check_changed;
    cfd = e_config_dialog_new(con, _("Fileman Settings"), "E", 
-			     "_config_fileman_dialog",
+			     "fileman/fileman",
 			     "system-file-manager", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 588c01a..91a8126 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -43,7 +43,7 @@ e_modapi_init(E_Module *m)
    
    conf_module = m;
 
-   eina_stringshare_init();
+   //eina_init();
 
    /* Setup Entry in Config Panel */
    e_configure_registry_category_add("fileman", 100, _("Files"), 
@@ -154,7 +154,7 @@ e_modapi_shutdown(E_Module *m)
    _e_mod_fileman_config_free();
    E_CONFIG_DD_FREE(conf_edd);
 
-   eina_stringshare_shutdown();
+   //eina_shutdown();
 
    conf_module = NULL;
    return 1;
@@ -369,10 +369,10 @@ _e_mod_menu_generate(void *data, E_Menu *m)
 void
 _e_mod_menu_add(void *data, E_Menu *m)
 {
+#ifdef ENABLE_FILES
    E_Menu_Item *mi;
    E_Menu *sub;
 
-#ifdef ENABLE_FILES
    mi = e_menu_item_new(m);
    e_menu_item_label_set(mi, _("Files"));
    e_util_menu_item_theme_icon_set(mi, "system-file-manager");
diff --git a/src/modules/fileman_opinfo/Makefile.in b/src/modules/fileman_opinfo/Makefile.in
index c212f2b..5158948 100644
--- a/src/modules/fileman_opinfo/Makefile.in
+++ b/src/modules/fileman_opinfo/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -379,8 +380,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,7 +494,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c
index acc924c..f5c520a 100644
--- a/src/modules/fileman_opinfo/e_mod_main.c
+++ b/src/modules/fileman_opinfo/e_mod_main.c
@@ -189,7 +189,7 @@ _opinfo_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission,
 {
    int id;
    
-   id = (int)data;
+   id = (long)data;
    if (!id) return;
    
    e_fm2_operation_abort(id);
@@ -221,7 +221,7 @@ _opinfo_op_registry_detailed_cb(void *data, Evas_Object *obj, const char *emissi
 static void 
 _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-   int id = (int)data;
+   int id = (long)data;
    E_Fm2_Op_Registry_Entry *ere;
    E_Win *win;
    
@@ -257,7 +257,6 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
    E_Fm2_Op_Registry_Entry *ere = event;
    Instance *inst = data;
    Evas_Object *o;
-   int mw, mh, xh;
    
    if (!inst || !ere)
       return ECORE_CALLBACK_RENEW;
@@ -277,13 +276,13 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
    _opinfo_op_registry_summary_cb(inst, o, NULL, NULL);
    
    edje_object_signal_callback_add(o, "e,fm,operation,abort", "",
-                                   _opinfo_op_registry_abort_cb, (void*)ere->id);
+                                   _opinfo_op_registry_abort_cb, (void*)(long)ere->id);
    edje_object_signal_callback_add(o, "state,request,summary", "fileman_opinfo",
                                    _opinfo_op_registry_summary_cb, inst);
    edje_object_signal_callback_add(o, "state,request,detailed", "fileman_opinfo",
                                    _opinfo_op_registry_detailed_cb, inst);
    edje_object_signal_callback_add(o, "e,fm,window,jump", "",
-                                   _opinfo_op_registry_window_jump_cb, (void*)ere->id);
+                                   _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id);
    
    e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener,
                                         o, _opinfo_op_registry_free_data);
diff --git a/src/modules/fileman_opinfo/module.desktop b/src/modules/fileman_opinfo/module.desktop
index 3313f75..47bc2ad 100644
--- a/src/modules/fileman_opinfo/module.desktop
+++ b/src/modules/fileman_opinfo/module.desktop
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=EFM Operation Info
+Name[cs]=EFM Informace o operaci
 Name[it]=Informazioni operazioni EFM
 Name[eo]=Aktualaj operacioj en EFM
 Name[fr]=Informations EFM
 Name[tr]=EFM Ä°ÅŸlem Bilgisi
 Icon=e-module-fileman_opinfo
 Comment=<title>Gadget to show current EFM operations</title><br>Can be placed on the desktop or in a shelf.
+Comment[cs]=<title>Gadget pro zobrazení aktuálních operací v EFM</title><br>Mùže být na ploše nebo v panelu.
 Comment[it]=<title>Gadget che mostra le operazioni in corso di EFM</title><br>Può essere messo sul desktop o su una mensola.
 Comment[eo]=<title>Tiu akcesoraĵo vidigas la aktualaj operacioj en EFM</title><br>Enmetebla sur la labortablon aŭ en breton.
 Comment[fr]=<title>Gadget montrant les opérations en cours dans EFM</title><br>Peut être placé sur le bureau ou dans un rack.
diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop.in
index 3313f75..47bc2ad 100644
--- a/src/modules/fileman_opinfo/module.desktop.in
+++ b/src/modules/fileman_opinfo/module.desktop.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Type=Link
 Name=EFM Operation Info
+Name[cs]=EFM Informace o operaci
 Name[it]=Informazioni operazioni EFM
 Name[eo]=Aktualaj operacioj en EFM
 Name[fr]=Informations EFM
 Name[tr]=EFM Ä°ÅŸlem Bilgisi
 Icon=e-module-fileman_opinfo
 Comment=<title>Gadget to show current EFM operations</title><br>Can be placed on the desktop or in a shelf.
+Comment[cs]=<title>Gadget pro zobrazení aktuálních operací v EFM</title><br>Mùže být na ploše nebo v panelu.
 Comment[it]=<title>Gadget che mostra le operazioni in corso di EFM</title><br>Può essere messo sul desktop o su una mensola.
 Comment[eo]=<title>Tiu akcesoraĵo vidigas la aktualaj operacioj en EFM</title><br>Enmetebla sur la labortablon aŭ en breton.
 Comment[fr]=<title>Gadget montrant les opérations en cours dans EFM</title><br>Peut être placé sur le bureau ou dans un rack.
diff --git a/src/modules/gadman/Makefile.in b/src/modules/gadman/Makefile.in
index 2094e79..ae10629 100644
--- a/src/modules/gadman/Makefile.in
+++ b/src/modules/gadman/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -497,7 +498,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c
index 58f4a1a..d340b04 100644
--- a/src/modules/gadman/e_mod_config.c
+++ b/src/modules/gadman/e_mod_config.c
@@ -42,7 +42,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
    char buf[4096];
 
    /* check if config dialog exists ... */
-   if (e_config_dialog_find("E", "_e_modules_gadman_config_dialog"))
+   if (e_config_dialog_find("E", "extensions/gadman"))
      return NULL;
 
    /* ... else create it */
@@ -56,7 +56,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__)
 
    snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir);
    cfd = e_config_dialog_new(con, _("Gadgets Manager"),
-                             "E", "_e_modules_gadman_config_dialog",
+                             "E", "extensions/gadman",
                              buf, 0, v, Man);
 
    Man->config_dialog = cfd;
@@ -128,7 +128,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
 static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   gadman_gadget_edit_end();
+   gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
    e_config_save_queue();
    return 1;
 }
@@ -232,7 +232,7 @@ _adv_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfda
 					       e_fm2_pan_get,
 					       e_fm2_pan_max_get, 
 					       e_fm2_pan_child_size_get);
-   e_widget_min_size_set(cfdata->o_sf, 200, 250);
+   e_widget_size_min_set(cfdata->o_sf, 200, 250);
    e_widget_frametable_object_append(of, cfdata->o_sf, 0, 2, 2, 1, 1, 1, 1, 1);
    e_widget_table_object_append(ft, of, 1, 0, 1, 3, 1, 1, 1, 1);
 
@@ -306,9 +306,9 @@ _fill_gadgets_list(Evas_Object *ilist)
      }
 
    e_widget_ilist_go(ilist);
-   e_widget_min_size_get(ilist, &w, NULL);
+   e_widget_size_min_get(ilist, &w, NULL);
    if (w < 200) w = 200;
-   e_widget_min_size_set(ilist, w, 250);
+   e_widget_size_min_set(ilist, w, 250);
    e_widget_ilist_thaw(ilist);
 }
 
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index e7694e5..754e5bd 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -12,7 +12,7 @@ static char *_get_bind_text(const char* action);
 
 static Evas_Object* _create_mover(E_Gadcon *gc);
 static Evas_Object* _get_mover(E_Gadcon_Client *gcc);
-static E_Gadcon* _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone);
+static E_Gadcon* _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location * loc);
 
 static void on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch);
 
@@ -38,8 +38,12 @@ static void on_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi);
 static void on_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 static void on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi);
 
+static int _e_gadman_client_add (void *data __UNUSED__, const E_Gadcon_Client_Class *cc);
+static void _e_gadman_client_remove (void *data __UNUSED__, E_Gadcon_Client *gcc);
+
 E_Gadcon_Client *current = NULL;
 Manager *Man = NULL;
+static E_Gadcon_Location * location = NULL;
 
 /* Implementation */
 void
@@ -64,6 +68,11 @@ gadman_init(E_Module *m)
    /* with this we can trap screen resolution change (a better way?)*/
    e_container_shape_change_callback_add(Man->container, on_shape_change, NULL);
 
+   /* create and register "desktop" location */
+   location = e_gadcon_location_new ("Desktop", E_GADCON_SITE_DESKTOP, _e_gadman_client_add, NULL, _e_gadman_client_remove, NULL);
+   e_gadcon_location_set_icon_name(location, "preferences-desktop");
+   e_gadcon_location_register(location);
+
    /* iterating through zones - and making gadmans on each */
    EINA_LIST_FOREACH(Man->container->zones, l, zone)
      {
@@ -72,7 +81,7 @@ gadman_init(E_Module *m)
 
 	for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
 	  {
-	     E_Gadcon *gc = _gadman_gadcon_new(layer_name[layer], layer, zone);
+	     E_Gadcon *gc = _gadman_gadcon_new(layer_name[layer], layer, zone, location);
 	     Man->gadcons[layer] = eina_list_append(Man->gadcons[layer], gc);
 	  }
      }
@@ -84,6 +93,7 @@ gadman_shutdown(void)
    E_Gadcon *gc;
    unsigned int layer;
 
+   e_gadcon_location_unregister(location);
    e_container_shape_change_callback_del(Man->container, on_shape_change, NULL);
 
    for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++)
@@ -119,13 +129,18 @@ void
 gadman_populate_class(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
 {
    Gadman_Layer_Type layer = (Gadman_Layer_Type)(long)data;
-   const Eina_List *l;
+   const Eina_List *l, *ll;
    E_Config_Gadcon_Client *cf_gcc;
+   E_Gadcon_Client *gcc = NULL;
 
    EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc)
      {
         if (cf_gcc->name && cc->name && !strcmp(cf_gcc->name, cc->name) && (gc->cf->zone == gc->zone->id))
-          gadman_gadget_place(cf_gcc, layer, gc->zone);
+	  {
+	     EINA_LIST_FOREACH(Man->gadgets[layer], ll, gcc)
+	       if (gcc->cf->id == cf_gcc->id) break;
+	     if (!gcc) gadman_gadget_place(cf_gcc, layer, gc->zone);
+	  }
      }
 }
 
@@ -203,7 +218,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone
 }
 
 E_Gadcon_Client *
-gadman_gadget_add(E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer)
+gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer)
 {
    E_Config_Gadcon_Client *cf = NULL;
    E_Gadcon_Client *gcc;
@@ -293,7 +308,7 @@ gadman_gadget_edit_start(E_Gadcon_Client *gcc)
 }
 
 void
-gadman_gadget_edit_end(void)
+gadman_gadget_edit_end(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    unsigned int layer;
 
@@ -322,11 +337,11 @@ gadman_gadgets_show(void)
    if (Man->conf->bg_type == BG_STD)
      {
 	if (Man->conf->anim_bg)
-	 edje_object_signal_emit(Man->full_bg,
-	                        "e,state,visibility,show", "e");
+	  edje_object_signal_emit(Man->full_bg,
+	                         "e,state,visibility,show", "e");
 	else
-	 edje_object_signal_emit(Man->full_bg,
-	                         "e,state,visibility,show,now", "e");
+	  edje_object_signal_emit(Man->full_bg,
+	                          "e,state,visibility,show,now", "e");
      }
    else
      {
@@ -334,8 +349,8 @@ gadman_gadgets_show(void)
 	  edje_object_signal_emit(Man->full_bg,
 	                         "e,state,visibility,show,custom", "e");
 	else
-	 edje_object_signal_emit(Man->full_bg,
-	                        "e,state,visibility,show,custom,now", "e");
+	  edje_object_signal_emit(Man->full_bg,
+	                         "e,state,visibility,show,custom,now", "e");
      }
 
    /* Showing top gadgets */
@@ -358,19 +373,23 @@ gadman_gadgets_hide(void)
 
    Man->visible = 0;
 
-   if (Man->conf->anim_bg)
+   if (Man->conf->bg_type == BG_STD)
      {
-	edje_object_signal_emit(Man->full_bg,
-	                       "e,state,visibility,hide", "e");
-	edje_object_signal_emit(Man->full_bg,
-	                       "e,state,visibility,hide,custom", "e");
+	if (Man->conf->anim_bg)
+	     edje_object_signal_emit(Man->full_bg,
+	                             "e,state,visibility,hide", "e");
+	else
+	     edje_object_signal_emit(Man->full_bg,
+	                             "e,state,visibility,hide", "e");
      }
    else
      {
-	edje_object_signal_emit(Man->full_bg,
-	                       "e,state,visibility,hide,now", "e");
-	edje_object_signal_emit(Man->full_bg,
-	                       "e,state,visibility,hide,custom,now", "e");
+	if (Man->conf->anim_bg)
+	  edje_object_signal_emit(Man->full_bg,
+	                          "e,state,visibility,hide,custom", "e");
+	else
+	  edje_object_signal_emit(Man->full_bg,
+	                          "e,state,visibility,hide,custom,now", "e");
      }
 
    /* Hiding top gadgets */
@@ -444,7 +463,7 @@ gadman_update_bg(void)
 
 /* Internals */
 static E_Gadcon*
-_gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone)
+_gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location * loc)
 {
    const Eina_List *l;
    E_Gadcon *gc;
@@ -457,6 +476,7 @@ _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone)
    gc->name = eina_stringshare_add(name);
    gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL;
    gc->orient = E_GADCON_ORIENT_FLOAT;
+   gc->location = loc;
 
    /* Create ecore fullscreen window */
    if (layer > GADMAN_LAYER_BG)
@@ -763,6 +783,8 @@ _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu)
    e_util_menu_item_theme_icon_set(mi, "transform-scale");
    e_menu_item_callback_set(mi, on_menu_edit, gcc);
 
+   e_gadcon_client_add_location_menu(gcc, menu);
+
    /* Remove this gadgets */
    mi = e_menu_item_new(menu);
    e_menu_item_label_set(mi, _("Remove this gadget"));
@@ -1040,7 +1062,7 @@ on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
    gcc = data;
 
-   if (gcc->gadcon->editing) gadman_gadget_edit_end();
+   if (gcc->gadcon->editing) gadman_gadget_edit_end(NULL, NULL, NULL, NULL);
 
    current = gcc;
 
@@ -1340,3 +1362,16 @@ on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__,
 {
    ecore_evas_hide(Man->top_ee);
 }
+
+static int 
+_e_gadman_client_add (void *data __UNUSED__, const E_Gadcon_Client_Class *cc)
+{
+   return !!gadman_gadget_add(cc, GADMAN_LAYER_BG);
+}
+
+static void 
+_e_gadman_client_remove (void *data __UNUSED__, E_Gadcon_Client *gcc)
+{
+   gadman_gadget_del(gcc);
+}
+
diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h
index 73f84cc..e373267 100644
--- a/src/modules/gadman/e_mod_gadman.h
+++ b/src/modules/gadman/e_mod_gadman.h
@@ -73,11 +73,11 @@ extern Manager *Man;
 
 void             gadman_init(E_Module *m);
 void             gadman_shutdown(void);
-E_Gadcon_Client *gadman_gadget_add(E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer);
+E_Gadcon_Client *gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer);
 void             gadman_gadget_del(E_Gadcon_Client *gcc);
 E_Gadcon_Client *gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone *zone);
 void             gadman_gadget_edit_start(E_Gadcon_Client *gcc);
-void             gadman_gadget_edit_end(void);
+void             gadman_gadget_edit_end(void *data, Evas_Object *obj, const char *emission, const char *source);
 void             gadman_gadgets_toggle(void);
 void             gadman_update_bg(void);
 E_Gadcon        *gadman_gadcon_get(const E_Zone *zone, Gadman_Layer_Type layer);
diff --git a/src/modules/ibar/Makefile.in b/src/modules/ibar/Makefile.in
index 5d7140b..3c218d6 100644
--- a/src/modules/ibar/Makefile.in
+++ b/src/modules/ibar/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -379,8 +380,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -494,7 +495,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index c4eb113..df56b82 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -103,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ol = e_widget_ilist_add(evas, 32, 32, &(cfdata->dir));
    cfdata->tlist = ol;
    _load_tlist(cfdata);
-   e_widget_min_size_set(ol, 140, 140);
+   e_widget_size_min_set(ol, 140, 140);
    e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0);
 
    ot = e_widget_table_add(evas, 0);
diff --git a/src/modules/ibox/Makefile.in b/src/modules/ibox/Makefile.in
index 5b3d280..e47fd7c 100644
--- a/src/modules/ibox/Makefile.in
+++ b/src/modules/ibox/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -380,8 +381,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -495,7 +496,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c
index 10d1e99..8f06a8d 100644
--- a/src/modules/ibox/e_mod_config.c
+++ b/src/modules/ibox/e_mod_config.c
@@ -24,11 +24,10 @@ static void *_create_data(E_Config_Dialog *cfd);
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static void _cb_disable_check(void *data, Evas_Object *obj);
 static void _cb_disable_check_list(void *data, Evas_Object *obj);
-
 static void _cb_zone_policy_change(void *data, Evas_Object *obj);
-
+// unused
+//static void _cb_disable_check(void *data, Evas_Object *obj);
 void 
 _config_ibox_module(Config_Item *ci)
 {
@@ -223,13 +222,14 @@ _cb_zone_policy_change(void *data, Evas_Object *obj)
  * @param data A Evas_Object to chain together with the checkbox
  * @param obj A Evas_Object checkbox created with e_widget_check_add()
  */
+#if 0
 static void
 _cb_disable_check(void *data, Evas_Object *obj)
 {
    e_widget_disabled_set((Evas_Object *) data, 
                          !e_widget_check_checked_get(obj));
 }
-
+#endif
 /*!
  * @param data A Eina_List of Evas_Object to chain widgets together with the checkbox
  * @param obj A Evas_Object checkbox created with e_widget_check_add()
diff --git a/src/modules/illume-home/Makefile.am b/src/modules/illume-home/Makefile.am
new file mode 100644
index 0000000..3a7f922
--- /dev/null
+++ b/src/modules/illume-home/Makefile.am
@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-home
+
+# 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_busycover.c \
+                         e_busycover.h \
+                         e_mod_config.c \
+                         e_mod_config.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/illume-home/Makefile.in b/src/modules/illume-home/Makefile.in
new file mode 100644
index 0000000..20eb6c5
--- /dev/null
+++ b/src/modules/illume-home/Makefile.in
@@ -0,0 +1,683 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-home
+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-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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_busycover.lo e_mod_config.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--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@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-home
+
+# 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_busycover.c \
+                         e_busycover.h \
+                         e_mod_config.c \
+                         e_mod_config.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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-home/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-home/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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) 
+	$(module_la_LINK) -rpath $(pkgdir) $(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_busycover.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_config.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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-pkgLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.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-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-ps install-ps-am 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-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/illume-home/e-module-illume-home.edj b/src/modules/illume-home/e-module-illume-home.edj
new file mode 100644
index 0000000..40bf911
Binary files /dev/null and b/src/modules/illume-home/e-module-illume-home.edj differ
diff --git a/src/modules/illume-home/e_busycover.c b/src/modules/illume-home/e_busycover.c
new file mode 100644
index 0000000..806fbc3
--- /dev/null
+++ b/src/modules/illume-home/e_busycover.c
@@ -0,0 +1,155 @@
+#include "e.h"
+#include "e_busycover.h"
+
+/* local function prototypes */
+static void _e_busycover_add_object(E_Busycover *esw);
+static void _e_busycover_cb_free(E_Busycover *esw);
+static int _e_busycover_zone_cb_move_resize(void *data, int type, void *event);
+static Evas_Object *_theme_obj_new(Evas *evas, const char *custom_dir, const char *group);
+
+/* local variables */
+static Eina_List *busycovers = NULL;
+
+/* public functions */
+EAPI int 
+e_busycover_init(void) 
+{
+   return 1;
+}
+
+EAPI int 
+e_busycover_shutdown(void) 
+{
+   return 1;
+}
+
+EAPI E_Busycover *
+e_busycover_new(E_Zone *zone, const char *themedir) 
+{
+   E_Busycover *esw;
+
+   esw = E_OBJECT_ALLOC(E_Busycover, E_BUSYCOVER_TYPE, _e_busycover_cb_free);
+   if (!esw) return NULL;
+
+   esw->zone = zone;
+   if (themedir) esw->themedir = eina_stringshare_add(themedir);
+
+   busycovers = eina_list_append(busycovers, esw);
+
+   esw->handlers = 
+     eina_list_append(esw->handlers, 
+                      ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE, 
+                                              _e_busycover_zone_cb_move_resize, 
+                                              esw));
+   return esw;
+}
+
+EAPI E_Busycover_Handle *
+e_busycover_push(E_Busycover *esw, const char *msg, const char *icon) 
+{
+   E_Busycover_Handle *h;
+
+   E_OBJECT_CHECK(esw);
+   E_OBJECT_TYPE_CHECK_RETURN(esw, E_BUSYCOVER_TYPE, NULL);
+   if (!esw->o_base) _e_busycover_add_object(esw);
+   h = E_NEW(E_Busycover_Handle, 1);
+   h->busycover = esw;
+   if (msg) h->msg = eina_stringshare_add(msg);
+   if (icon) h->icon = eina_stringshare_add(icon);
+   esw->handles = eina_list_prepend(esw->handles, h);
+   edje_object_part_text_set(esw->o_base, "e.text.label", h->msg);
+   /* FIXME: handle icon */
+   evas_object_show(esw->o_base);
+   return h;
+}
+
+EAPI void 
+e_busycover_pop(E_Busycover *esw, E_Busycover_Handle *handle) 
+{
+   E_OBJECT_CHECK(esw);
+   E_OBJECT_TYPE_CHECK(esw, E_BUSYCOVER_TYPE);
+   if (!eina_list_data_find(esw->handles, handle)) return;
+   esw->handles = eina_list_remove(esw->handles, handle);
+   if (handle->msg) eina_stringshare_del(handle->msg);
+   if (handle->icon) eina_stringshare_del(handle->icon);
+   free(handle);
+   if (esw->handles) 
+     {
+        handle = esw->handles->data;
+        edje_object_part_text_set(esw->o_base, "e.text.label", handle->msg);
+     }
+   else 
+     {
+        evas_object_del(esw->o_base);
+        esw->o_base = NULL;
+     }
+}
+
+/* local functions */
+static void 
+_e_busycover_add_object(E_Busycover *esw) 
+{
+   Evas_Object *o;
+   int x, y, w, h;
+
+   esw->o_base = _theme_obj_new(esw->zone->container->bg_evas, esw->themedir, 
+                                "modules/illume-home/busycover/default");
+   edje_object_part_text_set(esw->o_base, "e.text.title", "LOADING");
+   e_zone_useful_geometry_get(esw->zone, &x, &y, &w, &h);
+   evas_object_move(esw->o_base, x, y);
+   evas_object_resize(esw->o_base, w, h);
+   evas_object_layer_set(esw->o_base, 100);
+}
+
+static void 
+_e_busycover_cb_free(E_Busycover *esw) 
+{
+   Ecore_Event_Handler *handle;
+
+   if (esw->o_base) evas_object_del(esw->o_base);
+   busycovers = eina_list_remove(busycovers, esw);
+   EINA_LIST_FREE(esw->handlers, handle)
+     ecore_event_handler_del(handle);
+   if (esw->themedir) eina_stringshare_del(esw->themedir);
+   E_FREE(esw);
+}
+
+static int 
+_e_busycover_zone_cb_move_resize(void *data, int type, void *event) 
+{
+   E_Event_Zone_Move_Resize *ev;
+   E_Busycover *esw;
+
+   ev = event;
+   esw = data;
+   if (esw->zone == ev->zone) 
+     {
+        int x, y, w, h;
+
+        e_zone_useful_geometry_get(esw->zone, &x, &y, &w, &h);
+        evas_object_move(esw->o_base, x, y);
+        evas_object_resize(esw->o_base, w, h);
+     }
+   return 1;
+}
+
+static Evas_Object *
+_theme_obj_new(Evas *evas, const char *custom_dir, const char *group) 
+{
+   Evas_Object *o;
+
+   o = edje_object_add(evas);
+   if (!e_theme_edje_object_set(o, "base/theme/modules/illume-home", group)) 
+     {
+        if (custom_dir) 
+          {
+             char buff[PATH_MAX];
+
+             snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", custom_dir);
+             if (edje_object_file_set(o, buff, group)) 
+               printf("OK FALLBACK %s\n", buff);
+          }
+     }
+   return o;
+}
+
diff --git a/src/modules/illume-home/e_busycover.h b/src/modules/illume-home/e_busycover.h
new file mode 100644
index 0000000..22b6114
--- /dev/null
+++ b/src/modules/illume-home/e_busycover.h
@@ -0,0 +1,30 @@
+#ifndef E_BUSYCOVER_H
+#define E_BUSYCOVER_H
+
+#define E_BUSYCOVER_TYPE 0xE1b0782
+
+typedef struct _E_Busycover E_Busycover;
+typedef struct _E_Busycover_Handle E_Busycover_Handle;
+
+struct _E_Busycover 
+{
+   E_Object e_obj_inherit;
+   E_Zone *zone;
+   Evas_Object *o_base;
+   Eina_List *handlers, *handles;
+   const char *themedir;
+};
+
+struct _E_Busycover_Handle 
+{
+   E_Busycover *busycover;
+   const char *msg, *icon;
+};
+
+EAPI int e_busycover_init(void);
+EAPI int e_busycover_shutdown(void);
+EAPI E_Busycover *e_busycover_new(E_Zone *zone, const char *themedir);
+EAPI E_Busycover_Handle *e_busycover_push(E_Busycover *esw, const char *msg, const char *icon);
+EAPI void e_busycover_pop(E_Busycover *esw, E_Busycover_Handle *handle);
+
+#endif
diff --git a/src/modules/illume-home/e_mod_config.c b/src/modules/illume-home/e_mod_config.c
new file mode 100644
index 0000000..cf82739
--- /dev/null
+++ b/src/modules/illume-home/e_mod_config.c
@@ -0,0 +1,200 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void *_il_home_config_create(E_Config_Dialog *cfd);
+static void _il_home_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_home_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_home_config_changed(void *data, Evas_Object *obj, void *event);
+static void _il_home_config_click_changed(void *data, Evas_Object *obj, void *event);
+static int _il_home_config_change_timeout(void *data);
+
+/* local variables */
+EAPI Il_Home_Config *il_home_cfg = NULL;
+static E_Config_DD *conf_edd = NULL;
+Ecore_Timer *_il_home_config_change_timer = NULL;
+Evas_Object *delay_label, *delay_slider;
+
+/* public functions */
+int 
+il_home_config_init(E_Module *m) 
+{
+   conf_edd = E_CONFIG_DD_NEW("Illume-Home_Cfg", Il_Home_Config);
+   #undef T
+   #undef D
+   #define T Il_Home_Config
+   #define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, icon_size, INT);
+   E_CONFIG_VAL(D, T, single_click, INT);
+   E_CONFIG_VAL(D, T, single_click_delay, INT);
+
+   il_home_cfg = e_config_domain_load("module.illume-home", conf_edd);
+   if ((il_home_cfg) && 
+       ((il_home_cfg->version >> 16) < IL_CONFIG_MAJ)) 
+     {
+        E_FREE(il_home_cfg);
+        il_home_cfg = NULL;
+     }
+   if (!il_home_cfg) 
+     {
+        il_home_cfg = E_NEW(Il_Home_Config, 1);
+        il_home_cfg->version = 0;
+        il_home_cfg->icon_size = 120;
+        il_home_cfg->single_click = 1;
+        il_home_cfg->single_click_delay = 150;
+     }
+   if (il_home_cfg) 
+     {
+        /* Add new config variables here */
+        /* if ((il_home_cfg->version & 0xffff) < 1) */
+        il_home_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
+     }
+
+   il_home_cfg->mod_dir = eina_stringshare_add(m->dir);
+
+   e_configure_registry_category_add("illume", 0, _("Illume"), NULL, 
+                                     "enlightenment/display");
+   e_configure_registry_generic_item_add("illume/home", 0, _("Home"), 
+                                         NULL, "enlightenment/launcher", 
+                                         il_home_config_show);
+   return 1;
+}
+
+int 
+il_home_config_shutdown(void) 
+{
+   il_home_cfg->cfd = NULL;
+
+   e_configure_registry_item_del("illume/home");
+   e_configure_registry_category_del("illume");
+
+   if (il_home_cfg->mod_dir) eina_stringshare_del(il_home_cfg->mod_dir);
+
+   E_FREE(il_home_cfg);
+   il_home_cfg = NULL;
+
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+int 
+il_home_config_save(void) 
+{
+   e_config_domain_save("module.illume-home", conf_edd, il_home_cfg);
+   return 1;
+}
+
+void 
+il_home_config_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v = NULL;
+
+   if (e_config_dialog_find("E", "_config_illume_home_settings")) return;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_home_config_create;
+   v->free_cfdata = _il_home_config_free;
+   v->basic.create_widgets = _il_home_config_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+
+   cfd = e_config_dialog_new(con, _("Home Settings"), "E", 
+                             "_config_illume_home_settings", 
+                             "enlightenment/launcher_settings", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+   il_home_cfg->cfd = cfd;
+}
+
+/* local functions */
+static void *
+_il_home_config_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_home_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   il_home_cfg->cfd = NULL;
+   il_home_win_cfg_update();
+}
+
+static Evas_Object *
+_il_home_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *of, *o;
+   E_Radio_Group *rg;
+
+   list = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("Icon Size"), 0);
+   rg = e_widget_radio_group_new(&(il_home_cfg->icon_size));
+   o = e_widget_radio_add(evas, _("Small"), 60, rg);
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", _il_home_config_changed, NULL);
+   o = e_widget_radio_add(evas, _("Medium"), 80, rg);
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", _il_home_config_changed, NULL);
+   o = e_widget_radio_add(evas, _("Large"), 120, rg);
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", _il_home_config_changed, NULL);
+   o = e_widget_radio_add(evas, _("Very Large"), 160, rg);
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", _il_home_config_changed, NULL);
+   o = e_widget_radio_add(evas, _("Massive"), 240, rg);
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", _il_home_config_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Launch Action"), 0);
+   o = e_widget_check_add(evas, _("Single press"), 
+                          &(il_home_cfg->single_click));
+   e_widget_framelist_object_append(of, o);
+   evas_object_smart_callback_add(o, "changed", 
+                                  _il_home_config_click_changed, NULL);
+   o = e_widget_label_add(evas, _("Press Delay"));
+   delay_label = o;
+   e_widget_disabled_set(o, !(il_home_cfg->single_click));
+   e_widget_framelist_object_append(of, o);
+   o = e_widget_slider_add(evas, 1, 0, "%1.0f ms", 0, 350, 1, 0, NULL, 
+                           &(il_home_cfg->single_click_delay), 150);
+   delay_slider = o;
+   /* Slider does not emit a changed signal */
+//   evas_object_smart_callback_add(o, "changed", 
+//                                  _il_home_config_changed, NULL);
+   e_widget_disabled_set(o, !(il_home_cfg->single_click));
+   e_widget_framelist_object_append(of, o);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   return list;
+}
+
+static void 
+_il_home_config_changed(void *data, Evas_Object *obj, void *event) 
+{
+   if (_il_home_config_change_timer) 
+     ecore_timer_del(_il_home_config_change_timer);
+   _il_home_config_change_timer = 
+     ecore_timer_add(0.5, _il_home_config_change_timeout, data);
+}
+
+static void 
+_il_home_config_click_changed(void *data, Evas_Object *obj, void *event) 
+{
+   e_widget_disabled_set(delay_label, !il_home_cfg->single_click);
+   e_widget_disabled_set(delay_slider, !il_home_cfg->single_click);
+   _il_home_config_changed(data, obj, event);
+}
+
+static int 
+_il_home_config_change_timeout(void *data) 
+{
+   il_home_win_cfg_update();
+   e_config_save_queue();
+   _il_home_config_change_timer = NULL;
+   return 0;
+}
diff --git a/src/modules/illume-home/e_mod_config.h b/src/modules/illume-home/e_mod_config.h
new file mode 100644
index 0000000..b7b04a9
--- /dev/null
+++ b/src/modules/illume-home/e_mod_config.h
@@ -0,0 +1,27 @@
+#ifndef E_MOD_CONFIG_H
+#define E_MOD_CONFIG_H
+
+#define IL_CONFIG_MIN 0
+#define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Home_Config Il_Home_Config;
+
+struct _Il_Home_Config 
+{
+   int version;
+   int mode, icon_size;
+   int single_click, single_click_delay;
+
+   // Not User Configurable. Placeholders
+   const char *mod_dir;
+   E_Config_Dialog *cfd;
+};
+
+int il_home_config_init(E_Module *m);
+int il_home_config_shutdown(void);
+int il_home_config_save(void);
+void il_home_config_show(E_Container *con, const char *params);
+
+extern EAPI Il_Home_Config *il_home_cfg;
+
+#endif
diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c
new file mode 100644
index 0000000..00d85fc
--- /dev/null
+++ b/src/modules/illume-home/e_mod_main.c
@@ -0,0 +1,720 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_busycover.h"
+
+#define IL_HOME_WIN_TYPE 0xE0b0102f
+
+/* local structures */
+typedef struct _Instance Instance;
+typedef struct _Il_Home_Win Il_Home_Win;
+
+struct _Instance 
+{
+   E_Gadcon_Client *gcc;
+   Evas_Object *o_btn;
+   E_Menu *menu;
+   Eina_List *wins;
+};
+struct _Il_Home_Win 
+{
+   E_Object e_obj_inherit;
+
+   E_Win *win;
+   Evas_Object *o_bg, *o_sf, *o_fm;
+};
+
+/* local function prototypes */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static char *_gc_label(E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static void _il_home_btn_cb_click(void *data, void *data2);
+static void _il_home_btn_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
+static void _il_home_menu_cb_post(void *data, E_Menu *mn);
+static void _il_home_win_new(Instance *inst);
+static void _il_home_win_cb_free(Il_Home_Win *hwin);
+static void _il_home_win_cb_delete(E_Win *win);
+static void _il_home_win_cb_resize(E_Win *win);
+static void _il_home_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static void _il_home_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+static void _il_home_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
+static void _il_home_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+static void _il_home_cb_selected(void *data, Evas_Object *obj, void *event);
+static void _il_home_desktop_run(Efreet_Desktop *desktop);
+static void _il_home_apps_populate(void);
+static void _il_home_apps_unpopulate(void);
+static void _il_home_fmc_set(Evas_Object *obj);
+static void _il_home_desks_populate(void);
+static int _il_home_desktop_list_change(void *data, int type, void *event);
+static int _il_home_desktop_change(void *data, int type, void *event);
+static int _il_home_update_deferred(void *data);
+
+/* local variables */
+static Eina_List *instances = NULL;
+static Eina_List *desks = NULL;
+static Eina_List *sels = NULL;
+static Eina_List *handlers = NULL;
+static E_Busycover *busycover = NULL;
+static Ecore_Timer *defer = NULL;
+
+static const E_Gadcon_Client_Class _gc_class = 
+{
+   GADCON_CLIENT_CLASS_VERSION, "illume-home", 
+     { _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, 
+          e_gadcon_site_is_not_toolbar
+     }, E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+/* public functions */
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Home" };
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   E_Zone *zone;
+
+   if (!il_home_config_init(m)) return NULL;
+
+   zone = e_util_container_zone_number_get(0, 0);
+
+   _il_home_apps_unpopulate();
+   _il_home_apps_populate();
+
+   e_busycover_init();
+   busycover = e_busycover_new(zone, m->dir);
+
+   handlers = 
+     eina_list_append(handlers, 
+                      ecore_event_handler_add(EFREET_EVENT_DESKTOP_LIST_CHANGE, 
+                                              _il_home_desktop_list_change, 
+                                              NULL));
+   handlers = 
+     eina_list_append(handlers, 
+                      ecore_event_handler_add(EFREET_EVENT_DESKTOP_CHANGE, 
+                                              _il_home_desktop_change, NULL));
+
+   e_gadcon_provider_register(&_gc_class);
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   Ecore_Event_Handler *handle;
+
+   _il_home_apps_unpopulate();
+
+   if (busycover) 
+     {
+        e_object_del(E_OBJECT(busycover));
+        busycover = NULL;
+     }
+   e_busycover_shutdown();
+
+   EINA_LIST_FREE(handlers, handle)
+     ecore_event_handler_del(handle);
+
+   e_gadcon_provider_unregister(&_gc_class);
+
+   il_home_config_shutdown();
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return il_home_config_save();
+}
+
+void 
+il_home_win_cfg_update(void) 
+{
+   _il_home_apps_unpopulate();
+   _il_home_apps_populate();
+}
+
+/* local functions */
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) 
+{
+   Instance *inst;
+   Evas_Object *icon;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", 
+            il_home_cfg->mod_dir);
+   inst = E_NEW(Instance, 1);
+   inst->o_btn = e_widget_button_add(gc->evas, NULL, NULL, 
+                                     _il_home_btn_cb_click, inst, NULL);
+   icon = e_icon_add(evas_object_evas_get(inst->o_btn));
+   e_icon_file_edje_set(icon, buff, "btn_icon");
+   e_widget_button_icon_set(inst->o_btn, icon);
+
+   inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_btn);
+   inst->gcc->data = inst;
+
+   evas_object_event_callback_add(inst->o_btn, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _il_home_btn_cb_mouse_down, inst);
+
+   _il_home_win_new(inst);
+
+   instances = eina_list_append(instances, inst);
+   return inst->gcc;
+}
+
+static void 
+_gc_shutdown(E_Gadcon_Client *gcc) 
+{
+   Instance *inst;
+   Il_Home_Win *hwin;
+
+   if (!(inst = gcc->data)) return;
+   instances = eina_list_remove(instances, inst);
+   if (inst->menu) 
+     {
+        e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
+        e_object_del(E_OBJECT(inst->menu));
+        inst->menu = NULL;
+     }
+   if (inst->o_btn) 
+     {
+        evas_object_event_callback_del(inst->o_btn, EVAS_CALLBACK_MOUSE_DOWN, 
+                                       _il_home_btn_cb_mouse_down);
+        evas_object_del(inst->o_btn);
+     }
+
+   EINA_LIST_FREE(inst->wins, hwin)
+     e_object_del(E_OBJECT(hwin));
+
+   E_FREE(inst);
+}
+
+static void 
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) 
+{
+   e_gadcon_client_aspect_set(gcc, 16, 16);
+   e_gadcon_client_min_size_set(gcc, 16, 16);
+}
+
+static char *
+_gc_label(E_Gadcon_Client_Class *cc) 
+{
+   return _("Illume-Home");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas) 
+{
+   Evas_Object *o;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", 
+            il_home_cfg->mod_dir);
+   o = edje_object_add(evas);
+   edje_object_file_set(o, buff, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *cc) 
+{
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s.%d", _gc_class.name, 
+            eina_list_count(instances));
+   return strdup(buff);
+}
+
+static void 
+_il_home_btn_cb_click(void *data, void *data2) 
+{
+   Instance *inst;
+
+   if (!(inst = data)) return;
+   _il_home_win_new(inst);
+}
+
+static void 
+_il_home_btn_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) 
+{
+   Instance *inst;
+   Evas_Event_Mouse_Down *ev;
+
+   ev = event;
+   if (ev->button != 3) return;
+   if (!(inst = data)) return;
+   if (!inst->menu) 
+     {
+        E_Menu *mn;
+        E_Zone *zone;
+        int x = 0, y = 0;
+
+        zone = e_util_zone_current_get(e_manager_current_get());
+        mn = e_menu_new();
+        inst->menu = mn;
+        e_menu_post_deactivate_callback_set(inst->menu, 
+                                            _il_home_menu_cb_post, inst);
+        e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
+        e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
+        e_menu_activate_mouse(mn, zone, x + ev->output.x, y + ev->output.y, 
+                              1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+     }
+}
+
+static void 
+_il_home_menu_cb_post(void *data, E_Menu *mn) 
+{
+   Instance *inst;
+
+   if (!(inst = data)) return;
+   if (!inst->menu) return;
+   e_object_del(E_OBJECT(inst->menu));
+   inst->menu = NULL;
+}
+
+static void 
+_il_home_win_new(Instance *inst) 
+{
+   Il_Home_Win *hwin;
+   E_Container *con;
+   E_Zone *zone;
+   char buff[PATH_MAX];
+
+   if (!hwin) 
+     hwin = E_OBJECT_ALLOC(Il_Home_Win, IL_HOME_WIN_TYPE, 
+                           _il_home_win_cb_free);
+   if (!hwin) return;
+
+   con = e_container_current_get(e_manager_current_get());
+
+   hwin->win = e_win_new(con);
+   if (!hwin->win) 
+     {
+        e_object_del(E_OBJECT(hwin));
+        return;
+     }
+
+   inst->wins = eina_list_append(inst->wins, hwin);
+
+   e_win_delete_callback_set(hwin->win, _il_home_win_cb_delete);
+   e_win_resize_callback_set(hwin->win, _il_home_win_cb_resize);
+   hwin->win->data = inst;
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-home.edj", 
+            il_home_cfg->mod_dir);
+   hwin->o_bg = edje_object_add(e_win_evas_get(hwin->win));
+   if (!e_theme_edje_object_set(hwin->o_bg, 
+                                "base/theme/modules/illume-home", 
+                                "modules/illume-home/window")) 
+     edje_object_file_set(hwin->o_bg, buff, "modules/illume-home/window");
+   evas_object_move(hwin->o_bg, 0, 0);
+   evas_object_resize(hwin->o_bg, hwin->win->w, hwin->win->h);
+   evas_object_show(hwin->o_bg);
+
+   hwin->o_sf = e_scrollframe_add(e_win_evas_get(hwin->win));
+   e_scrollframe_single_dir_set(hwin->o_sf, 1);
+   evas_object_move(hwin->o_sf, 0, 0);
+   evas_object_resize(hwin->o_sf, hwin->win->w, hwin->win->h);
+   evas_object_show(hwin->o_sf);
+
+   e_scrollframe_custom_edje_file_set(hwin->o_sf, buff, 
+                                      "modules/illume-home/launcher/scrollview");
+
+   hwin->o_fm = e_fm2_add(e_win_evas_get(hwin->win));
+   _il_home_fmc_set(hwin->o_fm);
+   evas_object_show(hwin->o_fm);
+   e_user_dir_concat_static(buff, "appshadow");
+   e_fm2_path_set(hwin->o_fm, NULL, buff);
+
+   e_scrollframe_extern_pan_set(hwin->o_sf, hwin->o_fm, 
+                                _il_home_pan_set, 
+                                _il_home_pan_get, 
+                                _il_home_pan_max_get, 
+                                _il_home_pan_child_size_get);
+   evas_object_smart_callback_add(hwin->o_fm, "selected", 
+                                  _il_home_cb_selected, hwin);
+   zone = e_util_container_zone_number_get(0, 0);
+
+   e_win_title_set(hwin->win, _("Illume Home"));
+   e_win_name_class_set(hwin->win, "Illume-Home", "Illume-Home");
+   e_win_size_min_set(hwin->win, 48, 48);
+   e_win_resize(hwin->win, zone->w, 200);
+   e_win_show(hwin->win);
+}
+
+static void 
+_il_home_win_cb_free(Il_Home_Win *hwin) 
+{
+   if (hwin->o_bg) evas_object_del(hwin->o_bg);
+   hwin->o_bg = NULL;
+   if (hwin->o_sf) evas_object_del(hwin->o_sf);
+   hwin->o_sf = NULL;
+   if (hwin->o_fm) evas_object_del(hwin->o_fm);
+   hwin->o_fm = NULL;
+   if (hwin->win) e_object_del(E_OBJECT(hwin->win));
+   hwin->win = NULL;
+}
+
+static void 
+_il_home_win_cb_delete(E_Win *win) 
+{
+   Instance *inst;
+   Eina_List *l;
+   Il_Home_Win *hwin;
+
+   if (!(inst = win->data)) return;
+   EINA_LIST_FOREACH(inst->wins, l, hwin) 
+     {
+        if (hwin->win != win) 
+          {
+             hwin = NULL;
+             continue;
+          }
+        else break;
+     }
+   if (!hwin) return;
+   inst->wins = eina_list_remove(inst->wins, hwin);
+   e_object_del(E_OBJECT(hwin));
+   hwin = NULL;
+}
+
+static void 
+_il_home_win_cb_resize(E_Win *win) 
+{
+   Instance *inst;
+   Il_Home_Win *hwin;
+   Eina_List *l;
+
+   if (!(inst = win->data)) return;
+   EINA_LIST_FOREACH(inst->wins, l, hwin) 
+     {
+        if (hwin->win != win) 
+          {
+             hwin = NULL;
+             continue;
+          }
+        else break;
+     }
+   if (!hwin) return;
+
+   if (hwin->o_bg) 
+     {
+        if (hwin->win)
+          evas_object_resize(hwin->o_bg, hwin->win->w, hwin->win->h);
+     }
+   if (hwin->o_sf) 
+     {
+        if (hwin->win)
+          evas_object_resize(hwin->o_sf, hwin->win->w, hwin->win->h);
+     }
+}
+
+static void 
+_il_home_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) 
+{
+   e_fm2_pan_set(obj, x, y);
+}
+
+static void 
+_il_home_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) 
+{
+   e_fm2_pan_get(obj, x, y);
+}
+
+static void 
+_il_home_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) 
+{
+   e_fm2_pan_max_get(obj, x, y);
+}
+
+static void 
+_il_home_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 
+{
+   e_fm2_pan_child_size_get(obj, w, h);
+}
+
+static void 
+_il_home_cb_selected(void *data, Evas_Object *obj, void *event) 
+{
+   Il_Home_Win *hwin;
+   Eina_List *selected;
+   E_Fm2_Icon_Info *ici;
+
+   printf("FM Selected\n");
+   if (!(hwin = data)) return;
+   selected = e_fm2_selected_list_get(hwin->o_fm);
+   if (!selected) return;
+   EINA_LIST_FREE(selected, ici) 
+     {
+        Efreet_Desktop *desktop;
+
+        if (ici) 
+          {
+             if (ici->real_link) 
+               {
+                  desktop = efreet_desktop_get(ici->real_link);
+                  if (desktop) _il_home_desktop_run(desktop);
+               }
+          }
+     }
+}
+
+static void 
+_il_home_desktop_run(Efreet_Desktop *desktop) 
+{
+   Eina_List *l;
+   E_Border *bd;
+   E_Exec_Instance *eins;
+   char *exe = NULL, *p;
+
+   if (!desktop) return;
+   if (!desktop->exec) return;
+   p = strchr(desktop->exec, ' ');
+   if (!p)
+     exe = strdup(desktop->exec);
+   else 
+     {
+        exe = malloc(p - desktop->exec + 1);
+        if (exe) ecore_strlcpy(exe, desktop->exec, p - desktop->exec + 1);
+     }
+   if (exe) 
+     {
+        p = strrchr(exe, '/');
+        if (p) strcpy(exe, p + 1);
+     }
+   EINA_LIST_FOREACH(e_border_client_list(), l, bd) 
+     {
+        if (e_exec_startup_id_pid_find(bd->client.netwm.pid, 
+                                       bd->client.netwm.startup_id) == desktop) 
+          {
+             e_border_show(bd);
+             if (exe) free(exe);
+             return;
+          }
+        if (exe) 
+          {
+             if (bd->client.icccm.command.argv) 
+               {
+                  char *pp;
+
+                  pp = strrchr(bd->client.icccm.command.argv[0], '/');
+                  if (!pp) pp = bd->client.icccm.command.argv[0];
+                  if (!strcmp(exe, pp)) 
+                    {
+                       e_border_show(bd);
+                       if (exe) free(exe);
+                       return;
+                    }
+               }
+             if ((bd->client.icccm.name) && 
+                 (!strcasecmp(bd->client.icccm.name, exe))) 
+               {
+                  e_border_show(bd);
+                  if (exe) free(exe);
+                  return;
+               }
+          }
+     }
+   if (exe) free(exe);
+   eins = e_exec(e_util_container_zone_number_get(0, 0), 
+                 desktop, NULL, NULL, "illume-home");
+   if (eins) 
+     {
+        char buff[PATH_MAX];
+
+        snprintf(buff, sizeof(buff), "Starting %s", desktop->name);
+        e_busycover_push(busycover, buff, NULL);
+     }
+}
+
+static void 
+_il_home_apps_populate(void) 
+{
+   Eina_List *l, *ll;
+   Instance *inst;
+   char buff[PATH_MAX];
+
+   e_user_dir_concat_static(buff, "appshadow");
+   ecore_file_mkpath(buff);
+
+   _il_home_desks_populate();
+
+   EINA_LIST_FOREACH(instances, l, inst) 
+     {
+        Il_Home_Win *hwin;
+
+        EINA_LIST_FOREACH(inst->wins, ll, hwin) 
+          {
+             if (!hwin) continue;
+             _il_home_fmc_set(hwin->o_fm);
+             e_fm2_path_set(hwin->o_fm, NULL, buff);
+          }
+     }
+}
+
+static void 
+_il_home_apps_unpopulate(void) 
+{
+   Efreet_Desktop *desktop;
+   Eina_List *files;
+   char buff[PATH_MAX], *file;
+   size_t len;
+
+   EINA_LIST_FREE(desks, desktop)
+     efreet_desktop_free(desktop);
+
+   len = e_user_dir_concat_static(buff, "appshadow");
+   if ((len + 2) >= sizeof(buff)) return;
+
+   files = ecore_file_ls(buff);
+   buff[len] = '/';
+   len++;
+
+   EINA_LIST_FREE(files, file) 
+     {
+        if (ecore_strlcpy(buff + len, file, sizeof(buff) - len) >= sizeof(buff) - len)
+          continue;
+        ecore_file_unlink(buff);
+        free(file);
+     }
+}
+
+static void 
+_il_home_fmc_set(Evas_Object *obj) 
+{
+   E_Fm2_Config fmc;
+
+   if (!obj) return;
+   memset(&fmc, 0, sizeof(E_Fm2_Config));
+   fmc.view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
+   fmc.view.open_dirs_in_place = 1;
+   fmc.view.selector = 0;
+   fmc.view.single_click = il_home_cfg->single_click;
+   fmc.view.single_click_delay = il_home_cfg->single_click_delay;
+   fmc.view.no_subdir_jump = 1;
+   fmc.icon.extension.show = 0;
+   fmc.icon.icon.w = il_home_cfg->icon_size * e_scale / 2.0;
+   fmc.icon.icon.h = il_home_cfg->icon_size * e_scale / 2.0;
+   fmc.icon.fixed.w = il_home_cfg->icon_size * e_scale / 2.0;
+   fmc.icon.fixed.h = il_home_cfg->icon_size * e_scale / 2.0;
+   fmc.list.sort.no_case = 0;
+   fmc.list.sort.dirs.first = 1;
+   fmc.list.sort.dirs.last = 0;
+   fmc.selection.single = 1;
+   fmc.selection.windows_modifiers = 0;
+   e_fm2_config_set(obj, &fmc);
+}
+
+static void 
+_il_home_desks_populate(void) 
+{
+   Efreet_Menu *menu;
+
+   menu = efreet_menu_get();
+   if (menu) 
+     {
+        Eina_List *l, *ll;
+        Efreet_Desktop *desktop;
+        char *label, *icon, *plabel, buff[PATH_MAX];
+        Efreet_Menu *entry, *subentry;
+        Eina_List *settings, *sys, *kbd;
+        int num = 0;
+
+        settings = efreet_util_desktop_category_list("Settings");
+        sys = efreet_util_desktop_category_list("System");
+        kbd = efreet_util_desktop_category_list("Keyboard");
+        EINA_LIST_FOREACH(menu->entries, l, entry) 
+          {
+             if (entry->type != EFREET_MENU_ENTRY_MENU) continue;
+             desktop = entry->desktop;
+             plabel = NULL;
+             if (entry->name) plabel = strdup(entry->name);
+             if (!plabel) plabel = strdup("???");
+             EINA_LIST_FOREACH(entry->entries, ll, subentry) 
+               {
+                  if (subentry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
+                  label = icon = NULL;
+                  if (!(desktop = subentry->desktop)) continue;
+                  if ((settings) && (sys) && 
+                      (eina_list_data_find(settings, desktop)) && 
+                      (eina_list_data_find(sys, desktop))) continue;
+                  if ((kbd) && (eina_list_data_find(kbd, desktop)))
+                    continue;
+                  if ((desktop) && (desktop->x)) 
+                    {
+                       icon = eina_hash_find(desktop->x, 
+                                             "X-Application-Screenshot");
+                       if (icon) icon = strdup(icon);
+                    }
+                  if ((!icon) && (subentry->icon)) 
+                    {
+                       if (subentry->icon[0] == '/')
+                         icon = strdup(subentry->icon);
+                       else
+                         icon = efreet_icon_path_find(e_config->icon_theme, 
+                                                      subentry->icon, 
+                                                      il_home_cfg->icon_size);
+                    }
+                  if (subentry->name) label = strdup(subentry->name);
+                  if (desktop)
+                    {
+                       if (!label)
+                         label = strdup(desktop->generic_name);
+                       if ((!icon) && (desktop->icon))
+                         icon = efreet_icon_path_find(e_config->icon_theme, 
+                                                      desktop->icon, 
+                                                      il_home_cfg->icon_size);
+                    }
+                  if (!icon) 
+                    icon = efreet_icon_path_find(e_config->icon_theme, 
+                                                 "hires.jpg", 
+                                                 il_home_cfg->icon_size);
+                  if (!icon) icon = strdup("DEFAULT");
+                  if (!label) label = strdup("???");
+
+                  snprintf(buff, sizeof(buff), "%s / %s", plabel, label);
+                  desks = eina_list_append(desks, desktop);
+                  efreet_desktop_ref(desktop);
+                  if (desktop) 
+                    {
+                       e_user_dir_snprintf(buff, sizeof(buff), 
+                                           "appshadow/%04x.desktop", num);
+                       ecore_file_symlink(desktop->orig_path, buff);
+                    }
+                  num++;
+                  if (label) free(label);
+                  if (icon) free(icon);
+               }
+             if (plabel) free(plabel);
+          }
+     }
+}
+
+static int 
+_il_home_desktop_list_change(void *data, int type, void *event) 
+{
+   if (defer) ecore_timer_del(defer);
+   defer = ecore_timer_add(1.0, _il_home_update_deferred, NULL);
+   return 1;
+}
+
+static int 
+_il_home_desktop_change(void *data, int type, void *event) 
+{
+   if (defer) ecore_timer_del(defer);
+   defer = ecore_timer_add(1.0, _il_home_update_deferred, NULL);
+   return 1;
+}
+
+static int 
+_il_home_update_deferred(void *data) 
+{
+   _il_home_apps_unpopulate();
+   _il_home_apps_populate();
+   defer = NULL;
+   return 0;
+}
+
diff --git a/src/modules/illume-home/e_mod_main.h b/src/modules/illume-home/e_mod_main.h
new file mode 100644
index 0000000..04c4f97
--- /dev/null
+++ b/src/modules/illume-home/e_mod_main.h
@@ -0,0 +1,12 @@
+#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);
+
+void il_home_win_cfg_update(void);
+
+#endif
diff --git a/src/modules/illume-home/module.desktop b/src/modules/illume-home/module.desktop
new file mode 100644
index 0000000..439e593
--- /dev/null
+++ b/src/modules/illume-home/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Home
+Icon=e-module-illume-home
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Home for Embedded</title>
diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in
new file mode 100644
index 0000000..439e593
--- /dev/null
+++ b/src/modules/illume-home/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Home
+Icon=e-module-illume-home
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Home for Embedded</title>
diff --git a/src/modules/illume-indicator/Makefile.am b/src/modules/illume-indicator/Makefile.am
new file mode 100644
index 0000000..0c86431
--- /dev/null
+++ b/src/modules/illume-indicator/Makefile.am
@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-indicator
+
+# 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_mod_config.c \
+                         e_mod_config.h \
+                         e_mod_win.c \
+                         e_mod_win.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/illume-indicator/Makefile.in b/src/modules/illume-indicator/Makefile.in
new file mode 100644
index 0000000..22d2378
--- /dev/null
+++ b/src/modules/illume-indicator/Makefile.in
@@ -0,0 +1,683 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-indicator
+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-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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_mod_config.lo e_mod_win.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--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@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-indicator
+
+# 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_mod_config.c \
+                         e_mod_config.h \
+                         e_mod_win.c \
+                         e_mod_win.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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-indicator/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-indicator/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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) 
+	$(module_la_LINK) -rpath $(pkgdir) $(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_config.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_win.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-pkgLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.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-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-ps install-ps-am 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-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/illume-indicator/e-module-illume-indicator.edj b/src/modules/illume-indicator/e-module-illume-indicator.edj
new file mode 100644
index 0000000..b1d64ac
Binary files /dev/null and b/src/modules/illume-indicator/e-module-illume-indicator.edj differ
diff --git a/src/modules/illume-indicator/e_mod_config.c b/src/modules/illume-indicator/e_mod_config.c
new file mode 100644
index 0000000..af1a7ba
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_config.c
@@ -0,0 +1,60 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+
+/* local variables */
+EAPI Il_Ind_Config *il_ind_cfg = NULL;
+static E_Config_DD *conf_edd = NULL;
+
+int 
+il_ind_config_init(E_Module *m) 
+{
+   conf_edd = E_CONFIG_DD_NEW("Illume-Ind_Cfg", Il_Ind_Config);
+   #undef T
+   #undef D
+   #define T Il_Ind_Config
+   #define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+
+   il_ind_cfg = e_config_domain_load("module.illume-indicator", conf_edd);
+   if ((il_ind_cfg) && 
+       ((il_ind_cfg->version >> 16) < IL_CONFIG_MAJ)) 
+     {
+        E_FREE(il_ind_cfg);
+        il_ind_cfg = NULL;
+     }
+   if (!il_ind_cfg) 
+     {
+        il_ind_cfg = E_NEW(Il_Ind_Config, 1);
+        il_ind_cfg->version = 0;
+     }
+   if (il_ind_cfg) 
+     {
+        /* Add new config variables here */
+        /* if ((il_ind_cfg->version & 0xffff) < 1) */
+        il_ind_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
+     }
+
+   il_ind_cfg->mod_dir = eina_stringshare_add(m->dir);
+   return 1;
+}
+
+int 
+il_ind_config_shutdown(void) 
+{
+   if (il_ind_cfg->mod_dir) eina_stringshare_del(il_ind_cfg->mod_dir);
+   il_ind_cfg->mod_dir = NULL;
+
+   E_FREE(il_ind_cfg);
+   il_ind_cfg = NULL;
+
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+int 
+il_ind_config_save(void) 
+{
+   return 1;
+}
+
diff --git a/src/modules/illume-indicator/e_mod_config.h b/src/modules/illume-indicator/e_mod_config.h
new file mode 100644
index 0000000..575bb0c
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_config.h
@@ -0,0 +1,23 @@
+#ifndef E_MOD_CONFIG_H
+#define E_MOD_CONFIG_H
+
+#define IL_CONFIG_MIN 0
+#define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Ind_Config Il_Ind_Config;
+
+struct _Il_Ind_Config 
+{
+   int version;
+
+   // Placeholders
+   const char *mod_dir;
+};
+
+int il_ind_config_init(E_Module *m);
+int il_ind_config_shutdown(void);
+int il_ind_config_save(void);
+
+extern EAPI Il_Ind_Config *il_ind_cfg;
+
+#endif
diff --git a/src/modules/illume-indicator/e_mod_main.c b/src/modules/illume-indicator/e_mod_main.c
new file mode 100644
index 0000000..6c72941
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_main.c
@@ -0,0 +1,39 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_win.h"
+
+/* local variables */
+static Il_Ind_Win *iwin = NULL;
+
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume-Indicator" };
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   if (!il_ind_config_init(m)) return NULL;
+
+   e_mod_ind_win_init();
+
+   iwin = e_mod_ind_win_new();
+
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   e_object_del(E_OBJECT(iwin));
+   iwin = NULL;
+
+   e_mod_ind_win_shutdown();
+   il_ind_config_shutdown();
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return il_ind_config_save();
+}
+
diff --git a/src/modules/illume-indicator/e_mod_main.h b/src/modules/illume-indicator/e_mod_main.h
new file mode 100644
index 0000000..a0405fd
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_main.h
@@ -0,0 +1,24 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define IL_IND_WIN_TYPE 0xE1b0886
+
+typedef struct _Il_Ind_Win Il_Ind_Win;
+
+struct _Il_Ind_Win 
+{
+   E_Object e_obj_inherit;
+
+   E_Win *win;
+   E_Menu *menu;
+   E_Gadcon *gadcon;
+   Evas_Object *o_base, *o_event;
+};
+
+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/illume-indicator/e_mod_win.c b/src/modules/illume-indicator/e_mod_win.c
new file mode 100644
index 0000000..b641f7d
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_win.c
@@ -0,0 +1,284 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_win.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void _il_ind_win_cb_free(Il_Ind_Win *iwin);
+static void _il_ind_win_cb_resize(E_Win *ewin);
+static void _il_ind_win_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event);
+static int _il_ind_win_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc);
+static void _il_ind_win_gadcon_client_del(void *data, E_Gadcon_Client *gcc);
+static void _il_ind_win_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
+static void _il_ind_win_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
+static Evas_Object *_il_ind_win_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
+static void _il_ind_win_cb_menu_post(void *data, E_Menu *m);
+static void _il_ind_win_menu_append(Il_Ind_Win *iwin, E_Menu *mn);
+static void _il_ind_win_cb_menu_pre(void *data, E_Menu *mn);
+static void _il_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn);
+static void _il_ind_win_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
+static void _il_ind_win_cb_menu_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
+
+int 
+e_mod_ind_win_init(void) 
+{
+   return 1;
+}
+
+int 
+e_mod_ind_win_shutdown(void) 
+{
+   return 1;
+}
+
+Il_Ind_Win *
+e_mod_ind_win_new(void) 
+{
+   Il_Ind_Win *iwin;
+   E_Zone *zone;
+   Evas *evas;
+   Eina_List *l;
+   E_Config_Gadcon *cg;
+   Ecore_X_Window_State states[2];
+   char buff[PATH_MAX];
+
+   iwin = E_OBJECT_ALLOC(Il_Ind_Win, IL_IND_WIN_TYPE, _il_ind_win_cb_free);
+   if (!iwin) return NULL;
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-indicator.edj", 
+            il_ind_cfg->mod_dir);
+
+   iwin->win = e_win_new(e_util_container_number_get(0));
+   states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
+   states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
+   ecore_x_netwm_window_state_set(iwin->win->evas_win, states, 2);
+   ecore_x_icccm_hints_set(iwin->win->evas_win, 0, 0, 0, 0, 0, 0, 0);
+   ecore_x_netwm_window_type_set(iwin->win->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
+
+   e_win_no_remember_set(iwin->win, 1);
+   e_win_resize_callback_set(iwin->win, _il_ind_win_cb_resize);
+   e_win_borderless_set(iwin->win, 1);
+   iwin->win->data = iwin;
+   e_win_title_set(iwin->win, _("Illume Indicator"));
+   e_win_name_class_set(iwin->win, "Illume-Indicator", "Illume-Indicator");
+
+   evas = e_win_evas_get(iwin->win);
+
+   zone = e_util_container_zone_number_get(0, 0);
+
+   iwin->o_event = evas_object_rectangle_add(evas);
+   evas_object_color_set(iwin->o_event, 0, 0, 0, 0);
+   evas_object_move(iwin->o_event, 0, 0);
+   evas_object_resize(iwin->o_event, zone->w, 32);
+   evas_object_event_callback_add(iwin->o_event, EVAS_CALLBACK_MOUSE_DOWN, 
+                                  _il_ind_win_cb_mouse_down, iwin);
+   evas_object_show(iwin->o_event);
+   evas_object_layer_set(iwin->o_event, 200);
+
+   iwin->o_base = edje_object_add(evas);
+   evas_object_resize(iwin->o_base, zone->w, 32);
+   if (!e_theme_edje_object_set(iwin->o_base, 
+                                "base/theme/modules/illume-indicator", 
+                                "modules/illume-indicator/shelf"))
+     edje_object_file_set(iwin->o_base, buff, "modules/illume-indicator/shelf");
+   evas_object_move(iwin->o_base, 0, 0);
+   evas_object_resize(iwin->o_base, zone->w, 32);
+   evas_object_layer_set(iwin->o_base, 200);
+   evas_object_show(iwin->o_base);
+
+   iwin->gadcon = e_gadcon_swallowed_new("illume-indicator", 1, iwin->o_base, 
+                                         "e.swallow.content");
+   iwin->gadcon->instant_edit = 1;
+   edje_extern_object_min_size_set(iwin->gadcon->o_container, zone->w, 32);
+   edje_object_part_swallow(iwin->o_base, "e.swallow.content", 
+                            iwin->gadcon->o_container);
+   e_gadcon_min_size_request_callback_set(iwin->gadcon, 
+                                          _il_ind_win_gadcon_min_size_request, 
+                                          iwin);
+   e_gadcon_size_request_callback_set(iwin->gadcon, 
+                                      _il_ind_win_gadcon_size_request, iwin);
+   e_gadcon_frame_request_callback_set(iwin->gadcon, 
+                                       _il_ind_win_gadcon_frame_request, iwin);
+   e_gadcon_orient(iwin->gadcon, E_GADCON_ORIENT_TOP);
+   e_gadcon_zone_set(iwin->gadcon, zone);
+   e_gadcon_ecore_evas_set(iwin->gadcon, iwin->win->ecore_evas);
+   e_gadcon_util_menu_attach_func_set(iwin->gadcon, 
+                                      _il_ind_win_cb_menu_items_append, iwin);
+
+   e_gadcon_populate(iwin->gadcon);
+
+   e_win_size_min_set(iwin->win, zone->w, 32);
+   e_win_show(iwin->win);
+   e_win_move_resize(iwin->win, 0, 0, zone->w, 32);
+
+   return iwin;
+}
+
+/* local function prototypes */
+static void 
+_il_ind_win_cb_free(Il_Ind_Win *iwin) 
+{
+   if (iwin->menu) 
+     {
+        e_menu_post_deactivate_callback_set(iwin->menu, NULL, NULL);
+        e_object_del(E_OBJECT(iwin->menu));
+        iwin->menu = NULL;
+     }
+
+   if (iwin->o_event) evas_object_del(iwin->o_event);
+   if (iwin->o_base) evas_object_del(iwin->o_base);
+
+   e_object_del(E_OBJECT(iwin->gadcon));
+   iwin->gadcon = NULL;
+
+   e_object_del(E_OBJECT(iwin->win));
+   E_FREE(iwin);
+}
+
+static void 
+_il_ind_win_cb_resize(E_Win *ewin) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = ewin->data)) return;
+   evas_object_resize(iwin->o_event, iwin->win->w, iwin->win->h);
+   evas_object_resize(iwin->o_base, iwin->win->w, iwin->win->h);
+}
+
+static void 
+_il_ind_win_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) 
+{
+   Il_Ind_Win *iwin;
+   Evas_Event_Mouse_Down *ev;
+
+   if (!(iwin = data)) return;
+   ev = event;
+   if (ev->button == 3) 
+     {
+        E_Menu *mn;
+        E_Zone *zone;
+        int x, y, w, h;
+
+        mn = e_menu_new();
+        e_menu_post_deactivate_callback_set(mn, _il_ind_win_cb_menu_post, iwin);
+        iwin->menu = mn;
+
+        _il_ind_win_menu_append(iwin, mn);
+
+        zone = e_util_container_zone_number_get(0, 0);
+        e_gadcon_canvas_zone_geometry_get(iwin->gadcon, &x, &y, NULL, NULL);
+        e_menu_activate_mouse(mn, zone, x + ev->output.x, y + ev->output.y, 
+                              1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
+     }
+}
+
+static void 
+_il_ind_win_cb_menu_post(void *data, E_Menu *m) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = data)) return;
+   if (!iwin->menu) return;
+   e_object_del(E_OBJECT(iwin->menu));
+   iwin->menu = NULL;
+}
+
+static void 
+_il_ind_win_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Menu *mn) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = data)) return;
+   _il_ind_win_menu_append(iwin, mn);
+}
+
+static void 
+_il_ind_win_menu_append(Il_Ind_Win *iwin, E_Menu *mn) 
+{
+   E_Menu *sm;
+   E_Menu_Item *mi;
+
+   sm = e_menu_new();
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, _("Illume Indicator"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
+   e_menu_pre_activate_callback_set(sm, _il_ind_win_cb_menu_pre, iwin);
+   e_object_data_set(E_OBJECT(mi), iwin);
+   e_menu_item_submenu_set(mi, sm);
+}
+
+static void 
+_il_ind_win_cb_menu_pre(void *data, E_Menu *mn) 
+{
+   Il_Ind_Win *iwin;
+   E_Menu_Item *mi;
+
+   if (!(iwin = data)) return;
+   e_menu_pre_activate_callback_set(mn, NULL, NULL);
+
+   mi = e_menu_item_new(mn);
+   if (iwin->gadcon->editing)
+     e_menu_item_label_set(mi, _("Stop Moving/Resizing Items"));
+   else
+     e_menu_item_label_set(mi, _("Begin Moving/Resizing Items"));
+   e_util_menu_item_theme_icon_set(mi, "transform-scale");
+   e_menu_item_callback_set(mi, _il_ind_win_cb_menu_edit, iwin);
+
+   mi = e_menu_item_new(mn);
+   e_menu_item_separator_set(mi, 1);
+
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, _("Set Contents"));
+   e_util_menu_item_theme_icon_set(mi, "preferences-desktop-shelf");
+   e_menu_item_callback_set(mi, _il_ind_win_cb_menu_contents, iwin);
+}
+
+static void 
+_il_ind_win_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = data)) return;
+   if (gc == iwin->gadcon) 
+     {
+        if (h < 32) h = 32;
+        edje_extern_object_min_size_set(iwin->gadcon->o_container, w, h);
+        edje_object_part_swallow(iwin->o_base, "e.swallow.content", 
+                                 iwin->gadcon->o_container);
+     }
+   evas_object_resize(iwin->o_base, iwin->win->w, iwin->win->h);
+}
+
+static void 
+_il_ind_win_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h) 
+{
+   return;
+}
+
+static Evas_Object *
+_il_ind_win_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style) 
+{
+   return NULL;
+}
+
+static void 
+_il_ind_win_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = data)) return;
+   if (iwin->gadcon->editing)
+     e_gadcon_edit_end(iwin->gadcon);
+   else
+     e_gadcon_edit_begin(iwin->gadcon);
+}
+
+static void 
+_il_ind_win_cb_menu_contents(void *data, E_Menu *mn, E_Menu_Item *mi) 
+{
+   Il_Ind_Win *iwin;
+
+   if (!(iwin = data)) return;
+   if (!iwin->gadcon->config_dialog) 
+     e_int_gadcon_config_shelf(iwin->gadcon);
+}
diff --git a/src/modules/illume-indicator/e_mod_win.h b/src/modules/illume-indicator/e_mod_win.h
new file mode 100644
index 0000000..de79eff
--- /dev/null
+++ b/src/modules/illume-indicator/e_mod_win.h
@@ -0,0 +1,8 @@
+#ifndef E_MOD_WIN_H
+#define E_MOD_WIN_H
+
+int e_mod_ind_win_init(void);
+int e_mod_ind_win_shutdown(void);
+Il_Ind_Win *e_mod_ind_win_new(void);
+
+#endif
diff --git a/src/modules/illume-indicator/module.desktop b/src/modules/illume-indicator/module.desktop
new file mode 100644
index 0000000..249dbf4
--- /dev/null
+++ b/src/modules/illume-indicator/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Indicator
+Icon=e-module-illume-indicator
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Indicator for Embedded</title>
diff --git a/src/modules/illume-indicator/module.desktop.in b/src/modules/illume-indicator/module.desktop.in
new file mode 100644
index 0000000..249dbf4
--- /dev/null
+++ b/src/modules/illume-indicator/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Indicator
+Icon=e-module-illume-indicator
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Indicator for Embedded</title>
diff --git a/src/modules/illume-keyboard/Makefile.am b/src/modules/illume-keyboard/Makefile.am
new file mode 100644
index 0000000..01934ee
--- /dev/null
+++ b/src/modules/illume-keyboard/Makefile.am
@@ -0,0 +1,40 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = keyboards dicts
+MODULE = illume-keyboard
+
+# 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_kbd_int.c \
+                         e_kbd_int.h \
+                         e_kbd_dict.c \
+                         e_kbd_dict.h \
+                         e_kbd_buf.c \
+                         e_kbd_buf.h \
+                         e_kbd_send.c \
+                         e_kbd_send.h \
+                         e_mod_config.c \
+                         e_mod_config.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/illume-keyboard/Makefile.in b/src/modules/illume-keyboard/Makefile.in
new file mode 100644
index 0000000..eef84a9
--- /dev/null
+++ b/src/modules/illume-keyboard/Makefile.in
@@ -0,0 +1,807 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-keyboard
+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-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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_kbd_int.lo e_kbd_dict.lo \
+	e_kbd_buf.lo e_kbd_send.lo e_mod_config.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(module_la_SOURCES)
+DIST_SOURCES = $(module_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = keyboards dicts
+MODULE = illume-keyboard
+
+# 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_kbd_int.c \
+                         e_kbd_int.h \
+                         e_kbd_dict.c \
+                         e_kbd_dict.h \
+                         e_kbd_buf.c \
+                         e_kbd_buf.h \
+                         e_kbd_send.c \
+                         e_kbd_send.h \
+                         e_mod_config.c \
+                         e_mod_config.h
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+all: all-recursive
+
+.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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-keyboard/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-keyboard/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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) 
+	$(module_la_LINK) -rpath $(pkgdir) $(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_kbd_buf.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_kbd_dict.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_kbd_int.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_kbd_send.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_config.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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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
+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
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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-recursive
+
+clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA uninstall-pkgLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES ctags ctags-recursive 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-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-filesDATA \
+	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/illume/dicts/English_(US).dic b/src/modules/illume-keyboard/dicts/English_(US).dic
similarity index 100%
copy from src/modules/illume/dicts/English_(US).dic
copy to src/modules/illume-keyboard/dicts/English_(US).dic
diff --git a/src/modules/illume/dicts/English_(US)_Small.dic b/src/modules/illume-keyboard/dicts/English_(US)_Small.dic
similarity index 100%
copy from src/modules/illume/dicts/English_(US)_Small.dic
copy to src/modules/illume-keyboard/dicts/English_(US)_Small.dic
diff --git a/src/modules/illume-keyboard/dicts/Makefile.am b/src/modules/illume-keyboard/dicts/Makefile.am
new file mode 100644
index 0000000..04e4ece
--- /dev/null
+++ b/src/modules/illume-keyboard/dicts/Makefile.am
@@ -0,0 +1,9 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-keyboard
+
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/dicts
+files_DATA = \
+            English_(US).dic \
+            English_(US)_Small.dic
+
+EXTRA_DIST = $(files_DATA)
diff --git a/src/modules/illume-keyboard/dicts/Makefile.in b/src/modules/illume-keyboard/dicts/Makefile.in
new file mode 100644
index 0000000..a652286
--- /dev/null
+++ b/src/modules/illume-keyboard/dicts/Makefile.in
@@ -0,0 +1,523 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-keyboard/dicts
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+SOURCES =
+DIST_SOURCES =
+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)$(filesdir)"
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-keyboard
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/dicts
+files_DATA = \
+            English_(US).dic \
+            English_(US)_Small.dic
+
+EXTRA_DIST = $(files_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-keyboard/dicts/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-keyboard/dicts/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
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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 $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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 mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-filesDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-filesDATA
+
+# 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/illume-keyboard/e-module-illume-keyboard.edj b/src/modules/illume-keyboard/e-module-illume-keyboard.edj
new file mode 100644
index 0000000..b2ef204
Binary files /dev/null and b/src/modules/illume-keyboard/e-module-illume-keyboard.edj differ
diff --git a/src/modules/illume-keyboard/e_kbd_buf.c b/src/modules/illume-keyboard/e_kbd_buf.c
new file mode 100644
index 0000000..61cfa23
--- /dev/null
+++ b/src/modules/illume-keyboard/e_kbd_buf.c
@@ -0,0 +1,573 @@
+#include "e.h"
+#include "e_kbd_buf.h"
+#include "e_kbd_dict.h"
+
+#include <math.h>
+
+static E_Kbd_Buf_Layout *
+_e_kbd_buf_new(void)
+{
+   E_Kbd_Buf_Layout *kbl;
+   
+   kbl = E_NEW(E_Kbd_Buf_Layout, 1);
+   kbl->ref =1;
+   return kbl;
+}
+
+static void
+_e_kbd_buf_layout_ref(E_Kbd_Buf_Layout *kbl)
+{
+   kbl->ref++;
+}
+
+static void
+_e_kbd_buf_layout_unref(E_Kbd_Buf_Layout *kbl)
+{
+   kbl->ref--;
+   if (kbl->ref > 0) return;
+   while (kbl->keys)
+     {
+	E_Kbd_Buf_Key *ky;
+	
+	ky = kbl->keys->data;
+	if (ky->key) eina_stringshare_del(ky->key);
+	if (ky->key_shift) eina_stringshare_del(ky->key_shift);
+	if (ky->key_capslock) eina_stringshare_del(ky->key_capslock);
+	free(ky);
+	kbl->keys = eina_list_remove_list(kbl->keys, kbl->keys);
+     }
+   free(kbl);
+}
+
+static void
+_e_kbd_buf_string_matches_clear(E_Kbd_Buf *kb)
+{
+   while (kb->string_matches)
+     {
+	if (kb->string_matches->data)
+	  eina_stringshare_del(kb->string_matches->data);
+	kb->string_matches = eina_list_remove_list(kb->string_matches, kb->string_matches);
+     }
+}
+
+static void
+_e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb)
+{
+   if (kb->actual_string) eina_stringshare_del(kb->actual_string);
+   kb->actual_string = NULL;
+}
+
+static E_Kbd_Buf_Key *
+_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
+{
+   Eina_List *l;
+   
+   for (l = kbl->keys; l; l = l->next)
+     {
+	E_Kbd_Buf_Key *ky;
+	
+	ky = l->data;
+	if (ky->key)
+	  {
+	     if ((x >= ky->x) && (y >= ky->y) &&
+		 (x < (ky->x + ky->w)) && (y < (ky->y + ky->h)))
+	       return ky;
+	  }
+     }
+   return NULL;
+}
+
+static E_Kbd_Buf_Key *
+_e_kbd_buf_closest_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
+{
+   Eina_List *l;
+   E_Kbd_Buf_Key *ky_closest = NULL;
+   int dist_closest = 0x7fffffff;
+   
+   for (l = kbl->keys; l; l = l->next)
+     {
+	E_Kbd_Buf_Key *ky;
+	int dist, dx, dy;
+	
+	ky = l->data;
+	if (ky->key)
+	  {
+	     dx = x - (ky->x + (ky->w / 2));
+	     dy = y - (ky->y + (ky->h / 2));
+	     dist = (dx * dx) + (dy * dy);
+	     if (dist < dist_closest)
+	       {
+		  ky_closest = ky;
+		  dist_closest = dist;
+	       }
+	  }
+     }
+   return ky_closest;
+}
+
+static const char *
+_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky)
+{
+   const char *str = NULL;
+   
+   if ((ky) && (ky->key))
+     {
+	if (ks->shift)
+	  {
+	     if (ky->key_shift) str = ky->key_shift;
+	     else str = ky->key;
+	  }
+	else if (ks->capslock)
+	  {
+	     if (ky->key_capslock) str = ky->key_capslock;
+	     else str = ky->key;
+	  }
+	else str = ky->key;
+     }
+   return str;
+}
+
+static const char *
+_e_kbd_buf_keystroke_string_get(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
+{
+   const char *str = NULL;
+   
+   if (ks->key) str = ks->key;
+   else
+     {
+	E_Kbd_Buf_Key *ky;
+	
+	ky = _e_kbd_buf_at_coord_get(kb, ks->layout, ks->x, ks->y);
+	if (!ky) ky = _e_kbd_buf_closest_get(kb, ks->layout, ks->x, ks->y);
+	str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
+     }
+   return str;
+}
+
+static void
+_e_kbd_buf_actual_string_update(E_Kbd_Buf *kb)
+{
+   Eina_List *l;
+   char *actual = NULL;
+   int actual_len = 0;
+   int actual_size = 0;
+   
+   _e_kbd_buf_actual_string_clear(kb);
+   for (l = kb->keystrokes; l; l = l->next)
+     {
+	E_Kbd_Buf_Keystroke *ks;
+	const char *str;
+	
+	ks = l->data;
+	str = _e_kbd_buf_keystroke_string_get(kb, ks);
+	if (str)
+	  {
+	     if ((actual_len + strlen(str) + 1) > actual_size)
+	       {
+		  actual_size += 64;
+		  actual = realloc(actual, actual_size);
+	       }
+	     strcpy(actual + actual_len, str);
+	     actual_len += strlen(str);
+	  }
+     }
+   if (actual)
+     {
+	kb->actual_string = eina_stringshare_add(actual);
+	if (actual) free(actual);
+     }
+}
+
+static const char *
+_e_kbd_buf_matches_find(Eina_List *matches, const char *s)
+{
+   Eina_List *l;
+   
+   for (l = matches; l; l = l->next)
+     {
+	if (!strcmp(l->data, s)) return s;
+     }
+   return NULL;
+}
+
+static void
+_e_kbd_buf_matches_update(E_Kbd_Buf *kb)
+{
+   Eina_List *matches = NULL;
+   const char *word;
+   int pri, i;
+   E_Kbd_Dict *dicts[3];
+
+   _e_kbd_buf_string_matches_clear(kb);
+   dicts[0] = kb->dict.personal;
+   dicts[1] = kb->dict.sys;
+   dicts[2] = kb->dict.data;
+   for (i = 0; i < 3; i++)
+     {
+	if (!dicts[i]) continue;
+	e_kbd_dict_matches_lookup(dicts[i]);
+	e_kbd_dict_matches_first(dicts[i]);
+	for (;;)
+	  {
+	     word = e_kbd_dict_matches_match_get(dicts[i], &pri);
+	     if (!word) break;
+	     if (!_e_kbd_buf_matches_find(kb->string_matches, word))
+	       kb->string_matches = eina_list_append(kb->string_matches,
+						     eina_stringshare_add(word));
+	     e_kbd_dict_matches_next(dicts[i]);
+	  }
+     }
+}
+
+static int
+_e_kbd_buf_cb_data_dict_reload(void *data)
+{
+   E_Kbd_Buf *kb;
+   char buf[PATH_MAX];
+
+   kb = data;
+   kb->dict.data_reload_delay = NULL;
+   e_kbd_buf_clear(kb);
+   if (kb->dict.data) e_kbd_dict_free(kb->dict.data);
+   e_user_dir_concat_static(buf, "dicts-dynamic/data.dic");
+   kb->dict.data = e_kbd_dict_new(buf);
+   return 0;
+}
+
+static void
+_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
+{
+   E_Kbd_Buf *kb;
+   
+   kb = data;
+   if (kb->dict.data_reload_delay) ecore_timer_del(kb->dict.data_reload_delay);
+   kb->dict.data_reload_delay = ecore_timer_add(2.0, _e_kbd_buf_cb_data_dict_reload, kb);
+}
+    
+EAPI E_Kbd_Buf *
+e_kbd_buf_new(const char *sysdicts, const char *dict)
+{
+   E_Kbd_Buf *kb;
+   char buf[PATH_MAX];
+
+   kb = E_NEW(E_Kbd_Buf, 1);
+   if (!kb) return NULL;
+   kb->sysdicts = eina_stringshare_add(sysdicts);
+
+   e_user_dir_concat_static(buf, "dicts");
+   if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
+
+   e_user_dir_snprintf(buf, sizeof(buf), "dicts/%s", dict);
+   kb->dict.sys = e_kbd_dict_new(buf);
+   if (!kb->dict.sys)
+     {
+	snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
+	kb->dict.sys = e_kbd_dict_new(buf);
+     }
+
+   e_user_dir_concat_static(buf, "dicts-dynamic");
+   if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
+
+   e_user_dir_concat_static(buf, "dicts-dynamic/personal.dic");
+   kb->dict.personal = e_kbd_dict_new(buf);
+   if (!kb->dict.personal)
+     {
+	FILE *f;
+	
+	f = fopen(buf, "w");
+	if (f)
+	  {
+	     fprintf(f, "\n");
+	     fclose(f);
+	  }
+	kb->dict.personal = e_kbd_dict_new(buf);
+     }
+   e_user_dir_concat_static(buf, "dicts-dynamic/data.dic");
+   kb->dict.data = e_kbd_dict_new(buf);
+   kb->dict.data_monitor = 
+     ecore_file_monitor_add(buf, _e_kbd_buf_cb_data_dict_change, kb);
+   return kb;
+}
+
+EAPI void
+e_kbd_buf_free(E_Kbd_Buf *kb)
+{
+   e_kbd_buf_clear(kb);
+   e_kbd_buf_layout_clear(kb);
+   e_kbd_buf_lookup_cancel(kb);
+   eina_stringshare_del(kb->sysdicts);
+   if (kb->dict.sys) e_kbd_dict_free(kb->dict.sys);
+   if (kb->dict.personal) e_kbd_dict_free(kb->dict.personal);
+   if (kb->dict.data) e_kbd_dict_free(kb->dict.data);
+   if (kb->dict.data_monitor) ecore_file_monitor_del(kb->dict.data_monitor);
+   if (kb->dict.data_reload_delay) ecore_timer_del(kb->dict.data_reload_delay);
+   free(kb);
+}
+
+EAPI void
+e_kbd_buf_dict_set(E_Kbd_Buf *kb, const char *dict)
+{
+   char buf[PATH_MAX];
+
+   e_kbd_buf_clear(kb);
+
+   if (kb->dict.sys) e_kbd_dict_free(kb->dict.sys);
+
+   e_user_dir_concat_static(buf, "dicts");
+   if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
+
+   e_user_dir_snprintf(buf, sizeof(buf), "dicts/%s", dict);
+   kb->dict.sys = e_kbd_dict_new(buf);
+   if (!kb->dict.sys)
+     {
+	snprintf(buf, sizeof(buf), "%s/dicts/%s", kb->sysdicts, dict);
+	kb->dict.sys = e_kbd_dict_new(buf);
+     }
+}
+
+EAPI void
+e_kbd_buf_clear(E_Kbd_Buf *kb)
+{
+   e_kbd_buf_lookup_cancel(kb);
+   while (kb->keystrokes)
+     {
+	E_Kbd_Buf_Keystroke *ks;
+	
+	ks = kb->keystrokes->data;
+	if (ks->key) eina_stringshare_del(ks->key);
+	_e_kbd_buf_layout_unref(ks->layout);
+	free(ks);
+	kb->keystrokes = eina_list_remove_list(kb->keystrokes, kb->keystrokes);
+     }
+   _e_kbd_buf_string_matches_clear(kb);
+   if (kb->dict.sys) e_kbd_dict_word_letter_clear(kb->dict.sys);
+   if (kb->dict.personal) e_kbd_dict_word_letter_clear(kb->dict.personal);
+   if (kb->dict.data) e_kbd_dict_word_letter_clear(kb->dict.data);
+   _e_kbd_buf_actual_string_clear(kb);
+}
+
+EAPI void
+e_kbd_buf_layout_clear(E_Kbd_Buf *kb)
+{
+   if (kb->layout)
+     {
+	_e_kbd_buf_layout_unref(kb->layout);
+	kb->layout = NULL;
+     }
+}
+
+EAPI void
+e_kbd_buf_layout_size_set(E_Kbd_Buf *kb, int w, int h)
+{
+   if (!kb->layout) kb->layout = _e_kbd_buf_new();
+   if (!kb->layout) return;
+   kb->layout->w = w;
+   kb->layout->h = h;
+}
+
+EAPI void
+e_kbd_buf_layout_fuzz_set(E_Kbd_Buf *kb, int fuzz)
+{
+   if (!kb->layout) kb->layout = _e_kbd_buf_new();
+   if (!kb->layout) return;
+   kb->layout->fuzz = fuzz;
+}
+
+EAPI void
+e_kbd_buf_layout_key_add(E_Kbd_Buf *kb, const char *key,  const char *key_shift, const char *key_capslock, int x, int y, int w, int h)
+{
+   E_Kbd_Buf_Key *ky;
+   
+   if (!key) return;
+   if (!kb->layout) kb->layout = _e_kbd_buf_new();
+   if (!kb->layout) return;
+   ky = E_NEW(E_Kbd_Buf_Key, 1);
+   if (!ky) return;
+   if (key) ky->key = eina_stringshare_add(key);
+   if (key_shift) ky->key_shift = eina_stringshare_add(key_shift);
+   if (key_capslock) ky->key_capslock = eina_stringshare_add(key_capslock);
+   ky->x = x;
+   ky->y = y;
+   ky->w = w;
+   ky->h = h;
+   kb->layout->keys = eina_list_append(kb->layout->keys, ky);
+}
+
+static void
+_e_kbd_buf_keystroke_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
+{
+   const char *str;
+
+   str = _e_kbd_buf_keystroke_string_get(kb, ks);
+   if (str)
+     {
+	if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, 0);
+	if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, 0);
+	if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, 0);
+     }
+}
+
+EAPI void
+e_kbd_buf_pressed_key_add(E_Kbd_Buf *kb, const char *key, int shift, int capslock)
+{
+   E_Kbd_Buf_Keystroke *ks;
+
+   e_kbd_buf_lookup_cancel(kb);
+   if (!key) return;
+   if (!kb->layout) kb->layout = _e_kbd_buf_new();
+   if (!kb->layout) return;
+   ks = E_NEW(E_Kbd_Buf_Keystroke, 1);
+   if (!ks) return;
+   ks->key = eina_stringshare_add(key);
+   if (shift) ks->shift = 1;
+   if (capslock) ks->capslock = 1;
+   ks->layout = kb->layout;
+   _e_kbd_buf_layout_ref(ks->layout);
+   kb->keystrokes = eina_list_append(kb->keystrokes, ks);
+   
+   if (kb->dict.sys) e_kbd_dict_word_letter_advance(kb->dict.sys);
+   if (kb->dict.personal) e_kbd_dict_word_letter_advance(kb->dict.personal);
+   if (kb->dict.data) e_kbd_dict_word_letter_advance(kb->dict.data);
+   _e_kbd_buf_keystroke_add(kb, ks);
+   
+   _e_kbd_buf_actual_string_update(kb);
+   _e_kbd_buf_matches_update(kb);
+}
+
+static void
+_e_kbd_buf_keystroke_point_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
+{
+   Eina_List *l;
+   
+   for (l = ks->layout->keys; l; l = l->next)
+     {
+	E_Kbd_Buf_Key *ky;
+	const char *str;
+	int px, py, dx, dy, d, fuzz;
+	
+	ky = l->data;
+	px = ky->x + (ky->w / 2);
+	py = ky->y + (ky->h / 2);
+	dx = ks->x - px;
+	dy = ks->y - py;
+	d = sqrt((dx * dx) + (dy * dy));
+	if (d <= ks->layout->fuzz)
+	  {
+	     str = _e_kbd_buf_keystroke_key_string_get(kb, ks, ky);
+	     if (str)
+	       {
+		  if (kb->dict.sys) e_kbd_dict_word_letter_add(kb->dict.sys, str, d);
+		  if (kb->dict.personal) e_kbd_dict_word_letter_add(kb->dict.personal, str, d);
+		  if (kb->dict.data) e_kbd_dict_word_letter_add(kb->dict.data, str, d);
+	       }
+	  }
+     }
+}
+
+EAPI void
+e_kbd_buf_pressed_point_add(E_Kbd_Buf *kb, int x, int y, int shift, int capslock)
+{
+   E_Kbd_Buf_Keystroke *ks;
+   
+   e_kbd_buf_lookup_cancel(kb);
+   if (!kb->layout) kb->layout = _e_kbd_buf_new();
+   if (!kb->layout) return;
+   ks = E_NEW(E_Kbd_Buf_Keystroke, 1);
+   if (!ks) return;
+   ks->x = x;
+   ks->y = y;
+   if (shift) ks->shift = 1;
+   if (capslock) ks->capslock = 1;
+   ks->layout = kb->layout;
+   _e_kbd_buf_layout_ref(ks->layout);
+   kb->keystrokes = eina_list_append(kb->keystrokes, ks);
+   
+   if (kb->dict.sys) e_kbd_dict_word_letter_advance(kb->dict.sys);
+   if (kb->dict.personal) e_kbd_dict_word_letter_advance(kb->dict.personal);
+   if (kb->dict.data) e_kbd_dict_word_letter_advance(kb->dict.data);
+   
+   _e_kbd_buf_keystroke_point_add(kb, ks);
+   
+   _e_kbd_buf_actual_string_update(kb);
+   _e_kbd_buf_matches_update(kb);
+}
+
+EAPI const char *
+e_kbd_buf_actual_string_get(E_Kbd_Buf *kb)
+{
+   return kb->actual_string;
+}
+
+EAPI const Eina_List *
+e_kbd_buf_string_matches_get(E_Kbd_Buf *kb)
+{
+   return kb->string_matches;
+}
+
+EAPI void
+e_kbd_buf_backspace(E_Kbd_Buf *kb)
+{
+   Eina_List *l;
+   
+   l = eina_list_last(kb->keystrokes);
+   if (l)
+     {
+	E_Kbd_Buf_Keystroke *ks;
+	
+	ks = l->data;
+	if (ks->key) eina_stringshare_del(ks->key);
+	_e_kbd_buf_layout_unref(ks->layout);
+	free(ks);
+	kb->keystrokes = eina_list_remove_list(kb->keystrokes, l);
+	if (kb->dict.sys) e_kbd_dict_word_letter_delete(kb->dict.sys);
+	if (kb->dict.personal) e_kbd_dict_word_letter_delete(kb->dict.personal);
+	if (kb->dict.data) e_kbd_dict_word_letter_delete(kb->dict.data);
+	_e_kbd_buf_actual_string_update(kb);
+	_e_kbd_buf_matches_update(kb);
+     }
+}
+
+EAPI void
+e_kbd_buf_word_use(E_Kbd_Buf *kb, const char *word)
+{
+   if (kb->dict.personal)
+     e_kbd_dict_word_usage_adjust(kb->dict.personal, word, 1);
+}
+
+// FIXME: just faking delayed lookup with timer
+static int
+_e_kbd_buf_cb_faket(void *data)
+{
+   E_Kbd_Buf *kb;
+   
+   kb = data;
+   kb->lookup.faket = NULL;
+   kb->lookup.func((void *)kb->lookup.data);
+   kb->lookup.func = NULL;
+   kb->lookup.data = NULL;
+   return 0;
+}
+
+EAPI void
+e_kbd_buf_lookup(E_Kbd_Buf *kb, void (*func) (void *data), const void *data)
+{
+   e_kbd_buf_lookup_cancel(kb);
+   
+   kb->lookup.func = func;
+   kb->lookup.data = data;
+
+   // FIXME: just faking delayed lookup with timer
+   kb->lookup.faket = ecore_timer_add(0.1, _e_kbd_buf_cb_faket, kb);
+}
+
+EAPI void
+e_kbd_buf_lookup_cancel(E_Kbd_Buf *kb)
+{
+   // FIXME: just faking delayed lookup with timer
+   if (!kb->lookup.faket) return;
+   ecore_timer_del(kb->lookup.faket);
+   kb->lookup.faket = NULL;
+   
+   kb->lookup.func = NULL;
+   kb->lookup.data = NULL;
+}
diff --git a/src/modules/illume/e_kbd_buf.h b/src/modules/illume-keyboard/e_kbd_buf.h
similarity index 100%
copy from src/modules/illume/e_kbd_buf.h
copy to src/modules/illume-keyboard/e_kbd_buf.h
diff --git a/src/modules/illume-keyboard/e_kbd_dict.c b/src/modules/illume-keyboard/e_kbd_dict.c
new file mode 100644
index 0000000..7ccb84a
--- /dev/null
+++ b/src/modules/illume-keyboard/e_kbd_dict.c
@@ -0,0 +1,862 @@
+#include "e.h"
+#include "e_kbd_dict.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#define MAXLATIN 0x100
+
+static unsigned char _e_kbd_normalise_base[MAXLATIN];
+static unsigned char _e_kbd_normalise_ready = 0;
+
+static void
+_e_kbd_normalise_init(void)
+{
+   int i;
+   const char *table[][2] =
+     {
+	  {"À", "a"},
+	  {"Á", "a"},
+	  {"Â", "a"},
+	  {"Ã", "a"},
+	  {"Ä", "a"},
+	  {"Ã…", "a"},
+	  {"Æ", "a"},
+	  {"Ç", "c"},
+	  {"È", "e"},
+	  {"É", "e"},
+	  {"Ê", "e"},
+	  {"Ë", "e"},
+	  {"Ì", "i"},
+	  {"Í", "i"},
+	  {"ÃŽ", "i"},
+	  {"Ï", "i"},
+	  {"Ð", "d"},
+	  {"Ñ", "n"},
+	  {"Ã’", "o"},
+	  {"Ó", "o"},
+	  {"Ô", "o"},
+	  {"Õ", "o"},
+	  {"Ö", "o"},
+	  {"×", "x"},
+	  {"Ø", "o"},
+	  {"Ù", "u"},
+	  {"Ú", "u"},
+	  {"Û", "u"},
+	  {"Ü", "u"},
+	  {"Ý", "y"},
+	  {"Þ", "p"},
+	  {"ß", "s"},
+	  {"à", "a"},
+	  {"á", "a"},
+	  {"â", "a"},
+	  {"ã", "a"},
+	  {"ä", "a"},
+	  {"Ã¥", "a"},
+	  {"æ", "a"},
+	  {"ç", "c"},
+	  {"è", "e"},
+	  {"é", "e"},
+	  {"ê", "e"},
+	  {"ë", "e"},
+	  {"ì", "i"},
+	  {"í", "i"},
+	  {"î", "i"},
+	  {"ï", "i"},
+	  {"ð", "o"},
+	  {"ñ", "n"},
+	  {"ò", "o"},
+	  {"ó", "o"},
+	  {"ô", "o"},
+	  {"õ", "o"},
+	  {"ö", "o"},
+	  {"ø", "o"},
+	  {"ù", "u"},
+	  {"ú", "u"},
+	  {"û", "u"},
+	  {"ü", "u"},
+	  {"ý", "y"},
+	  {"þ", "p"},
+	  {"ÿ", "y"}
+     }; // 63 items
+
+   if (_e_kbd_normalise_ready) return;
+   _e_kbd_normalise_ready = 1;
+   for (i = 0; i < 128; i++)
+     _e_kbd_normalise_base[i] = tolower(i);
+   for (;i < MAXLATIN; i++)
+     {
+	int glyph, j;
+
+	for (j = 0; j < 63; j++)
+	  {
+	     evas_string_char_next_get(table[j][0], 0, &glyph);
+	     if (glyph == i)
+	       {
+		  _e_kbd_normalise_base[i] = *table[j][1];
+		  break;
+	       }
+	  }
+     }
+}
+
+static int
+_e_kbd_dict_letter_normalise(int glyph)
+{
+   // FIXME: ö -> o, ä -> a, Ó -> o etc. - ie normalise to latin-1
+   if (glyph < MAXLATIN) return _e_kbd_normalise_base[glyph];
+   return tolower(glyph) & 0x7f;
+}
+
+static int
+_e_kbd_dict_normalized_strncmp(const char *a, const char *b, int len)
+{
+   // FIXME: normalise 2 strings and then compare
+   if (len < 0) return strcasecmp(a, b);
+   return strncasecmp(a, b, len);
+}
+
+static int
+_e_kbd_dict_normalized_strcmp(const char *a, const char *b)
+{
+   return _e_kbd_dict_normalized_strncmp(a, b, -1);
+}
+
+static void
+_e_kbd_dict_normalized_strcpy(char *dst, const char *src)
+{
+   const char *p;
+   char *d;
+
+   for (p = src, d = dst; *p; p++, d++)
+     *d = _e_kbd_dict_letter_normalise(*p);
+   *d = 0;
+}
+
+static int
+_e_kbd_dict_matches_loolup_cb_sort(const void *d1, const void *d2)
+{
+   const E_Kbd_Dict_Word *kw1, *kw2;
+
+   kw1 = d1;
+   kw2 = d2;
+   if (kw1->usage < kw2->usage) return 1;
+   else if (kw1->usage > kw2->usage) return -1;
+   return 0;
+}
+
+static int
+_e_kbd_dict_writes_cb_sort(const void *d1, const void *d2)
+{
+   const E_Kbd_Dict_Word *kw1, *kw2;
+
+   kw1 = d1;
+   kw2 = d2;
+   return _e_kbd_dict_normalized_strcmp(kw1->word, kw2->word);
+   return 0;
+}
+
+static const char *
+_e_kbd_dict_line_next(E_Kbd_Dict *kd, const char *p)
+{
+   const char *e, *pp;
+
+   e = kd->file.dict + kd->file.size;
+   for (pp = p; pp < e; pp++)
+     if (*pp == '\n') return pp + 1;
+   return NULL;
+}
+
+static char *
+_e_kbd_dict_line_parse(E_Kbd_Dict *kd, const char *p, int *usage)
+{
+   const char *ps;
+   char *wd = NULL;
+
+   for (ps = p; !isspace(*ps); ps++);
+   wd = malloc(ps - p + 1);
+   if (!wd) return NULL;
+   strncpy(wd, p, ps - p);
+   wd[ps - p] = 0;
+   if (*ps == '\n') *usage = 0;
+   else
+     {
+	ps++;
+	*usage = atoi(ps);
+     }
+   return wd;
+}
+
+static void
+_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd, const char *p, const char *eol, int *glyphs)
+{
+   char *s;
+   int p2;
+
+   s = alloca(eol - p + 1);
+   strncpy(s, p, eol - p);
+   s[eol - p] = 0;
+   p2 = evas_string_char_next_get(s, 0, &(glyphs[0]));
+   if ((p2 > 0) && (glyphs[0] > 0))
+     p2 = evas_string_char_next_get(s, p2, &(glyphs[1]));
+}
+
+static void
+_e_kbd_dict_lookup_build(E_Kbd_Dict *kd)
+{
+   const char *p, *e, *eol;
+   int glyphs[2], pglyphs[2];
+
+   p = kd->file.dict;
+   e = p + kd->file.size;
+   pglyphs[0] = pglyphs[1] = 0;
+   while (p < e)
+     {
+	eol = strchr(p, '\n');
+	if (!eol) break;
+	if (eol > p)
+	  {
+	     glyphs[0] = glyphs[1] = 0;
+	     _e_kbd_dict_lookup_build_line(kd, p, eol, glyphs);
+	     if ((glyphs[1] != pglyphs[1]) || (glyphs[0] != pglyphs[0]))
+	       {
+		  int v1, v2;
+
+		  if (isspace(glyphs[0]))
+		    {
+		       glyphs[0] = 0;
+		       glyphs[1] = 0;
+		    }
+		  else if (isspace(glyphs[1]))
+		    glyphs[1] = 0;
+		  if (glyphs[0] == 0)
+		    {
+		       pglyphs[0] = pglyphs[1] = 0;
+		       p = eol + 1;
+		       continue;
+		    }
+		  v1 = _e_kbd_dict_letter_normalise(glyphs[0]);
+		  v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
+		  if (!kd->lookup.tuples[v1][v2])
+		    kd->lookup.tuples[v1][v2] = p;
+		  pglyphs[0] = v1;
+		  pglyphs[1] = v2;
+	       }
+	  }
+	p = eol + 1;
+     }
+}
+
+static int
+_e_kbd_dict_open(E_Kbd_Dict *kd)
+{
+   struct stat st;
+
+   kd->file.fd = open(kd->file.file, O_RDONLY);
+   if (kd->file.fd < 0) return 0;
+   if (fstat(kd->file.fd, &st) < 0)
+     {
+	close(kd->file.fd);
+	return 0;
+     }
+   kd->file.size = st.st_size;
+   kd->file.dict = mmap(NULL, kd->file.size, PROT_READ, MAP_SHARED,
+			kd->file.fd, 0);
+   if ((kd->file.dict== MAP_FAILED) || (kd->file.dict == NULL))
+     {
+	close(kd->file.fd);
+	return 0;
+     }
+   return 1;
+}
+
+static void
+_e_kbd_dict_close(E_Kbd_Dict *kd)
+{
+   if (kd->file.fd < 0) return;
+   memset(kd->lookup.tuples, 0, sizeof(kd->lookup.tuples));
+   munmap((void *)kd->file.dict, kd->file.size);
+   close(kd->file.fd);
+   kd->file.fd = -1;
+   kd->file.dict = NULL;
+   kd->file.size = 0;
+}
+
+EAPI E_Kbd_Dict *
+e_kbd_dict_new(const char *file)
+{
+   // alloc and load new dict - build quick-lookup table. words MUST be sorted
+   E_Kbd_Dict *kd;
+
+   _e_kbd_normalise_init();
+   kd = E_NEW(E_Kbd_Dict, 1);
+   if (!kd) return NULL;
+   kd->file.file = eina_stringshare_add(file);
+   if (!kd->file.file)
+     {
+	free(kd);
+	return NULL;
+     }
+   kd->file.fd = -1;
+   if (!_e_kbd_dict_open(kd))
+     {
+	eina_stringshare_del(kd->file.file);
+	free(kd);
+	return NULL;
+     }
+   _e_kbd_dict_lookup_build(kd);
+   return kd;
+}
+
+EAPI void
+e_kbd_dict_free(E_Kbd_Dict *kd)
+{
+   // free dict and anything in it
+   e_kbd_dict_word_letter_clear(kd);
+   e_kbd_dict_save(kd);
+   _e_kbd_dict_close(kd);
+   free(kd);
+}
+
+static E_Kbd_Dict_Word *
+_e_kbd_dict_changed_write_find(E_Kbd_Dict *kd, const char *word)
+{
+   Eina_List *l;
+
+   for (l = kd->changed.writes; l; l = l->next)
+     {
+	E_Kbd_Dict_Word *kw;
+
+	kw = l->data;
+	if (!strcmp(kw->word, word)) return kw;
+     }
+   return NULL;
+}
+
+EAPI void
+e_kbd_dict_save(E_Kbd_Dict *kd)
+{
+   FILE *f;
+
+   // save any changes (new words added, usage adjustments).
+   // all words MUST be sorted
+   if (!kd->changed.writes) return;
+   if (kd->changed.flush_timer)
+     {
+	ecore_timer_del(kd->changed.flush_timer);
+	kd->changed.flush_timer = NULL;
+     }
+   ecore_file_unlink(kd->file.file);
+   f = fopen(kd->file.file, "w");
+   kd->changed.writes = eina_list_sort(kd->changed.writes,
+				       eina_list_count(kd->changed.writes),
+				       _e_kbd_dict_writes_cb_sort);
+   if (f)
+     {
+	const char *p, *pn;
+
+	p = kd->file.dict;
+	while (p)
+	  {
+	     char *wd;
+	     int usage = 0;
+
+	     pn = _e_kbd_dict_line_next(kd, p);
+	     if (!pn) return;
+	     wd = _e_kbd_dict_line_parse(kd, p, &usage);
+	     if ((wd) && (strlen(wd) > 0))
+	       {
+		  if (kd->changed.writes)
+		    {
+		       int writeline = 0;
+
+		       while (kd->changed.writes)
+			 {
+			    E_Kbd_Dict_Word *kw;
+			    int cmp;
+
+			    kw = kd->changed.writes->data;
+			    cmp = _e_kbd_dict_normalized_strcmp(kw->word, wd);
+			    if (cmp < 0)
+			      {
+				 fprintf(f, "%s %i\n", kw->word, kw->usage);
+				 writeline = 1;
+				 eina_stringshare_del(kw->word);
+				 free(kw);
+				 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+				 writeline = 1;
+			      }
+			    else if (cmp == 0)
+			      {
+				 fprintf(f, "%s %i\n", wd, kw->usage);
+				 if (!strcmp(kw->word, wd))
+				   writeline = 0;
+				 else
+				   writeline = 1;
+				 eina_stringshare_del(kw->word);
+				 free(kw);
+				 kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+				 break;
+			      }
+			    else if (cmp > 0)
+			      {
+				 writeline = 1;
+				 break;
+			      }
+			 }
+		       if (writeline)
+			 fprintf(f, "%s %i\n", wd, usage);
+		    }
+		  else
+		    fprintf(f, "%s %i\n", wd, usage);
+	       }
+	     if (wd) free(wd);
+	     p = pn;
+	     if (p >= (kd->file.dict + kd->file.size)) break;
+	  }
+	while (kd->changed.writes)
+	  {
+	     E_Kbd_Dict_Word *kw;
+
+	     kw = kd->changed.writes->data;
+	     fprintf(f, "%s %i\n", kw->word, kw->usage);
+	     eina_stringshare_del(kw->word);
+	     free(kw);
+	     kd->changed.writes  = eina_list_remove_list(kd->changed.writes, kd->changed.writes);
+	  }
+	fclose(f);
+     }
+   _e_kbd_dict_close(kd);
+   if (_e_kbd_dict_open(kd)) _e_kbd_dict_lookup_build(kd);
+}
+
+static int
+_e_kbd_dict_cb_save_flush(void *data)
+{
+   E_Kbd_Dict *kd;
+
+   kd = data;
+   if ((kd->matches.list) || (kd->word.letters) || (kd->matches.deadends) ||
+       (kd->matches.leads))
+     return 1;
+   kd->changed.flush_timer = NULL;
+   e_kbd_dict_save(kd);
+   return 0;
+}
+
+static void
+_e_kbd_dict_changed_write_add(E_Kbd_Dict *kd, const char *word, int usage)
+{
+   E_Kbd_Dict_Word *kw;
+
+   kw = E_NEW(E_Kbd_Dict_Word, 1);
+   kw->word = eina_stringshare_add(word);
+   kw->usage = usage;
+   kd->changed.writes = eina_list_prepend(kd->changed.writes, kw);
+   if (eina_list_count(kd->changed.writes) > 64)
+     e_kbd_dict_save(kd);
+   else
+     {
+	if (kd->changed.flush_timer)
+	  ecore_timer_del(kd->changed.flush_timer);
+	kd->changed.flush_timer = 
+          ecore_timer_add(5.0, _e_kbd_dict_cb_save_flush, kd);
+     }
+}
+
+static const char *
+_e_kbd_dict_find_pointer(E_Kbd_Dict *kd, const char *p, int baselen, const char *word)
+{
+   const char *pn;
+   int len;
+
+   if (!p) return NULL;
+   len = strlen(word);
+   while (p)
+     {
+	pn = _e_kbd_dict_line_next(kd, p);
+	if (!pn) return NULL;
+	if ((pn - p) > len)
+	  {
+	     if (!_e_kbd_dict_normalized_strncmp(p, word, len))
+	       return p;
+	  }
+	if (_e_kbd_dict_normalized_strncmp(p, word, baselen))
+	  return NULL;
+	p = pn;
+	if (p >= (kd->file.dict + kd->file.size)) break;
+     }
+   return NULL;
+}
+
+static const char *
+_e_kbd_dict_find(E_Kbd_Dict *kd, const char *word)
+{
+   const char *p;
+   char *tword;
+   int glyphs[2], p2, v1, v2, i;
+
+   /* work backwards in leads. i.e.:
+    * going
+    * goin
+    * goi
+    * go
+    * g
+    */
+   tword = alloca(strlen(word) + 1);
+   _e_kbd_dict_normalized_strcpy(tword, word);
+   p = eina_hash_find(kd->matches.leads, tword);
+   if (p) return p;
+   p2 = strlen(tword);
+   while (tword[0])
+     {
+	p2 = evas_string_char_prev_get(tword, p2, &i);
+	if (p2 < 0) break;
+	tword[p2] = 0;
+	p = eina_hash_find(kd->matches.leads, tword);
+	if (p)
+	  return _e_kbd_dict_find_pointer(kd, p, p2, word);
+     }
+   /* looking at leads going back letters didn't work */
+   p = kd->file.dict;
+   if ((p[0] == '\n') && (kd->file.size <= 1)) return NULL;
+   glyphs[0] = glyphs[1] = 0;
+   p2 = evas_string_char_next_get(word, 0, &(glyphs[0]));
+   if ((p2 > 0) && (glyphs[0] > 0))
+     p2 = evas_string_char_next_get(word, p2, &(glyphs[1]));
+   v1 = _e_kbd_dict_letter_normalise(glyphs[0]);
+   if (glyphs[1] != 0)
+     {
+	v2 = _e_kbd_dict_letter_normalise(glyphs[1]);
+	p = kd->lookup.tuples[v1][v2];
+     }
+   else
+     {
+	for (i = 0; i < 128; i++)
+	  {
+	     p = kd->lookup.tuples[v1][i];
+	     if (p) break;
+	  }
+     }
+   return _e_kbd_dict_find_pointer(kd, p, p2, word);
+}
+
+static const char *
+_e_kbd_dict_find_full(E_Kbd_Dict *kd, const char *word)
+{
+   const char *p;
+   int len;
+
+   p = _e_kbd_dict_find(kd, word);
+   if (!p) return NULL;
+   len = strlen(word);
+   if (isspace(p[len])) return p;
+   return NULL;
+}
+
+EAPI void
+e_kbd_dict_word_usage_adjust(E_Kbd_Dict *kd, const char *word, int adjust)
+{
+   // add "adjust" to word usage count
+   E_Kbd_Dict_Word *kw;
+
+   kw = _e_kbd_dict_changed_write_find(kd, word);
+   if (kw)
+     {
+	kw->usage += adjust;
+	if (kd->changed.flush_timer)
+	  ecore_timer_del(kd->changed.flush_timer);
+	kd->changed.flush_timer = ecore_timer_add(5.0, _e_kbd_dict_cb_save_flush, kd);
+     }
+   else
+     {
+	const char *line;
+	int usage = 0;
+
+	line = _e_kbd_dict_find_full(kd, word);
+	if (line)
+	  {
+	     char *wd;
+
+	     // FIXME: we need to find an EXACT line match - case and all
+	     wd = _e_kbd_dict_line_parse(kd, line, &usage);
+	     if (wd) free(wd);
+	  }
+	usage += adjust;
+	_e_kbd_dict_changed_write_add(kd, word, usage);
+     }
+}
+
+EAPI void
+e_kbd_dict_word_delete(E_Kbd_Dict *kd, const char *word)
+{
+   // delete a word from the dictionary
+   E_Kbd_Dict_Word *kw;
+
+   kw = _e_kbd_dict_changed_write_find(kd, word);
+   if (kw)
+     kw->usage = -1;
+   else
+     {
+	if (_e_kbd_dict_find_full(kd, word))
+	  _e_kbd_dict_changed_write_add(kd, word, -1);
+     }
+}
+
+EAPI void
+e_kbd_dict_word_letter_clear(E_Kbd_Dict *kd)
+{
+   // clear the current word buffer
+   while (kd->word.letters)
+     e_kbd_dict_word_letter_delete(kd);
+   if (kd->matches.deadends)
+     {
+	eina_hash_free(kd->matches.deadends);
+	kd->matches.deadends = NULL;
+     }
+   if (kd->matches.leads)
+     {
+	eina_hash_free(kd->matches.leads);
+	kd->matches.leads = NULL;
+     }
+   while (kd->matches.list)
+     {
+	E_Kbd_Dict_Word *kw;
+
+	kw = kd->matches.list->data;
+	eina_stringshare_del(kw->word);
+	free(kw);
+	kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
+    }
+}
+
+EAPI void
+e_kbd_dict_word_letter_add(E_Kbd_Dict *kd, const char *letter, int dist)
+{
+   // add a letter with a distance (0 == closest) as an option for the current
+   // letter position - advance starts a new letter position
+   Eina_List *l, *list;
+   E_Kbd_Dict_Letter *kl;
+
+   l = eina_list_last(kd->word.letters);
+   if (!l) return;
+   list = l->data;
+   kl = E_NEW(E_Kbd_Dict_Letter, 1);
+   if (!kl) return;
+   kl->letter = eina_stringshare_add(letter);
+   kl->dist = dist;
+   list = eina_list_append(list, kl);
+   l->data = list;
+}
+
+EAPI void
+e_kbd_dict_word_letter_advance(E_Kbd_Dict *kd)
+{
+   // start a new letter in the word
+   kd->word.letters = eina_list_append(kd->word.letters, NULL);
+}
+
+EAPI void
+e_kbd_dict_word_letter_delete(E_Kbd_Dict *kd)
+{
+   // delete the current letter completely
+   Eina_List *l, *list;
+
+   l = eina_list_last(kd->word.letters);
+   if (!l) return;
+   list = l->data;
+   while (list)
+     {
+	E_Kbd_Dict_Letter *kl;
+
+	kl = list->data;
+	eina_stringshare_del(kl->letter);
+	free(kl);
+	list = eina_list_remove_list(list, list);
+     }
+   kd->word.letters = eina_list_remove_list(kd->word.letters, l);
+}
+
+static void
+_e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
+				Eina_List *more)
+{
+   Eina_List *l, *l2, *list;
+   const char *p, *pn;
+   char *base, *buf, *wd, *bufapp;
+   E_Kbd_Dict_Letter *kl;
+   int len = 0, dist = 0, d, baselen, maxdist = 0, md;
+   static int level = 0, lv;
+
+   level++;
+   for (l = word; l; l = l->next)
+     {
+	kl = l->data;
+	len += strlen(kl->letter);
+	dist += kl->dist;
+	if (kl->dist > maxdist) maxdist = kl->dist;
+     }
+   if (maxdist < 1) maxdist = 1;
+   buf = alloca(len + 20); // 20 - just padding enough for 1 more utf8 char
+   base = alloca(len + 20);
+   base[0] = 0;
+   for (l = word; l; l = l->next)
+     {
+	kl = l->data;
+	strcat(base, kl->letter);
+     }
+   baselen = strlen(base);
+   strcpy(buf, base);
+   bufapp = buf + baselen;
+   list = more->data;
+   for (l = list; l; l = l->next)
+     {
+	kl = l->data;
+	if (kl->dist > maxdist) maxdist = kl->dist;
+     }
+   for (l = list; l; l = l->next)
+     {
+	kl = l->data;
+	strcpy(bufapp, kl->letter);
+	if ((kd->matches.deadends) && eina_hash_find(kd->matches.deadends, buf))
+	  continue;
+	p = eina_hash_find(kd->matches.leads, buf);
+	if (p) p = _e_kbd_dict_find_pointer(kd, p, baselen, buf);
+	else p = _e_kbd_dict_find(kd, buf);
+	if (!p)
+	  {
+	     if (!kd->matches.deadends)
+	       kd->matches.deadends = eina_hash_string_superfast_new(NULL);
+	     eina_hash_add(kd->matches.deadends, buf, kd);
+	     continue;
+	  }
+	else
+	  {
+	     if (!kd->matches.leads)
+	       kd->matches.leads = eina_hash_string_superfast_new(NULL);
+	     eina_hash_add(kd->matches.leads, buf, p);
+	  }
+	if ((!more->next) || (!more->next->data))
+	  {
+	     d = dist + kl->dist;
+	     md = maxdist;
+	     for (;;)
+	       {
+		  E_Kbd_Dict_Word *kw;
+		  int usage = 0;
+
+		  wd = _e_kbd_dict_line_parse(kd, p, &usage);
+		  if (!wd) break;
+		  if (_e_kbd_dict_normalized_strcmp(wd, buf))
+		    {
+		       free(wd);
+		       break;
+		    }
+		  kw = E_NEW(E_Kbd_Dict_Word, 1);
+		  if (kw)
+		    {
+		       int accuracy;
+		       int w, b, w2, b2, wc, bc, upper;
+
+		       // match any capitalisation
+		       for (w = 0, b = 0; wd[w] && buf[b];)
+			 {
+			    b2 = evas_string_char_next_get(buf, b, &bc);
+			    w2 = evas_string_char_next_get(wd, w, &wc);
+			    if (isupper(bc)) wd[w] = toupper(wc);
+			    w = w2;
+			    b = b2;
+			 }
+		       kw->word = eina_stringshare_add(wd);
+		       // FIXME: magic combination of distance metric and
+		       // frequency of useage. this is simple now, but could
+		       // be tweaked
+		       wc = eina_list_count(word);
+		       if (md < 1) md = 1;
+
+		       // basically a metric to see how far away teh keys that
+		       // were actually pressed are away from the letters of
+		       // this word in a physical on-screen sense
+		       accuracy = md - (d / (wc + 1));
+		       // usage is the frequency of usage in the dictionary.
+		       // it its < 1 time, it's assumed to be 1.
+		       if (usage < 1) usage = 1;
+		       // multiply usage by a factor of 100 for better detailed
+		       // sorting. 10 == 1/10th factor
+		       usage = 100 + ((usage - 1) * 10);
+		       // and well just multiply and lets see. maybe this can
+		       // do with multiplication factors etc. but simple for
+		       // now.
+		       kw->usage = (usage * accuracy) / md;
+		       kd->matches.list = eina_list_append(kd->matches.list, kw);
+		    }
+		  free(wd);
+		  p = _e_kbd_dict_line_next(kd, p);
+		  if (p >= (kd->file.dict + kd->file.size)) break;
+		  if (!p) break;
+	       }
+	  }
+	else
+	  {
+	     word = eina_list_append(word, kl);
+	     _e_kbd_dict_matches_lookup_iter(kd, word, more->next);
+	     word = eina_list_remove_list(word, eina_list_last(word));
+	  }
+     }
+   level--;
+}
+
+EAPI void
+e_kbd_dict_matches_lookup(E_Kbd_Dict *kd)
+{
+   // find all matches and sort them
+   while (kd->matches.list)
+     {
+	E_Kbd_Dict_Word *kw;
+
+	kw = kd->matches.list->data;
+	eina_stringshare_del(kw->word);
+	free(kw);
+	kd->matches.list = eina_list_remove_list(kd->matches.list, kd->matches.list);
+    }
+   if (kd->word.letters)
+     _e_kbd_dict_matches_lookup_iter(kd, NULL, kd->word.letters);
+   kd->matches.list = eina_list_sort(kd->matches.list,
+				     eina_list_count(kd->matches.list),
+				     _e_kbd_dict_matches_loolup_cb_sort);
+}
+
+EAPI void
+e_kbd_dict_matches_first(E_Kbd_Dict *kd)
+{
+   // jump to first match
+   kd->matches.list_ptr = kd->matches.list;
+}
+
+EAPI void
+e_kbd_dict_matches_next(E_Kbd_Dict *kd)
+{
+   // jump to next match
+   kd->matches.list_ptr = kd->matches.list_ptr->next;
+}
+
+EAPI const char *
+e_kbd_dict_matches_match_get(E_Kbd_Dict *kd, int *pri_ret)
+{
+   // return the word (string utf-8) for the current match
+   if (kd->matches.list_ptr)
+     {
+	E_Kbd_Dict_Word *kw;
+
+	kw = kd->matches.list_ptr->data;
+	if (kw)
+	  {
+	     *pri_ret = kw->usage;
+	     return kw->word;
+	  }
+     }
+   return NULL;
+}
diff --git a/src/modules/illume/e_kbd_dict.h b/src/modules/illume-keyboard/e_kbd_dict.h
similarity index 100%
copy from src/modules/illume/e_kbd_dict.h
copy to src/modules/illume-keyboard/e_kbd_dict.h
diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c
new file mode 100644
index 0000000..8f6a87e
--- /dev/null
+++ b/src/modules/illume-keyboard/e_kbd_int.c
@@ -0,0 +1,1841 @@
+#include "e.h"
+#include "e_kbd_buf.h"
+#include "e_kbd_int.h"
+#include "e_kbd_send.h"
+#include "e_mod_config.h"
+
+enum 
+{
+   NORMAL = 0,
+   SHIFT = (1 << 0),
+   CAPSLOCK = (1 << 1),
+   CTRL = (1 << 2),
+   ALT = (1 << 3)
+};
+
+static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
+
+static void _e_kbd_int_layout_next(E_Kbd_Int *ki);
+static void _e_kbd_int_zoomkey_down(E_Kbd_Int *ki);
+static void _e_kbd_int_matches_update(void *data);
+static void _e_kbd_int_dictlist_down(E_Kbd_Int *ki);
+static void _e_kbd_int_matchlist_down(E_Kbd_Int *ki);
+static void _e_kbd_int_layoutlist_down(E_Kbd_Int *ki);
+
+static void
+_e_kbd_int_cb_resize(E_Win *win)
+{
+   E_Kbd_Int *ki;
+   
+   ki = win->data;
+   evas_object_resize(ki->base_obj, ki->win->w, ki->win->h);
+   _e_kbd_int_zoomkey_down(ki);
+   _e_kbd_int_dictlist_down(ki);
+   _e_kbd_int_matchlist_down(ki);
+   _e_kbd_int_layoutlist_down(ki);
+}
+
+static const char *
+_e_kbd_int_str_unquote(const char *str)
+{
+   static char buf[256];
+   char *p;
+   
+   snprintf(buf, sizeof(buf), "%s", str + 1);
+   p = strrchr(buf, '"');
+   if (p) *p = 0;
+   return buf;
+}
+
+static E_Kbd_Int_Key *
+_e_kbd_int_at_coord_get(E_Kbd_Int *ki, Evas_Coord x, Evas_Coord y)
+{
+   Eina_List *l;
+   Evas_Coord dist;
+   E_Kbd_Int_Key *ky;  
+   E_Kbd_Int_Key *closest_ky = NULL;
+
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     if ((x >= ky->x) && (y >= ky->y) &&
+         (x < (ky->x + ky->w)) && (y < (ky->y + ky->h)))
+       return ky;
+   dist = 0x7fffffff;
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     {
+	Evas_Coord dx, dy;
+
+	dx = x - (ky->x + (ky->w / 2));
+	dy = y - (ky->y + (ky->h / 2));
+	dx = (dx * dx) + (dy * dy);
+	if (dx < dist)
+	  {
+	     dist = dx;
+	     closest_ky = ky;
+	  }
+     }
+   return closest_ky;
+}
+
+static E_Kbd_Int_Key_State *
+_e_kbd_int_key_state_get(E_Kbd_Int *ki, E_Kbd_Int_Key *ky)
+{
+   E_Kbd_Int_Key_State *found = NULL;
+   E_Kbd_Int_Key_State *st;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(ky->states, l, st)
+     {
+	if (st->state & ki->layout.state) return st;
+	if (!found && st->state == NORMAL) found = st;
+     }
+   return found;
+}
+
+static void
+_e_kbd_int_layout_buf_update(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Key *ky;
+   Eina_List *l, *l2;
+
+   e_kbd_buf_layout_clear(ki->kbuf);
+   e_kbd_buf_layout_size_set(ki->kbuf, ki->layout.w, ki->layout.h);
+   e_kbd_buf_layout_fuzz_set(ki->kbuf, ki->layout.fuzz);
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     {
+	E_Kbd_Int_Key_State *st;
+	const char *out, *out_shift, *out_capslock;
+
+	out = NULL;
+	out_shift = NULL;
+	out_capslock = NULL;
+
+	EINA_LIST_FOREACH(ky->states, l2, st)
+	  {
+	     if (st->state == NORMAL)
+	       out = st->out;
+	     else if (st->state == SHIFT)
+	       out_shift = st->out;
+	     else if (st->state == CAPSLOCK)
+	       out_capslock = st->out;
+	  }
+	if (out)
+	  {
+	     char *s1 = NULL, *s2 = NULL, *s3 = NULL;
+
+	     if ((out) && (out[0] == '"')) 
+	       s1 = strdup(_e_kbd_int_str_unquote(out));
+	     if ((out_shift) && (out_shift[0] == '"')) 
+	       s2 = strdup(_e_kbd_int_str_unquote(out_shift));
+	     if ((out_capslock) && (out_capslock[0] == '"')) 
+	       s3 = strdup(_e_kbd_int_str_unquote(out_capslock));
+	     e_kbd_buf_layout_key_add(ki->kbuf, s1, s2, s3, 
+				      ky->x, ky->y, ky->w, ky->h);
+	     if (s1) free(s1);
+	     if (s2) free(s2);
+	     if (s3) free(s3);
+	  }
+     }
+}
+
+static void
+_e_kbd_int_layout_state_update(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Key *ky;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     {
+	E_Kbd_Int_Key_State *st;
+	int selected;
+
+	st = _e_kbd_int_key_state_get(ki, ky);
+	if (st)
+	  {
+	     if (st->label)
+	       edje_object_part_text_set(ky->obj, "e.text.label", st->label);
+	     else
+	       edje_object_part_text_set(ky->obj, "e.text.label", "");
+	     if (st->icon)
+	       {
+		  char buf[PATH_MAX];
+		  char *p;
+
+		  snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, st->icon);
+		  p = strrchr(st->icon, '.');
+		  if (!strcmp(p, ".edj"))
+		    e_icon_file_edje_set(ky->icon_obj, buf, "icon");
+		  else
+		    e_icon_file_set(ky->icon_obj, buf);
+	       }
+	     else
+	       e_icon_file_set(ky->icon_obj, NULL);
+	  }
+	selected = 0;
+	if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
+	if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
+	if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
+	if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
+	if (selected)
+	  {
+	     if (!ky->selected)
+	       {
+		  edje_object_signal_emit(ky->obj, "e,state,selected", "e");
+		  ky->selected = 1;
+	       }
+	  }
+	if (!selected)
+	  {
+	     if (ky->selected)
+	       {
+		  edje_object_signal_emit(ky->obj, "e,state,unselected", "e");
+		  ky->selected = 0;
+	       }
+	  }
+     }
+}
+
+static void
+_e_kbd_int_string_send(E_Kbd_Int *ki, const char *str)
+{
+   int pos, newpos, glyph;
+
+   pos = 0;
+   e_kbd_buf_word_use(ki->kbuf, str);
+   for (;;)
+     {
+	char buf[16];
+
+	newpos = evas_string_char_next_get(str, pos, &glyph);
+	if (glyph <= 0) return;
+	strncpy(buf, str + pos, newpos - pos);
+	buf[newpos - pos] = 0;
+	e_kbd_send_string_press(buf, 0);
+	pos = newpos;
+     }
+}
+
+static void
+_e_kbd_int_buf_send(E_Kbd_Int *ki)
+{
+   const char *str = NULL;
+   const Eina_List *matches;
+
+   matches = e_kbd_buf_string_matches_get(ki->kbuf);
+   if (matches) str = matches->data;
+   else str = e_kbd_buf_actual_string_get(ki->kbuf);
+   if (str) _e_kbd_int_string_send(ki, str);
+}
+
+
+static void
+_e_kbd_int_cb_match_select(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Kbd_Int_Match *km;
+
+   km = data;
+   _e_kbd_int_string_send(km->ki, km->str);
+   e_kbd_buf_clear(km->ki->kbuf);
+   e_kbd_send_keysym_press("space", 0);
+   if (km->ki->layout.state & (SHIFT | CTRL | ALT))
+     {
+	km->ki->layout.state &= (~(SHIFT | CTRL | ALT));
+	_e_kbd_int_layout_state_update(km->ki);
+     }
+   _e_kbd_int_matches_update(km->ki);
+}
+
+static void
+_e_kbd_int_matches_add(E_Kbd_Int *ki, const char *str, int num)
+{
+   E_Kbd_Int_Match *km;
+   Evas_Object *o;
+   Evas_Coord mw, mh;
+
+   km = E_NEW(E_Kbd_Int_Match, 1);
+   if (!km) return;
+   o = _theme_obj_new(ki->win->evas, ki->themedir,
+		      "e/modules/kbd/match/word");
+   km->ki = ki;
+   km->str = eina_stringshare_add(str);
+   km->obj = o;
+   ki->matches = eina_list_append(ki->matches, km);
+   edje_object_part_text_set(o, "e.text.label", str);
+   edje_object_size_min_calc(o, &mw, &mh);
+   if (mw < 32) mw = 32;
+   if (num & 0x1) e_box_pack_start(ki->box_obj, o);
+   else e_box_pack_end(ki->box_obj, o);
+   e_box_pack_options_set(o, 1, 1, 1, 1, 0.5, 0.5, mw, mh, 9999, 9999);
+   if (num == 0)
+     edje_object_signal_emit(o, "e,state,selected", "e");
+   edje_object_signal_callback_add(o, "e,action,do,select", "",
+				   _e_kbd_int_cb_match_select, km);
+   evas_object_show(o);
+}
+
+static void
+_e_kbd_int_matches_free(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Match *km;
+
+   EINA_LIST_FREE(ki->matches, km)
+     {
+	if (km->str) eina_stringshare_del(km->str);
+	evas_object_del(km->obj);
+	free(km);
+     }
+}
+
+static void
+_e_kbd_int_matches_update(void *data)
+{
+   E_Kbd_Int *ki;
+   const Eina_List *l, *matches;
+   const char *actual;
+   Evas_Coord mw, mh, vw, vh;
+
+   if (!(ki = data)) return;
+   evas_event_freeze(ki->win->evas);
+   e_box_freeze(ki->box_obj);
+   _e_kbd_int_matches_free(ki);
+   matches = e_kbd_buf_string_matches_get(ki->kbuf);
+   if (!matches)
+     {
+	actual = e_kbd_buf_actual_string_get(ki->kbuf);
+	if (actual) _e_kbd_int_matches_add(ki, actual, 0);
+     }
+   else
+     {
+	int i = 0;
+
+	for (i = 0, l = matches; l; l = l->next, i++)
+	  {
+	     _e_kbd_int_matches_add(ki, l->data, i);
+	     e_box_size_min_get(ki->box_obj, &mw, &mh);
+	     edje_object_part_geometry_get(ki->base_obj, "e.swallow.label", 
+					   NULL, NULL, &vw, &vh);
+	     if (mw > vw) break;
+	  }
+
+	if (!l)
+	  {
+	     actual = e_kbd_buf_actual_string_get(ki->kbuf);
+	     if (actual)
+	       {
+		  const char *str;
+
+		  EINA_LIST_FOREACH(matches, l, str)
+		    if (!strcmp(str, actual)) break;
+		  if (!l) _e_kbd_int_matches_add(ki, actual, i);
+	       }
+	  }
+     }
+   e_box_thaw(ki->box_obj);
+   e_box_size_min_get(ki->box_obj, &mw, &mh);
+   edje_extern_object_min_size_set(ki->box_obj, 0, mh);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.label", ki->box_obj);
+   evas_event_thaw(ki->win->evas);
+
+   _e_kbd_int_matchlist_down(ki);
+}
+
+static void
+_e_kbd_int_key_press_handle(E_Kbd_Int *ki, Evas_Coord dx, Evas_Coord dy)
+{
+   E_Kbd_Int_Key *ky;
+   E_Kbd_Int_Key_State *st;
+   const char *out = NULL;
+
+   ky = _e_kbd_int_at_coord_get(ki, dx, dy);
+   if (!ky) return;
+
+   if (ky->is_shift)
+     {
+	if (ki->layout.state & SHIFT) ki->layout.state &= (~(SHIFT));
+	else ki->layout.state |= SHIFT;
+	_e_kbd_int_layout_state_update(ki);
+	return;
+     }
+   if (ky->is_ctrl)
+     {
+	if (ki->layout.state & CTRL) ki->layout.state &= (~(CTRL));
+	else ki->layout.state |= CTRL;
+	if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+	e_kbd_buf_clear(ki->kbuf);
+	_e_kbd_int_layout_state_update(ki);
+	_e_kbd_int_matches_update(ki);
+	return;
+     }
+   if (ky->is_alt)
+     {
+	if (ki->layout.state & ALT) ki->layout.state &= (~(ALT));
+	else ki->layout.state |= ALT;
+	if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+	e_kbd_buf_clear(ki->kbuf);
+	_e_kbd_int_layout_state_update(ki);
+	_e_kbd_int_matches_update(ki);
+	return;
+     }
+   if (ky->is_capslock)
+     {
+	if (ki->layout.state & CAPSLOCK) ki->layout.state &= (~CAPSLOCK);
+	else ki->layout.state |= CAPSLOCK;
+	_e_kbd_int_layout_state_update(ki);
+	return;
+     }
+   st = _e_kbd_int_key_state_get(ki, ky);
+   if (st) out = st->out;
+   if (ki->layout.state & (CTRL | ALT))
+     {
+	if (out)
+	  {
+	     Kbd_Mod mods = 0;
+
+	     if (ki->layout.state & CTRL) mods |= KBD_MOD_CTRL;
+	     if (ki->layout.state & ALT) mods |= KBD_MOD_ALT;
+	     if (out[0] == '"')
+               e_kbd_send_string_press(_e_kbd_int_str_unquote(out), mods);
+	     else
+	       e_kbd_send_keysym_press(out, mods);
+	  }
+	ki->layout.state &= (~(SHIFT | CTRL | ALT));
+	_e_kbd_int_layout_state_update(ki);
+	e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+	return;
+     }
+   if (out)
+     {
+	if (out[0] == '"')
+	  {
+	     if (ki->down.zoom)
+	       e_kbd_buf_pressed_key_add(ki->kbuf,
+					 _e_kbd_int_str_unquote(out), 
+					 ki->layout.state & SHIFT, 
+					 ki->layout.state & CAPSLOCK);
+	     else
+	       e_kbd_buf_pressed_point_add(ki->kbuf, dx, dy, 
+					   ki->layout.state & SHIFT, 
+					   ki->layout.state & CAPSLOCK);
+	     e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+	  }
+	else
+	  {
+	     if (e_kbd_buf_actual_string_get(ki->kbuf)) 
+               _e_kbd_int_buf_send(ki);
+	     e_kbd_buf_clear(ki->kbuf);
+	     e_kbd_send_keysym_press(out, 0);
+	     _e_kbd_int_matches_update(ki);
+	  }
+     }
+   if (ki->layout.state & (SHIFT | CTRL | ALT))
+     {
+	ki->layout.state &= (~(SHIFT | CTRL | ALT));
+	_e_kbd_int_layout_state_update(ki);
+     }
+}
+    
+static void
+_e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir)
+{
+   if (dir == 4) // up
+     _e_kbd_int_layout_next(ki);
+   else if (dir == 3) // left
+     {
+	if (e_kbd_buf_actual_string_get(ki->kbuf))
+	  {
+	     e_kbd_buf_backspace(ki->kbuf);
+	     e_kbd_buf_lookup(ki->kbuf, _e_kbd_int_matches_update, ki);
+	  }
+	else
+	  e_kbd_send_keysym_press("BackSpace", 0);
+     }
+   else if (dir == 2) // down
+     {
+	if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+	e_kbd_buf_clear(ki->kbuf);
+	e_kbd_send_keysym_press("Return", 0);
+	_e_kbd_int_matches_update(ki);
+     }
+   else if (dir == 1) // right
+     {
+	if (e_kbd_buf_actual_string_get(ki->kbuf)) _e_kbd_int_buf_send(ki);
+	e_kbd_buf_clear(ki->kbuf);
+	e_kbd_send_keysym_press("space", 0);
+	_e_kbd_int_matches_update(ki);
+     }
+   if (ki->layout.state)
+     {
+	ki->layout.state = 0;
+	_e_kbd_int_layout_state_update(ki);
+     }
+}
+    
+static void
+_e_kbd_int_zoomkey_down(E_Kbd_Int *ki)
+{
+   const Eina_List *l;
+
+   if (!ki->zoomkey.popup) return;
+   e_object_del(E_OBJECT(ki->zoomkey.popup));
+   ki->zoomkey.popup = NULL;
+   ki->zoomkey.layout_obj = NULL;
+   ki->zoomkey.sublayout_obj = NULL;
+   for (l = ki->layout.keys; l; l = l->next)
+     {
+        E_Kbd_Int_Key *ky;
+
+	ky = l->data;
+	ky->zoom_obj = NULL;
+	ky->zoom_icon_obj = NULL;
+     }
+}
+
+static void
+_e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
+{
+   const Eina_List *l;
+   Evas_Object *o, *o2;
+   Evas_Coord w, h, mw, mh, vw, vh;
+   int sx, sy, sw, sh;
+
+   if (ki->zoomkey.popup) return;
+   ki->zoomkey.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
+   e_popup_layer_set(ki->zoomkey.popup, 190);
+
+   o = _theme_obj_new(ki->zoomkey.popup->evas, ki->themedir,
+		      "e/modules/kbd/zoom/default");
+   ki->zoomkey.base_obj = o;
+
+   o = e_layout_add(ki->zoomkey.popup->evas);
+   e_layout_virtual_size_set(o, 100, 100);
+   edje_object_part_swallow(ki->zoomkey.base_obj, "e.swallow.content", o);
+   evas_object_show(o);
+   ki->zoomkey.layout_obj = o;
+
+   e_layout_virtual_size_get(ki->layout_obj, &vw, &vh);
+
+   o = e_layout_add(ki->zoomkey.popup->evas);
+   e_layout_virtual_size_set(o, vw, vh);
+   e_layout_pack(ki->zoomkey.layout_obj, o);
+   e_layout_child_move(o, 0, 0);
+   // FIXME dimension * 4 is a magic number - make config
+   e_layout_child_resize(o, vw * 4, vh * 4);
+   evas_object_show(o);
+   ki->zoomkey.sublayout_obj = o;
+
+   for (l = ki->layout.keys; l; l = l->next)
+     {
+	E_Kbd_Int_Key *ky;
+	E_Kbd_Int_Key_State *st;
+	const char *label, *icon;
+	int selected;
+
+	ky = l->data;
+	o = _theme_obj_new(ki->zoomkey.popup->evas, ki->themedir,
+			   "e/modules/kbd/zoomkey/default");
+	label = "";
+	icon = NULL;
+	st = _e_kbd_int_key_state_get(ki, ky);
+	if (st)
+	  {
+	     label = st->label;
+	     icon = st->icon;
+	  }
+
+	edje_object_part_text_set(o, "e.text.label", label);
+
+	o2 = e_icon_add(ki->zoomkey.popup->evas);
+	e_icon_fill_inside_set(o2, 1);
+//	e_icon_scale_up_set(o2, 0);
+	edje_object_part_swallow(o, "e.swallow.content", o2);
+	evas_object_show(o2);
+
+	if (icon)
+	  {
+	     char buf[PATH_MAX];
+	     char *p;
+
+	     snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
+	     p = strrchr(icon, '.');
+	     if (!strcmp(p, ".edj"))
+	       e_icon_file_edje_set(o2, buf, "icon");
+	     else
+	       e_icon_file_set(o2, buf);
+	  }
+	selected = 0;
+	if ((ki->layout.state & SHIFT) && (ky->is_shift)) selected = 1;
+	if ((ki->layout.state & CTRL) && (ky->is_ctrl)) selected = 1;
+	if ((ki->layout.state & ALT) && (ky->is_alt)) selected = 1;
+	if ((ki->layout.state & CAPSLOCK) && (ky->is_capslock)) selected = 1;
+	if (selected)
+	  edje_object_signal_emit(o, "e,state,selected", "e");
+	if (!selected)
+	  edje_object_signal_emit(o, "e,state,unselected", "e");
+	e_layout_pack(ki->zoomkey.sublayout_obj, o);
+	e_layout_child_move(o, ky->x, ky->y);
+	e_layout_child_resize(o, ky->w, ky->h);
+	evas_object_show(o);
+	ky->zoom_obj = o;
+	ky->zoom_icon_obj = o2;
+     }
+
+   edje_object_size_min_calc(ki->zoomkey.base_obj, &vw, &vh);
+   e_zone_useful_geometry_get(ki->win->border->zone, &sx, &sy, &sw, &sh);
+   sh -= ki->win->h;
+   mw = sw;
+   if ((vw > 0) && (mw > vw)) mw = vw;
+   mh = sh;
+   if ((vh > 0) && (mh > vh)) mh = vh;
+
+   e_popup_move_resize(ki->zoomkey.popup, 
+		       sx + ((sw - mw) / 2), sy + ((sh - mh) / 2), mw, mh);
+   evas_object_resize(ki->zoomkey.base_obj,
+		      ki->zoomkey.popup->w, ki->zoomkey.popup->h);
+   evas_object_show(ki->zoomkey.base_obj);
+   e_popup_edje_bg_object_set(ki->zoomkey.popup, ki->zoomkey.base_obj);
+   e_popup_show(ki->zoomkey.popup);
+}
+
+static void
+_e_kbd_int_zoomkey_update(E_Kbd_Int *ki)
+{
+   Evas_Coord w, h, ww, hh;
+   E_Kbd_Int_Key *ky;
+
+   evas_object_geometry_get(ki->zoomkey.layout_obj, NULL, NULL, &w, &h);
+   evas_object_geometry_get(ki->layout_obj, NULL, NULL, &ww, &hh);
+   e_layout_virtual_size_set(ki->zoomkey.layout_obj, w, h);
+   // FIXME dimension * 4 is a magic number - make config
+   e_layout_child_resize(ki->zoomkey.sublayout_obj, ww * 4, hh * 4);
+   e_layout_child_move(ki->zoomkey.sublayout_obj, 
+		       (w / 2) - (ki->down.cx * 4), 
+		       (h / 2) - (ki->down.cy * 4));
+   ky = _e_kbd_int_at_coord_get(ki, ki->down.clx, ki->down.cly);
+   if (ky != ki->zoomkey.pressed)
+     {
+	if (ki->zoomkey.pressed)
+	  {
+	     ki->zoomkey.pressed->pressed = 0;
+	     edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
+				     "e,state,released", "e");
+	     edje_object_signal_emit(ki->zoomkey.pressed->obj,
+				     "e,state,released", "e");
+	  }
+	ki->zoomkey.pressed = ky;
+	if (ki->zoomkey.pressed)
+	  {
+	     ki->zoomkey.pressed->pressed = 1;
+	     e_layout_child_raise(ki->zoomkey.pressed->zoom_obj);
+	     edje_object_signal_emit(ki->zoomkey.pressed->zoom_obj,
+				     "e,state,pressed", "e");
+	     e_layout_child_raise(ki->zoomkey.pressed->obj);
+	     e_layout_child_raise(ki->event_obj);
+	     edje_object_signal_emit(ki->zoomkey.pressed->obj,
+				     "e,state,pressed", "e");
+	  }
+     }
+}
+
+static int
+_e_kbd_int_cb_hold_timeout(void *data)
+{
+   E_Kbd_Int *ki;
+
+   ki = data;
+   ki->down.hold_timer = NULL;
+   ki->down.zoom = 1;
+   if (ki->layout.pressed)
+     {
+	ki->layout.pressed->pressed = 0;
+	edje_object_signal_emit(ki->layout.pressed->obj,
+				"e,state,released", "e");
+	ki->layout.pressed = NULL;
+     }
+   _e_kbd_int_zoomkey_up(ki);
+   _e_kbd_int_zoomkey_update(ki);
+   return 0;
+}
+
+static void
+_e_kbd_int_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Down *ev;
+   E_Kbd_Int *ki;
+   Evas_Coord x, y, w, h;
+   E_Kbd_Int_Key *ky;
+
+   ev = event_info;
+   if (ev->button != 1) return;
+   ki = data;
+   ki->down.x = ev->canvas.x;
+   ki->down.y = ev->canvas.y;
+   ki->down.down = 1;
+   ki->down.stroke = 0;
+
+   evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
+   x = ev->canvas.x - x;
+   y = ev->canvas.y - y;
+   ki->down.cx = x;
+   ki->down.cy = y;
+   x = (x * ki->layout.w) / w;
+   y = (y * ki->layout.h) / h;
+
+   ki->down.lx = x;
+   ki->down.ly = y;
+   ki->down.clx = x;
+   ki->down.cly = y;
+
+   if (ki->down.hold_timer) ecore_timer_del(ki->down.hold_timer);
+   // FIXME 0.25 - magic value. make config.
+   ki->down.hold_timer = ecore_timer_add(0.25, _e_kbd_int_cb_hold_timeout, ki);
+
+   ky = _e_kbd_int_at_coord_get(ki, x, y);
+   ki->layout.pressed = ky;
+   if (ky)
+     {
+	ky->pressed = 1;
+	e_layout_child_raise(ky->obj);
+	e_layout_child_raise(ki->event_obj);
+	edje_object_signal_emit(ky->obj, "e,state,pressed", "e");
+     }
+}
+
+static void
+_e_kbd_int_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev;
+   E_Kbd_Int *ki;
+   Evas_Coord dx, dy, x, w, y, h;
+
+   ev = event_info;
+   ki = data;
+
+   if (ki->down.zoom)
+     {
+	evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
+	x = ev->cur.canvas.x - x;
+	y = ev->cur.canvas.y - y;
+	ki->down.cx = x;
+	ki->down.cy = y;
+	x = (x * ki->layout.w) / w;
+	y = (y * ki->layout.h) / h;
+	ki->down.clx = x;
+	ki->down.cly = y;
+	_e_kbd_int_zoomkey_update(ki);
+	return;
+     }
+   if (ki->down.stroke) return;
+
+   dx = ev->cur.canvas.x - ki->down.x;
+   dy = ev->cur.canvas.y - ki->down.y;
+   evas_object_geometry_get(ki->event_obj, &x, &y, &w, &h);
+   dx = (dx * ki->layout.w) / w;
+   dy = (dy * ki->layout.h) / h;
+   // FIXME: slide 1/4 of dimension is a magic number - make config
+   if ((dx > 0) && (dx > (ki->layout.w / 4))) ki->down.stroke = 1;
+   else if ((dx < 0) && (-dx > (ki->layout.w / 4))) ki->down.stroke = 1;
+   if ((dy > 0) && (dy > (ki->layout.h / 4))) ki->down.stroke = 1;
+   else if ((dy < 0) && (-dy > (ki->layout.w / 4))) ki->down.stroke = 1;
+   if ((ki->down.stroke) && (ki->down.hold_timer))
+     {
+	ecore_timer_del(ki->down.hold_timer);
+	ki->down.hold_timer = NULL;
+     }
+}
+
+static void
+_e_kbd_int_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Up *ev;
+   E_Kbd_Int *ki;
+   Evas_Coord x, y;
+   E_Kbd_Int_Key *ky;
+   int dir = 0;
+
+   ev = event_info;
+   if (ev->button != 1) return;
+   ki = data;
+
+   if (ki->down.zoom)
+     {
+	_e_kbd_int_key_press_handle(ki, ki->down.clx, ki->down.cly);
+	_e_kbd_int_zoomkey_down(ki);
+	ki->down.zoom = 0;
+     }
+   else if (!ki->down.stroke)
+     _e_kbd_int_key_press_handle(ki, ki->down.lx, ki->down.ly);
+   else
+     {
+	Evas_Coord dx, dy;
+
+	dx = ev->canvas.x - ki->down.x;
+	dy = ev->canvas.y - ki->down.y;
+	if (dx > 0)
+	  {
+	     if (dy > 0)
+	       {
+		  if (dx > dy) dir = 1; // right
+		  else dir = 2; // down
+	       }
+	     else
+	       {
+		  if (dx > -dy) dir = 1; // right
+		  else dir = 4; // up
+	       }
+	  }
+	else
+	  {
+	     if (dy > 0)
+	       {
+		  if (-dx > dy) dir = 3; // left
+		  else dir = 2; // down
+	       }
+	     else
+	       {
+		  if (-dx > -dy) dir = 3; // left
+		  else dir = 4; // up
+	       }
+	  }
+     }
+
+   ky = ki->layout.pressed;
+   if (ky)
+     {
+	ky->pressed = 0;
+	edje_object_signal_emit(ky->obj, "e,state,released", "e");
+	ki->layout.pressed = NULL;
+     }
+   ky = ki->zoomkey.pressed;
+   if (ky)
+     {
+	ky->pressed = 0;
+	edje_object_signal_emit(ky->obj, "e,state,released", "e");
+	ki->zoomkey.pressed = NULL;
+     }
+
+   ki->down.down = 0;
+   ki->down.stroke = 0;
+   if (ki->down.hold_timer)
+     {
+	ecore_timer_del(ki->down.hold_timer);
+	ki->down.hold_timer = NULL;
+     }
+
+   if (dir > 0) _e_kbd_int_stroke_handle(ki, dir);
+}
+
+static E_Kbd_Int_Layout *
+_e_kbd_int_layouts_list_default_get(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Layout *kil;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(ki->layouts, l, kil)
+     if ((!strcmp(ecore_file_file_get(kil->path), "Default.kbd")))
+       return kil;
+   return NULL;
+}
+
+static E_Kbd_Int_Layout *
+_e_kbd_int_layouts_type_get(E_Kbd_Int *ki, int type)
+{
+   E_Kbd_Int_Layout *kil;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(ki->layouts, l, kil)
+     if (kil->type == type) return kil;
+   return NULL;
+}
+
+static void
+_e_kbd_int_layout_free(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Key *ky;
+
+   if (ki->layout.directory) free(ki->layout.directory);
+   if (ki->layout.file) eina_stringshare_del(ki->layout.file);
+   ki->layout.directory = NULL;
+   ki->layout.file = NULL;
+   EINA_LIST_FREE(ki->layout.keys, ky)
+     {
+        E_Kbd_Int_Key_State *st;
+
+	EINA_LIST_FREE(ky->states, st)
+	  {
+	     if (st->label) eina_stringshare_del(st->label);
+	     if (st->icon) eina_stringshare_del(st->icon);
+	     if (st->out) eina_stringshare_del(st->out);
+	     free(st);
+	  }
+	if (ky->obj) evas_object_del(ky->obj);
+	if (ky->icon_obj) evas_object_del(ky->icon_obj);
+	free(ky);
+     }
+   if (ki->event_obj) evas_object_del(ki->event_obj);
+   ki->event_obj = NULL;
+}
+
+static void
+_e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
+{
+   FILE *f;
+   char buf[4096];
+   int isok = 0;
+   E_Kbd_Int_Key *ky = NULL;
+   E_Kbd_Int_Key_State *st = NULL;
+
+   f = fopen(layout, "r");
+   if (!f) return;
+   ki->layout.directory = ecore_file_dir_get(layout);
+   ki->layout.file = eina_stringshare_add(layout);
+   while (fgets(buf, sizeof(buf), f))
+     {
+	int len;
+	char str[4096];
+
+	if (!isok)
+	  {
+	     if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
+	  }
+	if (!isok) break;
+	if (buf[0] == '#') continue;
+	len = strlen(buf);
+	if (len > 0)
+	  {
+	     if (buf[len - 1] == '\n') buf[len - 1] = 0;
+	  }
+	if (sscanf(buf, "%4000s", str) != 1) continue;
+	if (!strcmp(str, "kbd"))
+	  {
+	     if (sscanf(buf, "%*s %i %i\n", &(ki->layout.w), &(ki->layout.h)) != 2)
+	       continue;
+	  }
+	if (!strcmp(str, "fuzz"))
+	  {
+	     sscanf(buf, "%*s %i\n", &(ki->layout.fuzz));
+	     continue;
+	  }
+	if (!strcmp(str, "key"))
+	  {
+	     ky = calloc(1, sizeof(E_Kbd_Int_Key));
+	     if (!ky) continue;
+	     if (sscanf(buf, "%*s %i %i %i %i\n", &(ky->x), &(ky->y), &(ky->w), &(ky->h)) != 4)
+	       {
+		  free(ky);
+		  ky = NULL;
+		  continue;
+	       }
+	     ki->layout.keys = eina_list_append(ki->layout.keys, ky);
+	  }
+	if (!ky) continue;
+	if ((!strcmp(str, "normal")) || (!strcmp(str, "shift")) ||
+	    (!strcmp(str, "capslock")))
+	  {
+	     char *p;
+	     char label[4096];
+	     int xx;
+
+	     if (sscanf(buf, "%*s %4000s", label) != 1) continue;
+	     st = calloc(1, sizeof(E_Kbd_Int_Key_State));
+	     if (!st) continue;
+	     ky->states = eina_list_append(ky->states, st);
+	     if (!strcmp(str, "normal")) st->state = NORMAL;
+	     if (!strcmp(str, "shift")) st->state = SHIFT;
+	     if (!strcmp(str, "capslock")) st->state = CAPSLOCK;
+	     p = strrchr(label, '.');
+	     if ((p) && (!strcmp(p, ".png")))
+	       st->icon = eina_stringshare_add(label);
+	     else if ((p) && (!strcmp(p, ".edj")))
+	       st->icon = eina_stringshare_add(label);
+	     else
+	       st->label = eina_stringshare_add(label);
+	     if (sscanf(buf, "%*s %*s %4000s", str) != 1) continue;
+	     st->out = eina_stringshare_add(str);
+	  }
+	if (!strcmp(str, "is_shift")) ky->is_shift = 1;
+	if (!strcmp(str, "is_ctrl")) ky->is_ctrl = 1;
+	if (!strcmp(str, "is_alt")) ky->is_alt = 1;
+	if (!strcmp(str, "is_capslock")) ky->is_capslock = 1;
+     }
+   fclose(f);
+}
+
+static void
+_e_kbd_int_layout_build(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Key *ky;
+   Evas_Object *o, *o2;
+   Evas_Coord lw, lh;
+   Eina_List *l;
+
+   evas_event_freeze(ki->win->evas);
+   e_layout_virtual_size_set(ki->layout_obj, ki->layout.w, ki->layout.h);
+   edje_extern_object_aspect_set(ki->layout_obj, EDJE_ASPECT_CONTROL_BOTH, ki->layout.w, ki->layout.h);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.content", ki->layout_obj);
+   evas_object_resize(ki->base_obj, ki->win->w, ki->win->h);
+   edje_object_part_geometry_get(ki->base_obj, "e.swallow.content", NULL, NULL, &lw, &lh);
+   lh = (ki->layout.h * lw) / ki->layout.w;
+   edje_extern_object_min_size_set(ki->layout_obj, lw, lh);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.content", ki->layout_obj);
+
+   EINA_LIST_FOREACH(ki->layout.keys, l, ky)
+     {
+	E_Kbd_Int_Key_State *st;
+	const char *label, *icon;
+
+	o = _theme_obj_new(ki->win->evas, ki->themedir,
+			   "e/modules/kbd/key/default");
+	ky->obj = o;
+	label = "";
+	icon = NULL;
+	st = _e_kbd_int_key_state_get(ki, ky);
+	if (st)
+	  {
+	     label = st->label;
+	     icon = st->icon;
+	  }
+
+        edje_object_part_text_set(o, "e.text.label", label);
+
+	o2 = e_icon_add(ki->win->evas);
+	e_icon_fill_inside_set(o2, 1);
+	e_icon_scale_up_set(o2, 0);
+	ky->icon_obj = o2;
+	edje_object_part_swallow(o, "e.swallow.content", o2);
+	evas_object_show(o2);
+
+	if (icon)
+	  {
+	     char buf[PATH_MAX];
+	     char *p;
+
+	     snprintf(buf, sizeof(buf), "%s/%s", ki->layout.directory, icon);
+	     p = strrchr(icon, '.');
+	     if (!strcmp(p, ".edj"))
+	       e_icon_file_edje_set(o2, buf, "icon");
+	     else
+	       e_icon_file_set(o2, buf);
+	  }
+	e_layout_pack(ki->layout_obj, o);
+	e_layout_child_move(o, ky->x, ky->y);
+	e_layout_child_resize(o, ky->w, ky->h);
+	evas_object_show(o);
+     }
+
+   o = evas_object_rectangle_add(ki->win->evas);
+   e_layout_pack(ki->layout_obj, o);
+   e_layout_child_move(o, 0, 0);
+   e_layout_child_resize(o, ki->layout.w, ki->layout.h);
+   evas_object_color_set(o, 0, 0, 0, 0);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_kbd_int_cb_mouse_down, ki);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_kbd_int_cb_mouse_up, ki);
+   evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_kbd_int_cb_mouse_move, ki);
+   evas_object_show(o);
+   ki->event_obj = o;
+   evas_event_thaw(ki->win->evas);
+   _e_kbd_int_matchlist_down(ki);
+}
+
+static void
+_e_kbd_int_layouts_free(E_Kbd_Int *ki)
+{
+   E_Kbd_Int_Layout *kil;
+
+   EINA_LIST_FREE(ki->layouts, kil)
+     {
+	eina_stringshare_del(kil->path);
+	eina_stringshare_del(kil->dir);
+	eina_stringshare_del(kil->icon);
+	eina_stringshare_del(kil->name);
+	free(kil);
+     }
+}
+
+static void
+_e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
+{
+   Eina_List *files;
+   Eina_List *l;
+   char buf[PATH_MAX], *p, *file, *path;
+   const char *fl;
+   Eina_List *kbs = NULL, *layouts = NULL;
+   int ok;
+   size_t len;
+
+   len = e_user_dir_concat_static(buf, "keyboards");
+   if (len + 2 >= sizeof(buf)) return;
+
+   files = ecore_file_ls(buf);
+
+   buf[len] = '/';
+   len++;
+
+   EINA_LIST_FREE(files, file)
+     {
+	p = strrchr(file, '.');
+	if ((p) && (!strcmp(p, ".kbd")))
+	  {
+	     if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+	       continue;
+	     kbs = eina_list_append(kbs, eina_stringshare_add(buf));
+	  }
+	free(file);
+     }
+
+   len = snprintf(buf, sizeof(buf), "%s/keyboards", ki->syskbds);
+   if (len + 2 >= sizeof(buf)) return;
+
+   files = ecore_file_ls(buf);
+
+   buf[len] = '/';
+   len++;
+
+   EINA_LIST_FREE(files, file)
+     {
+	p = strrchr(file, '.');
+	if ((p) && (!strcmp(p, ".kbd")))
+	  {
+	     ok = 1;
+	     EINA_LIST_FOREACH(kbs, l, fl)
+	       {
+		  if (!strcmp(file, fl))
+		    {
+		       ok = 0;
+		       break;
+		    }
+	       }
+	     if (ok)
+	       {
+		  if (ecore_strlcpy(buf + len, file, sizeof(buf) - len) >= sizeof(buf) - len)
+		    continue;
+		  kbs = eina_list_append(kbs, eina_stringshare_add(buf));
+	       }
+	  }
+	free(file);
+     }
+   /* Previous loop could break before destroying all items. */
+   EINA_LIST_FREE(files, file)
+     free(file);
+
+   EINA_LIST_FREE(kbs, path)
+     {
+	E_Kbd_Int_Layout *kil;
+
+	kil = E_NEW(E_Kbd_Int_Layout, 1);
+	if (kil)
+	  {
+	     char *s, *p;
+	     FILE *f;
+
+	     kil->path = path;
+	     s = strdup(ecore_file_file_get(kil->path));
+	     if (s)
+	       {
+		  p = strrchr(s, '.');
+		  if (p) *p = 0;
+		  kil->name = eina_stringshare_add(s);
+		  free(s);
+	       }
+	     s = ecore_file_dir_get(kil->path);
+	     if (s)
+	       {
+		  kil->dir = eina_stringshare_add(s);
+		  free(s);
+	       }
+	     f = fopen(kil->path, "r");
+	     if (f)
+	       {
+		  int isok = 0;
+
+		  while (fgets(buf, sizeof(buf), f))
+		    {
+		       int len;
+		       char str[4096];
+
+		       if (!isok)
+			 {
+			    if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
+			 }
+		       if (!isok) break;
+		       if (buf[0] == '#') continue;
+		       len = strlen(buf);
+		       if (len > 0)
+			 {
+			    if (buf[len - 1] == '\n') buf[len - 1] = 0;
+			 }
+		       if (sscanf(buf, "%4000s", str) != 1) continue;
+		       if (!strcmp(str, "type"))
+			 {
+			    sscanf(buf, "%*s %4000s\n", str);
+			    if (!strcmp(str, "ALPHA"))
+			      kil->type = E_KBD_INT_TYPE_ALPHA;
+			    else if (!strcmp(str, "NUMERIC"))
+			      kil->type = E_KBD_INT_TYPE_NUMERIC;
+			    else if (!strcmp(str, "PIN"))
+			      kil->type = E_KBD_INT_TYPE_PIN;
+			    else if (!strcmp(str, "PHONE_NUMBER"))
+			      kil->type = E_KBD_INT_TYPE_PHONE_NUMBER;
+			    else if (!strcmp(str, "HEX"))
+			      kil->type = E_KBD_INT_TYPE_HEX;
+			    else if (!strcmp(str, "TERMINAL"))
+			      kil->type = E_KBD_INT_TYPE_TERMINAL;
+			    else if (!strcmp(str, "PASSWORD"))
+			      kil->type = E_KBD_INT_TYPE_PASSWORD;
+			    continue;
+			 }
+		       if (!strcmp(str, "icon"))
+			 {
+			    sscanf(buf, "%*s %4000s\n", str);
+			    snprintf(buf, sizeof(buf), "%s/%s", kil->dir, str);
+			    kil->icon = eina_stringshare_add(buf);
+			    continue;
+			 }
+		    }
+		  fclose(f);
+	       }
+	     layouts = eina_list_append(layouts, kil);
+	  }
+     }
+   _e_kbd_int_layouts_free(ki);
+   ki->layouts = layouts;
+}
+
+static void
+_e_kbd_int_layout_select(E_Kbd_Int *ki, E_Kbd_Int_Layout *kil)
+{
+   _e_kbd_int_layout_free(ki);
+   _e_kbd_int_layout_parse(ki, kil->path);
+   _e_kbd_int_layout_build(ki);
+   _e_kbd_int_layout_buf_update(ki);
+   _e_kbd_int_layout_state_update(ki);
+
+   if (!kil->icon)
+     e_icon_file_set(ki->icon_obj, kil->icon);
+   else
+     {
+	const char *p;
+
+	p = strrchr(kil->icon, '.');
+	if (!p)
+	  e_icon_file_set(ki->icon_obj, kil->icon);
+	else
+	  {
+	     if (!strcmp(p, ".edj"))
+	       e_icon_file_edje_set(ki->icon_obj, kil->icon, "icon");
+	     else
+	       e_icon_file_set(ki->icon_obj, kil->icon);
+	  }
+     }
+}
+
+static void
+_e_kbd_int_layout_next(E_Kbd_Int *ki)
+{
+   Eina_List *l, *ln = NULL;
+   const char *nextlay = NULL;
+   E_Kbd_Int_Layout *kil;
+
+   EINA_LIST_FOREACH(ki->layouts, l, kil)
+     if (!strcmp(kil->path, ki->layout.file))
+       {
+          ln = l->next;
+          break;
+       }
+   if (!ln) ln = ki->layouts;
+   if (!ln) return;
+   kil = ln->data;
+   _e_kbd_int_layout_select(ki, kil);
+}
+
+static int
+_e_kbd_int_cb_client_message(void *data, int type, void *event)
+{
+   Ecore_X_Event_Client_Message *ev;
+   E_Kbd_Int *ki;
+
+   ev = event;
+   ki = data;
+   if ((ev->win == ki->win->evas_win) && 
+       (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE))
+     {
+	E_Kbd_Int_Layout *kil;
+
+	if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF)
+	  {
+	     _e_kbd_int_zoomkey_down(ki);
+	     _e_kbd_int_dictlist_down(ki);
+	     _e_kbd_int_matchlist_down(ki);
+	     _e_kbd_int_layoutlist_down(ki);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON)
+	  {
+	     // do nothing - leave kbd as-is
+	  }
+	else if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ALPHA)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_ALPHA);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_NUMERIC)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_NUMERIC);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PIN);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PHONE_NUMBER);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_HEX);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_TERMINAL);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+	else if (ev->data.l[0] == ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD)
+	  {
+	     kil = _e_kbd_int_layouts_type_get(ki, E_KBD_INT_TYPE_PASSWORD);
+	     if (kil) _e_kbd_int_layout_select(ki, kil);
+	  }
+     }
+   return 1;
+}
+
+static void
+_e_kbd_int_dictlist_down(E_Kbd_Int *ki)
+{
+   char *str;
+
+   if (!ki->dictlist.popup) return;
+   e_object_del(E_OBJECT(ki->dictlist.popup));
+   ki->dictlist.popup = NULL;
+   EINA_LIST_FREE(ki->dictlist.matches, str)
+     eina_stringshare_del(str);
+}
+
+static void
+_e_kbd_int_cb_dictlist_item_sel(void *data)
+{
+   E_Kbd_Int *ki;
+   const char *str;
+   int i;
+
+   ki = data;
+   i = e_widget_ilist_selected_get(ki->dictlist.ilist_obj);
+   str = eina_list_nth(ki->dictlist.matches, i);
+   e_kbd_buf_clear(ki->kbuf);
+   if (ki->layout.state & (SHIFT | CTRL | ALT))
+     {
+	ki->layout.state &= (~(SHIFT | CTRL | ALT));
+	_e_kbd_int_layout_state_update(ki);
+     }
+
+   eina_stringshare_replace(&il_kbd_cfg->dict, str);
+   e_kbd_buf_dict_set(ki->kbuf, il_kbd_cfg->dict);
+   e_config_save_queue();
+
+   _e_kbd_int_dictlist_down(ki);
+}
+
+static void
+_e_kbd_int_dictlist_up(E_Kbd_Int *ki)
+{
+   Evas_Object *o;
+   Evas_Coord w, h, mw, mh, vw, vh;
+   int sx, sy, sw, sh, used;
+   Eina_List *files;
+   Eina_List *l;
+   char buf[PATH_MAX], *p, *file, *pp;
+   const char *str;
+
+   if (ki->dictlist.popup) return;
+   ki->dictlist.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
+   e_popup_layer_set(ki->dictlist.popup, 190);
+
+   o = _theme_obj_new(ki->dictlist.popup->evas, ki->themedir,
+		      "e/modules/kbd/match/default");
+   ki->dictlist.base_obj = o;
+
+   o = e_widget_ilist_add(ki->dictlist.popup->evas, 32 * e_scale, 32 * e_scale, NULL);
+   e_widget_ilist_selector_set(o, 1);
+   e_widget_ilist_freeze(o);
+   ki->dictlist.ilist_obj = o;
+
+   e_user_dir_concat_static(buf, "dicts");
+   files = ecore_file_ls(buf);
+
+   EINA_LIST_FREE(files, file)
+     {
+        p = strrchr(file, '.');
+        if ((p) && (!strcmp(p, ".dic")))
+          {
+             const char *match;
+             used = 0;
+
+	     EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
+	       if (!strcmp(match, file)) used = 1;
+
+	     if (used) goto next1;
+
+             p = strdup(file);
+	     if (!p) goto next1;
+
+             for (pp = p; *pp; pp++)
+               {
+                  if (*pp == '_') *pp = ' ';
+               }
+             pp = strrchr(p, '.');
+             *pp = 0;
+             str = eina_stringshare_add(file);
+             ki->dictlist.matches = eina_list_append(ki->dictlist.matches, str);
+             e_widget_ilist_append(o, NULL, p, _e_kbd_int_cb_dictlist_item_sel,
+                                   ki, NULL);
+             free(p);
+          }
+
+        next1:
+	free(file);
+     }
+
+   snprintf(buf, sizeof(buf), "%s/dicts", ki->sysdicts);
+   files = ecore_file_ls(buf);
+   EINA_LIST_FREE(files, file)
+     {
+        p = strrchr(file, '.');
+        if ((p) && (!strcmp(p, ".dic")))
+          {
+	     const char *match;
+             used = 0;
+
+	     EINA_LIST_FOREACH(ki->dictlist.matches, l, match)
+	       if (!strcmp(match, file)) used = 1;
+
+	     if (used) goto next2;
+
+             p = strdup(file);
+	     if (!p) goto next2;
+
+             for (pp = p; *pp; pp++)
+               {
+                  if (*pp == '_') *pp = ' ';
+               }
+             pp = strrchr(p, '.');
+             *pp = 0;
+             str = eina_stringshare_add(file);
+             ki->dictlist.matches = eina_list_append(ki->dictlist.matches, str);
+             e_widget_ilist_append(o, NULL, p, _e_kbd_int_cb_dictlist_item_sel,
+                                   ki, NULL);
+             free(p);
+          }
+        next2:
+	free(file);
+     }
+   e_widget_ilist_thaw(o);
+   e_widget_ilist_go(o);
+
+   e_widget_ilist_preferred_size_get(o, &mw, &mh);
+   if (mh < (120 *e_scale)) mh = 120 * e_scale;
+
+   edje_extern_object_min_size_set(ki->dictlist.ilist_obj, mw, mh);
+   edje_object_part_swallow(ki->dictlist.base_obj, "e.swallow.content",
+                            ki->dictlist.ilist_obj);
+   edje_object_size_min_calc(ki->dictlist.base_obj, &mw, &mh);
+
+   edje_extern_object_min_size_set(ki->dictlist.ilist_obj, 0, 0);
+   edje_object_part_swallow(ki->dictlist.base_obj, "e.swallow.content",
+                            ki->dictlist.ilist_obj);
+   e_zone_useful_geometry_get(ki->win->border->zone, &sx, &sy, &sw, &sh);   
+   mw = ki->win->w;
+   if (mh > (sh - ki->win->h)) mh = sh - ki->win->h;
+   e_popup_move_resize(ki->dictlist.popup,
+		       ki->win->x, ki->win->y - mh, mw, mh);
+   evas_object_resize(ki->dictlist.base_obj, 
+		      ki->dictlist.popup->w, ki->dictlist.popup->h);
+   evas_object_show(ki->dictlist.base_obj);
+   e_popup_edje_bg_object_set(ki->dictlist.popup, ki->dictlist.base_obj);
+   e_popup_show(ki->dictlist.popup);
+
+   _e_kbd_int_layoutlist_down(ki);
+   _e_kbd_int_matchlist_down(ki);
+}
+
+static void
+_e_kbd_int_matchlist_down(E_Kbd_Int *ki)
+{
+   char *str;
+
+   if (!ki->matchlist.popup) return;
+   e_object_del(E_OBJECT(ki->matchlist.popup));
+   ki->matchlist.popup = NULL;
+   EINA_LIST_FREE(ki->matchlist.matches, str)
+     eina_stringshare_del(str);
+}
+
+static void
+_e_kbd_int_cb_matchlist_item_sel(void *data)
+{
+   E_Kbd_Int *ki;
+   const char *str;
+
+   ki = data;
+   str = e_widget_ilist_selected_label_get(ki->matchlist.ilist_obj);
+   _e_kbd_int_string_send(ki, str);
+   e_kbd_buf_clear(ki->kbuf);
+   e_kbd_send_keysym_press("space", 0);
+   if (ki->layout.state & (SHIFT | CTRL | ALT))
+     {
+	ki->layout.state &= (~(SHIFT | CTRL | ALT));
+	_e_kbd_int_layout_state_update(ki);
+     }
+   _e_kbd_int_matches_update(ki);
+   _e_kbd_int_matchlist_down(ki);
+}
+
+static void
+_e_kbd_int_matchlist_up(E_Kbd_Int *ki)
+{
+   const Eina_List *l;
+   Evas_Object *o;
+   Evas_Coord w, h, mw, mh, vw, vh;
+   int sx, sy, sw, sh;
+
+   if (!e_kbd_buf_string_matches_get(ki->kbuf)) return;
+   if (ki->matchlist.popup) return;
+   ki->matchlist.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
+   e_popup_layer_set(ki->matchlist.popup, 190);
+
+   o = _theme_obj_new(ki->matchlist.popup->evas, ki->themedir,
+		      "e/modules/kbd/match/default");
+   ki->matchlist.base_obj = o;
+
+   o = e_widget_ilist_add(ki->matchlist.popup->evas, 32 * e_scale, 32 * e_scale, NULL);
+   e_widget_ilist_selector_set(o, 1);
+   ki->matchlist.ilist_obj = o;
+   edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content", o);
+   evas_object_show(o);
+
+   for (l = e_kbd_buf_string_matches_get(ki->kbuf); l; l = l->next)
+     {
+	const char *str;
+
+	if (!l->prev)
+	  {
+	     str = e_kbd_buf_actual_string_get(ki->kbuf);
+	     if (str)
+	       {
+		  str = eina_stringshare_add(str);
+		  ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
+		  e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
+					ki, NULL);
+	       }
+	  }
+	str = l->data;
+	str = eina_stringshare_add(str);
+	ki->matchlist.matches = eina_list_append(ki->matchlist.matches, str);
+	e_widget_ilist_append(o, NULL, str, _e_kbd_int_cb_matchlist_item_sel,
+			      ki, NULL);
+     }
+   e_widget_ilist_thaw(o);
+   e_widget_ilist_go(o);
+
+   e_widget_ilist_preferred_size_get(o, &mw, &mh);
+   if (mh < (120 *e_scale)) mh = 120 * e_scale;
+
+   edje_extern_object_min_size_set(ki->matchlist.ilist_obj, mw, mh);
+   edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
+		   	    ki->matchlist.ilist_obj);
+   edje_object_size_min_calc(ki->matchlist.base_obj, &mw, &mh);
+
+   edje_extern_object_min_size_set(ki->matchlist.ilist_obj, 0, 0);
+   edje_object_part_swallow(ki->matchlist.base_obj, "e.swallow.content",
+		   	    ki->matchlist.ilist_obj);
+   e_zone_useful_geometry_get(ki->win->border->zone, &sx, &sy, &sw, &sh);   
+   mw = ki->win->w;
+   if (mh > (sh - ki->win->h)) mh = sh - ki->win->h;
+   e_popup_move_resize(ki->matchlist.popup,
+		       ki->win->x, ki->win->y - mh, mw, mh);
+   evas_object_resize(ki->matchlist.base_obj, 
+		      ki->matchlist.popup->w, ki->matchlist.popup->h);
+   evas_object_show(ki->matchlist.base_obj);
+   e_popup_edje_bg_object_set(ki->matchlist.popup, ki->matchlist.base_obj);
+   e_popup_show(ki->matchlist.popup);
+
+   _e_kbd_int_dictlist_down(ki);
+   _e_kbd_int_layoutlist_down(ki);
+}
+
+static void
+_e_kbd_int_cb_matches(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Kbd_Int *ki;
+
+   ki = data;
+   if (ki->dictlist.popup) _e_kbd_int_dictlist_down(ki);
+   else if (ki->matchlist.popup) _e_kbd_int_matchlist_down(ki);
+   else
+     {
+	if (!e_kbd_buf_actual_string_get(ki->kbuf))
+	  _e_kbd_int_dictlist_up(ki);
+	else
+	  _e_kbd_int_matchlist_up(ki);
+     }
+}
+
+static void
+_e_kbd_int_cb_dicts(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Kbd_Int *ki;
+
+   ki = data;
+   if (ki->dictlist.popup) _e_kbd_int_dictlist_down(ki);
+   else _e_kbd_int_dictlist_up(ki);
+}
+
+static void
+_e_kbd_int_layoutlist_down(E_Kbd_Int *ki)
+{
+   if (!ki->layoutlist.popup) return;
+   e_object_del(E_OBJECT(ki->layoutlist.popup));
+   ki->layoutlist.popup = NULL;
+}
+
+static void
+_e_kbd_int_cb_layoutlist_item_sel(void *data)
+{
+   E_Kbd_Int *ki;
+   E_Kbd_Int_Layout *kil;
+   int i;
+
+   ki = data;
+   i = e_widget_ilist_selected_get(ki->layoutlist.ilist_obj);
+   kil = eina_list_nth(ki->layouts, i);
+   _e_kbd_int_layout_select(ki, kil);
+   _e_kbd_int_layoutlist_down(ki);
+}
+
+static void
+_e_kbd_int_layoutlist_up(E_Kbd_Int *ki)
+{
+   Eina_List *l;
+   Evas_Object *o, *o2;
+   Evas_Coord mw, mh;
+   int sx, sy, sw, sh;
+
+   if (ki->layoutlist.popup) return;
+   ki->layoutlist.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
+   e_popup_layer_set(ki->layoutlist.popup, 190);
+
+   o = _theme_obj_new(ki->layoutlist.popup->evas, ki->themedir,
+		      "e/modules/kbd/match/default");
+   ki->layoutlist.base_obj = o;
+
+   o = e_widget_ilist_add(ki->layoutlist.popup->evas, 32 * e_scale, 32 * e_scale, NULL);
+   ki->layoutlist.ilist_obj = o;
+   e_widget_ilist_selector_set(o, 1);
+   edje_object_part_swallow(ki->layoutlist.base_obj, "e.swallow.content", o);
+   evas_object_show(o);
+
+   e_widget_ilist_freeze(o);
+   for (l = ki->layouts; l; l = l->next)
+     {
+	E_Kbd_Int_Layout *kil;
+
+	kil = l->data;
+	o2 = e_icon_add(ki->layoutlist.popup->evas);
+	e_icon_fill_inside_set(o2, 1);
+	e_icon_scale_up_set(o2, 0);
+
+	if (kil->icon)
+	  {
+	     char *p;
+
+	     p = strrchr(kil->icon, '.');
+	     if (!strcmp(p, ".edj"))
+	       e_icon_file_edje_set(o2, kil->icon, "icon");
+	     else
+	       e_icon_file_set(o2, kil->icon);
+	  }
+	evas_object_show(o2);
+	e_widget_ilist_append(o, o2, kil->name,
+			      _e_kbd_int_cb_layoutlist_item_sel, ki, NULL);
+     }
+   e_widget_ilist_thaw(o);
+   e_widget_ilist_go(o);
+
+   e_widget_ilist_preferred_size_get(o, &mw, &mh);
+   if (mh < (120 *e_scale)) mh = 120 * e_scale;
+
+   edje_extern_object_min_size_set(ki->layoutlist.ilist_obj, mw, mh);
+   edje_object_part_swallow(ki->layoutlist.base_obj, "e.swallow.content",
+		   	    ki->layoutlist.ilist_obj);
+
+   edje_object_size_min_calc(ki->layoutlist.base_obj, &mw, &mh);
+   edje_extern_object_min_size_set(ki->layoutlist.ilist_obj, 0, 0);
+   edje_object_part_swallow(ki->layoutlist.base_obj, "e.swallow.content",
+			    ki->layoutlist.ilist_obj);
+   e_zone_useful_geometry_get(ki->win->border->zone, &sx, &sy, &sw, &sh);   
+   mw = ki->win->w;
+   if (mh > (sh - ki->win->h)) mh = sh - ki->win->h;
+   e_popup_move_resize(ki->layoutlist.popup,
+		       ki->win->x, ki->win->y - mh, mw, mh);
+   evas_object_resize(ki->layoutlist.base_obj, 
+		      ki->layoutlist.popup->w, ki->layoutlist.popup->h);
+   evas_object_show(ki->layoutlist.base_obj);
+   e_popup_edje_bg_object_set(ki->layoutlist.popup, ki->layoutlist.base_obj);
+   e_popup_show(ki->layoutlist.popup);
+
+   _e_kbd_int_dictlist_down(ki);
+   _e_kbd_int_matchlist_down(ki);
+}
+
+static void
+_e_kbd_int_cb_layouts(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   E_Kbd_Int *ki;
+
+   ki = data;
+   if (ki->layoutlist.popup) _e_kbd_int_layoutlist_down(ki);
+   else _e_kbd_int_layoutlist_up(ki);
+}
+
+EAPI E_Kbd_Int *
+e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
+{
+   E_Kbd_Int *ki;
+   unsigned int one = 1;
+   Evas_Object *o;
+   Evas_Coord mw, mh;
+   const char *deflay;
+   E_Zone *zone;
+   E_Kbd_Int_Layout *kil;
+   Ecore_X_Window_State states[2];
+
+   ki = E_NEW(E_Kbd_Int, 1);
+   if (!ki) return NULL;
+   if (themedir) ki->themedir = eina_stringshare_add(themedir);
+   if (syskbds) ki->syskbds = eina_stringshare_add(syskbds);
+   if (sysdicts) ki->sysdicts = eina_stringshare_add(sysdicts);
+   ki->win = e_win_new(e_util_container_number_get(0));
+   states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
+   states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
+   ecore_x_netwm_window_state_set(ki->win->evas_win, states, 2);
+
+   zone = e_util_container_zone_number_get(0, 0);
+   e_win_no_remember_set(ki->win, 1);
+   e_win_resize(ki->win, zone->w, zone->h);
+
+   e_win_resize_callback_set(ki->win, _e_kbd_int_cb_resize);
+   e_win_borderless_set(ki->win, 1);
+   ki->win->data = ki;
+   e_win_name_class_set(ki->win, "Virtual-Keyboard", "Virtual-Keyboard");
+   e_win_title_set(ki->win, "Virtual Keyboard");
+
+   ki->base_obj = _theme_obj_new(ki->win->evas,
+				 ki->themedir,
+				 "e/modules/kbd/base/default");
+   edje_object_signal_callback_add(ki->base_obj, "e,action,do,matches", "",
+				   _e_kbd_int_cb_matches, ki);
+   edje_object_signal_callback_add(ki->base_obj, "e,action,do,layouts", "",
+				   _e_kbd_int_cb_layouts, ki);
+   edje_object_signal_callback_add(ki->base_obj, "e,action,do,dicts", "",
+				   _e_kbd_int_cb_dicts, ki);
+
+   o = e_layout_add(ki->win->evas);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.content", o);
+   evas_object_show(o);
+   ki->layout_obj = o;
+
+   o = e_icon_add(ki->win->evas);
+   evas_object_pass_events_set(o, 1);
+   e_icon_fill_inside_set(o, 1);
+   e_icon_scale_up_set(o, 0);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.layout", o);
+   evas_object_show(o);
+   ki->icon_obj = o;
+
+   o = e_box_add(ki->win->evas);   
+   e_box_orientation_set(o, 1);
+   e_box_homogenous_set(o, 1);
+   edje_object_part_swallow(ki->base_obj, "e.swallow.label", o);
+   evas_object_show(o);
+   ki->box_obj = o;
+
+   if (il_kbd_cfg->dict)
+     ki->kbuf = e_kbd_buf_new(ki->sysdicts, il_kbd_cfg->dict);
+   else
+     ki->kbuf = e_kbd_buf_new(ki->sysdicts, "English_(US).dic");
+
+   _e_kbd_int_layouts_list_update(ki);
+
+   kil = _e_kbd_int_layouts_list_default_get(ki);
+   if ((!kil) && (ki->layouts))
+     kil = ki->layouts->data;
+
+   if (kil) _e_kbd_int_layout_select(ki, kil);
+
+   edje_object_size_min_calc(ki->base_obj, &mw, &mh);
+   if (mw < 48) mw = 48;
+   if (mh < 48) mh = 48;
+   evas_object_move(ki->base_obj, 0, 0);
+   evas_object_resize(ki->base_obj, mw, mh);
+   evas_object_show(ki->base_obj);
+
+   e_win_size_min_set(ki->win, zone->w, mh);
+//   e_win_resize(ki->win, zone->w, mh);
+   ecore_x_e_virtual_keyboard_set(ki->win->evas_win, 1);
+
+   ki->client_message_handler = ecore_event_handler_add
+     (ECORE_X_EVENT_CLIENT_MESSAGE, _e_kbd_int_cb_client_message, ki);
+
+   e_win_sticky_set(ki->win, 1);
+   e_win_show(ki->win);
+   e_win_move_resize(ki->win, 0, (zone->h - mh), zone->w, mh);
+   return ki;
+}
+
+EAPI void
+e_kbd_int_free(E_Kbd_Int *ki)
+{
+   if (ki->themedir) eina_stringshare_del(ki->themedir);
+   if (ki->syskbds) eina_stringshare_del(ki->syskbds);
+   if (ki->sysdicts) eina_stringshare_del(ki->sysdicts);
+   _e_kbd_int_layouts_free(ki);
+   _e_kbd_int_matches_free(ki);
+   _e_kbd_int_layout_free(ki);
+   ecore_event_handler_del(ki->client_message_handler);
+   if (ki->down.hold_timer) ecore_timer_del(ki->down.hold_timer);
+   _e_kbd_int_layoutlist_down(ki);
+   _e_kbd_int_matchlist_down(ki);
+   _e_kbd_int_zoomkey_down(ki);
+   e_kbd_buf_free(ki->kbuf);
+   e_object_del(E_OBJECT(ki->win));
+   free(ki);
+}
+
+static Evas_Object *
+_theme_obj_new(Evas *e, const char *custom_dir, const char *group)
+{
+   Evas_Object *o;
+
+   o = edje_object_add(e);
+   if (!e_theme_edje_object_set(o, "base/theme/modules/illume", group))
+     {
+	if (custom_dir)
+	  {
+	     char buf[PATH_MAX];
+
+	     snprintf(buf, sizeof(buf), "%s/e-module-illume-keyboard.edj", 
+                      custom_dir);
+	     edje_object_file_set(o, buf, group);
+	  }
+     }
+   return o;
+}
diff --git a/src/modules/illume/e_kbd_int.h b/src/modules/illume-keyboard/e_kbd_int.h
similarity index 100%
copy from src/modules/illume/e_kbd_int.h
copy to src/modules/illume-keyboard/e_kbd_int.h
diff --git a/src/modules/illume-keyboard/e_kbd_send.c b/src/modules/illume-keyboard/e_kbd_send.c
new file mode 100644
index 0000000..5a92b37
--- /dev/null
+++ b/src/modules/illume-keyboard/e_kbd_send.c
@@ -0,0 +1,38 @@
+#include "e.h"
+#include "e_kbd_send.h"
+
+static const char *
+_string_to_keysym(const char *str)
+{
+   int glyph, ok;
+
+   /* utf8 -> glyph id (unicode - ucs4) */
+   glyph = 0;
+   ok = evas_string_char_next_get(str, 0, &glyph);
+   if (glyph <= 0) return NULL;
+   /* glyph id -> keysym */
+   if (glyph > 0xff) glyph |= 0x1000000;
+   return ecore_x_keysym_string_get(glyph);
+}
+
+EAPI void
+e_kbd_send_string_press(const char *str, Kbd_Mod mod)
+{
+   const char *key = NULL;
+
+   key = _string_to_keysym(str);
+   if (!key) return;
+   e_kbd_send_keysym_press(key, mod);
+}
+
+EAPI void
+e_kbd_send_keysym_press(const char *key, Kbd_Mod mod)
+{
+   if (mod & KBD_MOD_CTRL) ecore_x_test_fake_key_down("Control_L");
+   if (mod & KBD_MOD_ALT) ecore_x_test_fake_key_down("Alt_L");
+   if (mod & KBD_MOD_WIN) ecore_x_test_fake_key_down("Super_L");
+   ecore_x_test_fake_key_press(key);
+   if (mod & KBD_MOD_WIN) ecore_x_test_fake_key_up("Super_L");
+   if (mod & KBD_MOD_ALT) ecore_x_test_fake_key_up("Alt_L");
+   if (mod & KBD_MOD_CTRL) ecore_x_test_fake_key_up("Control_L");
+}
diff --git a/src/modules/illume/e_kbd_send.h b/src/modules/illume-keyboard/e_kbd_send.h
similarity index 100%
copy from src/modules/illume/e_kbd_send.h
copy to src/modules/illume-keyboard/e_kbd_send.h
diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c
new file mode 100644
index 0000000..ced0313
--- /dev/null
+++ b/src/modules/illume-keyboard/e_mod_config.c
@@ -0,0 +1,249 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void *_il_kbd_config_create(E_Config_Dialog *cfd);
+static void _il_kbd_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_kbd_config_changed(void *data, Evas_Object *obj, void *event);
+static int _il_kbd_config_change_timeout(void *data);
+
+EAPI Il_Kbd_Config *il_kbd_cfg = NULL;
+static E_Config_DD *conf_edd = NULL;
+Ecore_Timer *_il_kbd_config_change_timer = NULL;
+int external = 0;
+
+/* public functions */
+EAPI int 
+il_kbd_config_init(E_Module *m) 
+{
+   conf_edd = E_CONFIG_DD_NEW("Illume_Kbd_Cfg", Il_Kbd_Config);
+   #undef T
+   #undef D
+   #define T Il_Kbd_Config
+   #define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, use_internal, INT);
+   E_CONFIG_VAL(D, T, run_keyboard, STR);
+   E_CONFIG_VAL(D, T, dict, STR);
+
+   il_kbd_cfg = e_config_domain_load("module.illume-keyboard", conf_edd);
+   if ((il_kbd_cfg) && 
+       ((il_kbd_cfg->version >> 16) < IL_CONFIG_MAJ)) 
+     {
+        E_FREE(il_kbd_cfg);
+        il_kbd_cfg = NULL;
+     }
+   if (!il_kbd_cfg) 
+     {
+        il_kbd_cfg = E_NEW(Il_Kbd_Config, 1);
+        il_kbd_cfg->version = 0;
+        il_kbd_cfg->use_internal = 1;
+        il_kbd_cfg->run_keyboard = NULL;
+        il_kbd_cfg->dict = eina_stringshare_add("English_(US).dic");
+     }
+   if (il_kbd_cfg) 
+     {
+        /* Add new config variables here */
+        /* if ((il_kbd_cfg->version & 0xffff) < 1) */
+        il_kbd_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
+     }
+
+   il_kbd_cfg->mod_dir = eina_stringshare_add(m->dir);
+
+   e_configure_registry_category_add("illume", 0, _("Illume"), NULL, 
+                                     "enlightenment/display");
+   e_configure_registry_generic_item_add("illume/keyboard", 0, _("Keyboard"), 
+                                         NULL, "enlightenment/keyboard", 
+                                         il_kbd_config_show);
+   return 1;
+}
+
+EAPI int 
+il_kbd_config_shutdown(void) 
+{
+   il_kbd_cfg->cfd = NULL;
+
+   e_configure_registry_item_del("illume/keyboard");
+   e_configure_registry_category_del("illume");
+
+   if (il_kbd_cfg->mod_dir) eina_stringshare_del(il_kbd_cfg->mod_dir);
+   if (il_kbd_cfg->run_keyboard) eina_stringshare_del(il_kbd_cfg->run_keyboard);
+   if (il_kbd_cfg->dict) eina_stringshare_del(il_kbd_cfg->dict);
+
+   E_FREE(il_kbd_cfg);
+   il_kbd_cfg = NULL;
+
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+EAPI int 
+il_kbd_config_save(void) 
+{
+   e_config_domain_save("module.illume-keyboard", conf_edd, il_kbd_cfg);
+   return 1;
+}
+
+EAPI void 
+il_kbd_config_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_keyboard_settings")) return;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_kbd_config_create;
+   v->free_cfdata = _il_kbd_config_free;
+   v->basic.create_widgets = _il_kbd_config_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+
+   cfd = e_config_dialog_new(con, _("Keyboard Settings"), "E", 
+                             "_config_illume_keyboard_settings", 
+                             "enlightenment/keyboard_settings", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+   il_kbd_cfg->cfd = cfd;
+}
+
+/* local function prototypes */
+static void *
+_il_kbd_config_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_kbd_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   il_kbd_cfg->cfd = NULL;
+}
+
+static Evas_Object *
+_il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *of, *ow;
+   E_Radio_Group *rg;
+   Eina_List *l;
+
+   list = e_widget_list_add(evas, 0, 0);
+   if (!il_kbd_cfg->run_keyboard) 
+     {
+        if (il_kbd_cfg->use_internal) external = 1;
+        else external = 0;
+     }
+   else 
+     {
+        Eina_List *kbds;
+        Efreet_Desktop *desktop;
+        int nn = 0;
+
+        external = 0;
+        kbds = efreet_util_desktop_category_list("Keyboard");
+        if (kbds) 
+          {
+             nn = 2;
+             EINA_LIST_FOREACH(kbds, l, desktop) 
+               {
+                  const char *dname;
+
+                  dname = ecore_file_file_get(desktop->orig_path);
+                  if (dname) 
+                    {
+                       if (!strcmp(il_kbd_cfg->run_keyboard, dname)) 
+                         {
+                            external = nn;
+                            break;
+                         }
+                    }
+                  nn++;
+               }
+          }
+     }
+
+   of = e_widget_framelist_add(evas, _("Keyboards"), 0);
+   rg = e_widget_radio_group_new(&(external));
+   ow = e_widget_radio_add(evas, _("None"), 0, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", _il_kbd_config_changed, NULL);
+   ow = e_widget_radio_add(evas, _("Default"), 1, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", _il_kbd_config_changed, NULL);
+     {
+        Eina_List *kbds;
+        Efreet_Desktop *desktop;
+        int nn = 2;
+
+        kbds = efreet_util_desktop_category_list("Keyboard");
+        EINA_LIST_FOREACH(kbds, l, desktop) 
+          {
+             const char *dname;
+
+             dname = ecore_file_file_get(desktop->orig_path);
+             ow = e_widget_radio_add(evas, desktop->name, nn, rg);
+             e_widget_framelist_object_append(of, ow);
+             evas_object_smart_callback_add(ow, "changed", 
+                                            _il_kbd_config_changed, NULL);
+             nn++;
+          }
+     }
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+   return list;
+}
+
+static void 
+_il_kbd_config_changed(void *data, Evas_Object *obj, void *event) 
+{
+   if (_il_kbd_config_change_timer) 
+     ecore_timer_del(_il_kbd_config_change_timer);
+   _il_kbd_config_change_timer = 
+     ecore_timer_add(0.5, _il_kbd_config_change_timeout, data);
+}
+
+static int 
+_il_kbd_config_change_timeout(void *data) 
+{
+   Eina_List *l;
+
+   il_kbd_cfg->use_internal = 0;
+   if (il_kbd_cfg->run_keyboard) 
+     eina_stringshare_del(il_kbd_cfg->run_keyboard);
+   il_kbd_cfg->run_keyboard = NULL;
+   if (external == 0)
+     il_kbd_cfg->use_internal = 0;
+   else if (external == 1)
+     il_kbd_cfg->use_internal = 1;
+   else 
+     {
+        Eina_List *kbds;
+        Efreet_Desktop *desktop;
+        int nn;
+
+        kbds = efreet_util_desktop_category_list("Keyboard");
+        if (kbds) 
+          {
+             nn = 2;
+             EINA_LIST_FOREACH(kbds, l, desktop) 
+               {
+                  const char *dname;
+
+                  dname = ecore_file_file_get(desktop->orig_path);
+                  if (nn == external) 
+                    {
+                       if (dname)
+                         il_kbd_cfg->run_keyboard = eina_stringshare_add(dname);
+                       break;
+                    }
+                  nn++;
+               }
+          }
+     }
+
+   il_kbd_cfg_update();
+   e_config_save_queue();
+   _il_kbd_config_change_timer = NULL;
+   return 0;
+}
diff --git a/src/modules/illume-keyboard/e_mod_config.h b/src/modules/illume-keyboard/e_mod_config.h
new file mode 100644
index 0000000..e50950b
--- /dev/null
+++ b/src/modules/illume-keyboard/e_mod_config.h
@@ -0,0 +1,29 @@
+#ifndef E_MOD_CONFIG_H
+#define E_MOD_CONFIG_H
+
+#define IL_CONFIG_MIN 0
+#define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Kbd_Config Il_Kbd_Config;
+
+struct _Il_Kbd_Config 
+{
+   int version;
+
+   int use_internal;
+   const char *dict, *run_keyboard;
+
+   // Not User Configurable. Placeholders
+   const char *mod_dir;
+   E_Config_Dialog *cfd;
+};
+
+EAPI int il_kbd_config_init(E_Module *m);
+EAPI int il_kbd_config_shutdown(void);
+EAPI int il_kbd_config_save(void);
+
+EAPI void il_kbd_config_show(E_Container *con, const char *params);
+
+extern EAPI Il_Kbd_Config *il_kbd_cfg;
+
+#endif
diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c
new file mode 100644
index 0000000..9f53f1c
--- /dev/null
+++ b/src/modules/illume-keyboard/e_mod_main.c
@@ -0,0 +1,117 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_kbd_int.h"
+
+/* local function prototypes */
+static void _il_kbd_stop(void);
+static void _il_kbd_start(void);
+static int _il_kbd_cb_exit(void *data, int type, void *event);
+
+/* local variables */
+static E_Kbd_Int *ki = NULL;
+static Ecore_Exe *_kbd_exe = NULL;
+static Ecore_Event_Handler *_kbd_exe_exit_handler = NULL;
+
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume Keyboard" };
+
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   if (!il_kbd_config_init(m)) return NULL;
+   _il_kbd_start();
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   _il_kbd_stop();
+   il_kbd_config_shutdown();
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return il_kbd_config_save();
+}
+
+EAPI void 
+il_kbd_cfg_update(void) 
+{
+   _il_kbd_stop();
+   _il_kbd_start();
+}
+
+static void 
+_il_kbd_stop(void) 
+{
+   if (ki) e_kbd_int_free(ki);
+   ki = NULL;
+   if (_kbd_exe) ecore_exe_interrupt(_kbd_exe);
+   _kbd_exe = NULL;
+   if (_kbd_exe_exit_handler) ecore_event_handler_del(_kbd_exe_exit_handler);
+   _kbd_exe_exit_handler = NULL;
+}
+
+static void 
+_il_kbd_start(void) 
+{
+   if (il_kbd_cfg->use_internal) 
+     {
+        ki = e_kbd_int_new(il_kbd_cfg->mod_dir, 
+                           il_kbd_cfg->mod_dir, il_kbd_cfg->mod_dir);
+     }
+   else if (il_kbd_cfg->run_keyboard) 
+     {
+        E_Exec_Instance *inst;
+        Efreet_Desktop *desktop;
+
+        desktop = efreet_util_desktop_file_id_find(il_kbd_cfg->run_keyboard);
+        if (!desktop) 
+          {
+             Eina_List *kbds, *l;
+
+             kbds = efreet_util_desktop_category_list("Keyboard");
+             if (kbds) 
+               {
+                  EINA_LIST_FOREACH(kbds, l, desktop) 
+                    {
+                       const char *dname;
+
+                       dname = ecore_file_file_get(desktop->orig_path);
+                       if (dname) 
+                         {
+                            if (!strcmp(dname, il_kbd_cfg->run_keyboard))
+                              break;
+                         }
+                    }
+               }
+          }
+        if (desktop) 
+          {
+             E_Zone *zone;
+
+             zone = e_util_container_zone_number_get(0, 0);
+             inst = e_exec(zone, desktop, NULL, NULL, "illume-keyboard");
+             if (inst) 
+               {
+                  _kbd_exe = inst->exe;
+                  _kbd_exe_exit_handler = 
+                    ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 
+                                            _il_kbd_cb_exit, NULL);
+               }
+          }
+     }
+}
+
+static int 
+_il_kbd_cb_exit(void *data, int type, void *event) 
+{
+   Ecore_Exe_Event_Del *ev;
+
+   ev = event;
+   if (ev->exe == _kbd_exe) _kbd_exe = NULL;
+   return 1;
+}
diff --git a/src/modules/illume-keyboard/e_mod_main.h b/src/modules/illume-keyboard/e_mod_main.h
new file mode 100644
index 0000000..fa25614
--- /dev/null
+++ b/src/modules/illume-keyboard/e_mod_main.h
@@ -0,0 +1,12 @@
+#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);
+
+EAPI void il_kbd_cfg_update(void);
+
+#endif
diff --git a/src/modules/illume/keyboards/Default.kbd b/src/modules/illume-keyboard/keyboards/Default.kbd
similarity index 100%
copy from src/modules/illume/keyboards/Default.kbd
copy to src/modules/illume-keyboard/keyboards/Default.kbd
diff --git a/src/modules/illume-keyboard/keyboards/Makefile.am b/src/modules/illume-keyboard/keyboards/Makefile.am
new file mode 100644
index 0000000..7fc25a0
--- /dev/null
+++ b/src/modules/illume-keyboard/keyboards/Makefile.am
@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-keyboard
+
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
+files_DATA = \
+            ignore_built_in_keyboards \
+            Default.kbd \
+            alpha.png \
+	    Numbers.kbd \
+            numeric.png \
+            Terminal.kbd \
+	    qwerty.png \
+	    up.png \
+	    down.png \
+	    left.png \
+            right.png \
+            shift.png \
+	    tab.png \
+	    enter.png \
+	    backspace.png
+
+EXTRA_DIST = $(files_DATA)
diff --git a/src/modules/illume-keyboard/keyboards/Makefile.in b/src/modules/illume-keyboard/keyboards/Makefile.in
new file mode 100644
index 0000000..a48a0de
--- /dev/null
+++ b/src/modules/illume-keyboard/keyboards/Makefile.in
@@ -0,0 +1,536 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-keyboard/keyboards
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+SOURCES =
+DIST_SOURCES =
+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)$(filesdir)"
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-keyboard
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
+files_DATA = \
+            ignore_built_in_keyboards \
+            Default.kbd \
+            alpha.png \
+	    Numbers.kbd \
+            numeric.png \
+            Terminal.kbd \
+	    qwerty.png \
+	    up.png \
+	    down.png \
+	    left.png \
+            right.png \
+            shift.png \
+	    tab.png \
+	    enter.png \
+	    backspace.png
+
+EXTRA_DIST = $(files_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-keyboard/keyboards/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-keyboard/keyboards/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
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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 $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-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 mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-filesDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-filesDATA
+
+# 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/illume/keyboards/Numbers.kbd b/src/modules/illume-keyboard/keyboards/Numbers.kbd
similarity index 100%
copy from src/modules/illume/keyboards/Numbers.kbd
copy to src/modules/illume-keyboard/keyboards/Numbers.kbd
diff --git a/src/modules/illume/keyboards/Terminal.kbd b/src/modules/illume-keyboard/keyboards/Terminal.kbd
similarity index 100%
copy from src/modules/illume/keyboards/Terminal.kbd
copy to src/modules/illume-keyboard/keyboards/Terminal.kbd
diff --git a/src/modules/illume/keyboards/alpha.png b/src/modules/illume-keyboard/keyboards/alpha.png
similarity index 100%
copy from src/modules/illume/keyboards/alpha.png
copy to src/modules/illume-keyboard/keyboards/alpha.png
diff --git a/src/modules/illume/keyboards/backspace.png b/src/modules/illume-keyboard/keyboards/backspace.png
similarity index 100%
copy from src/modules/illume/keyboards/backspace.png
copy to src/modules/illume-keyboard/keyboards/backspace.png
diff --git a/src/modules/illume/keyboards/down.png b/src/modules/illume-keyboard/keyboards/down.png
similarity index 100%
copy from src/modules/illume/keyboards/down.png
copy to src/modules/illume-keyboard/keyboards/down.png
diff --git a/src/modules/illume/keyboards/enter.png b/src/modules/illume-keyboard/keyboards/enter.png
similarity index 100%
copy from src/modules/illume/keyboards/enter.png
copy to src/modules/illume-keyboard/keyboards/enter.png
diff --git a/src/modules/illume/keyboards/ignore_built_in_keyboards b/src/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
similarity index 100%
copy from src/modules/illume/keyboards/ignore_built_in_keyboards
copy to src/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
diff --git a/src/modules/illume/keyboards/left.png b/src/modules/illume-keyboard/keyboards/left.png
similarity index 100%
copy from src/modules/illume/keyboards/left.png
copy to src/modules/illume-keyboard/keyboards/left.png
diff --git a/src/modules/illume/keyboards/numeric.png b/src/modules/illume-keyboard/keyboards/numeric.png
similarity index 100%
copy from src/modules/illume/keyboards/numeric.png
copy to src/modules/illume-keyboard/keyboards/numeric.png
diff --git a/src/modules/illume/keyboards/qwerty.png b/src/modules/illume-keyboard/keyboards/qwerty.png
similarity index 100%
copy from src/modules/illume/keyboards/qwerty.png
copy to src/modules/illume-keyboard/keyboards/qwerty.png
diff --git a/src/modules/illume/keyboards/right.png b/src/modules/illume-keyboard/keyboards/right.png
similarity index 100%
copy from src/modules/illume/keyboards/right.png
copy to src/modules/illume-keyboard/keyboards/right.png
diff --git a/src/modules/illume/keyboards/shift.png b/src/modules/illume-keyboard/keyboards/shift.png
similarity index 100%
copy from src/modules/illume/keyboards/shift.png
copy to src/modules/illume-keyboard/keyboards/shift.png
diff --git a/src/modules/illume/keyboards/tab.png b/src/modules/illume-keyboard/keyboards/tab.png
similarity index 100%
copy from src/modules/illume/keyboards/tab.png
copy to src/modules/illume-keyboard/keyboards/tab.png
diff --git a/src/modules/illume/keyboards/up.png b/src/modules/illume-keyboard/keyboards/up.png
similarity index 100%
copy from src/modules/illume/keyboards/up.png
copy to src/modules/illume-keyboard/keyboards/up.png
diff --git a/src/modules/illume-keyboard/module.desktop b/src/modules/illume-keyboard/module.desktop
new file mode 100644
index 0000000..9ba0da2
--- /dev/null
+++ b/src/modules/illume-keyboard/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Keyboard
+Icon=e-module-illume-keyboard
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Keyboard for Embedded</title>
diff --git a/src/modules/illume-keyboard/module.desktop.in b/src/modules/illume-keyboard/module.desktop.in
new file mode 100644
index 0000000..9ba0da2
--- /dev/null
+++ b/src/modules/illume-keyboard/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Keyboard
+Icon=e-module-illume-keyboard
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Keyboard for Embedded</title>
diff --git a/src/modules/illume-softkey/Makefile.am b/src/modules/illume-softkey/Makefile.am
new file mode 100644
index 0000000..fd95ff2
--- /dev/null
+++ b/src/modules/illume-softkey/Makefile.am
@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-softkey
+
+# 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_mod_config.c \
+                         e_mod_config.h \
+                         e_mod_win.c \
+                         e_mod_win.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/illume-softkey/Makefile.in b/src/modules/illume-softkey/Makefile.in
new file mode 100644
index 0000000..bb49b48
--- /dev/null
+++ b/src/modules/illume-softkey/Makefile.in
@@ -0,0 +1,683 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume-softkey
+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-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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_mod_config.lo e_mod_win.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--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@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume-softkey
+
+# 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_mod_config.c \
+                         e_mod_config.h \
+                         e_mod_win.c \
+                         e_mod_win.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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume-softkey/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume-softkey/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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) 
+	$(module_la_LINK) -rpath $(pkgdir) $(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_config.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_win.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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
+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; nonempty = 1; } \
+	      END { if (nonempty) { 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; nonempty = 1; } \
+	      END { if (nonempty) { 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=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+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-pkgLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.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-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-ps install-ps-am 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-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/illume-softkey/e-module-illume-softkey.edj b/src/modules/illume-softkey/e-module-illume-softkey.edj
new file mode 100644
index 0000000..dcb4bca
Binary files /dev/null and b/src/modules/illume-softkey/e-module-illume-softkey.edj differ
diff --git a/src/modules/illume-softkey/e_mod_config.c b/src/modules/illume-softkey/e_mod_config.c
new file mode 100644
index 0000000..54da81f
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_config.c
@@ -0,0 +1,65 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+
+EAPI Il_Sk_Config *il_sk_cfg = NULL;
+static E_Config_DD *conf_edd = NULL;
+
+/* public functions */
+int 
+il_sk_config_init(E_Module *m) 
+{
+   conf_edd = E_CONFIG_DD_NEW("Illume-Softkey_Cfg", Il_Sk_Config);
+   #undef T
+   #undef D
+   #define T Il_Sk_Config
+   #define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+
+   il_sk_cfg = e_config_domain_load("module.illume-softkey", conf_edd);
+   if ((il_sk_cfg) && 
+       ((il_sk_cfg->version >> 16) < IL_CONFIG_MAJ)) 
+     {
+        E_FREE(il_sk_cfg);
+        il_sk_cfg = NULL;
+     }
+   if (!il_sk_cfg) 
+     {
+        il_sk_cfg = E_NEW(Il_Sk_Config, 1);
+        il_sk_cfg->version = 0;
+     }
+   if (il_sk_cfg) 
+     {
+        /* Add new config variables here */
+        /* if ((il_sk_cfg->version & 0xffff) < 1) */
+        il_sk_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
+     }
+   il_sk_cfg->mod_dir = eina_stringshare_add(m->dir);
+   return 1;
+}
+
+int 
+il_sk_config_shutdown(void) 
+{
+   if (il_sk_cfg->mod_dir) eina_stringshare_del(il_sk_cfg->mod_dir);
+   il_sk_cfg->mod_dir = NULL;
+
+   E_FREE(il_sk_cfg);
+   il_sk_cfg = NULL;
+
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+int 
+il_sk_config_save(void) 
+{
+   e_config_domain_save("module.illume-softkey", conf_edd, il_sk_cfg);
+   return 1;
+}
+
+void 
+il_sk_config_show(E_Container *con, const char *params) 
+{
+
+}
diff --git a/src/modules/illume-softkey/e_mod_config.h b/src/modules/illume-softkey/e_mod_config.h
new file mode 100644
index 0000000..735118a
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_config.h
@@ -0,0 +1,22 @@
+#ifndef E_MOD_CONFIG_H
+#define E_MOD_CONFIG_H
+
+#define IL_CONFIG_MIN 0
+#define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Sk_Config Il_Sk_Config;
+struct _Il_Sk_Config 
+{
+   int version;
+
+   const char *mod_dir;
+};
+
+int il_sk_config_init(E_Module *m);
+int il_sk_config_shutdown(void);
+int il_sk_config_save(void);
+void il_sk_config_show(E_Container *con, const char *params);
+
+extern EAPI Il_Sk_Config *il_sk_cfg;
+
+#endif
diff --git a/src/modules/illume-softkey/e_mod_main.c b/src/modules/illume-softkey/e_mod_main.c
new file mode 100644
index 0000000..e192f5c
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_main.c
@@ -0,0 +1,40 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_win.h"
+
+static Il_Sk_Win *swin = NULL;
+
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume-Softkey" };
+
+/* public functions */
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   if (!il_sk_config_init(m)) return NULL;
+
+   e_mod_sk_win_init();
+
+   swin = e_mod_sk_win_new();
+
+   return m;
+}
+
+EAPI int 
+e_modapi_shutdown(E_Module *m) 
+{
+   e_object_del(E_OBJECT(swin));
+   swin = NULL;
+
+   e_mod_sk_win_shutdown();
+
+   il_sk_config_shutdown();
+
+   return 1;
+}
+
+EAPI int 
+e_modapi_save(E_Module *m) 
+{
+   return il_sk_config_save();
+}
diff --git a/src/modules/illume-softkey/e_mod_main.h b/src/modules/illume-softkey/e_mod_main.h
new file mode 100644
index 0000000..322430d
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_main.h
@@ -0,0 +1,23 @@
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define IL_SK_WIN_TYPE 0xE1b0784
+
+typedef struct _Il_Sk_Win Il_Sk_Win;
+
+struct _Il_Sk_Win 
+{
+   E_Object e_obj_inherit;
+
+   E_Win *win;
+   Evas_Object *o_base, *o_box;
+   Evas_Object *b_close, *b_back;
+};
+
+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/illume-softkey/e_mod_win.c b/src/modules/illume-softkey/e_mod_win.c
new file mode 100644
index 0000000..602023d
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_win.c
@@ -0,0 +1,123 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_win.h"
+
+/* local function prototypes */
+static void _il_sk_win_cb_free(Il_Sk_Win *win);
+static void _il_sk_win_cb_resize(E_Win *win);
+static void _il_sk_win_cb_back_click(void *data, void *data2);
+static void _il_sk_win_cb_close_click(void *data, void *data2);
+
+int 
+e_mod_sk_win_init(void) 
+{
+   return 1;
+}
+
+int 
+e_mod_sk_win_shutdown(void) 
+{
+   return 1;
+}
+
+Il_Sk_Win *
+e_mod_sk_win_new(void) 
+{
+   Il_Sk_Win *swin;
+   E_Zone *zone;
+   Evas *evas;
+   Ecore_X_Window_State states[2];
+   char buff[PATH_MAX];
+
+   swin = E_OBJECT_ALLOC(Il_Sk_Win, IL_SK_WIN_TYPE, _il_sk_win_cb_free);
+   if (!swin) return NULL;
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume-softkey.edj", 
+            il_sk_cfg->mod_dir);
+
+   swin->win = e_win_new(e_util_container_number_get(0));
+   states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
+   states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
+   ecore_x_netwm_window_state_set(swin->win->evas_win, states, 2);
+   ecore_x_icccm_hints_set(swin->win->evas_win, 0, 0, 0, 0, 0, 0, 0);
+   ecore_x_netwm_window_type_set(swin->win->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
+
+   e_win_no_remember_set(swin->win, 1);
+   e_win_resize_callback_set(swin->win, _il_sk_win_cb_resize);
+   e_win_borderless_set(swin->win, 1);
+   swin->win->data = swin;
+   e_win_title_set(swin->win, _("Illume Softkey"));
+   e_win_name_class_set(swin->win, "Illume-Softkey", "Illume-Softkey");
+
+   evas = e_win_evas_get(swin->win);
+
+   zone = e_util_container_zone_number_get(0, 0);
+
+   swin->o_base = edje_object_add(evas);
+   if (!e_theme_edje_object_set(swin->o_base, "base/theme/modules/illume-softkey", 
+                                "modules/illume-softkey/window"))
+     edje_object_file_set(swin->o_base, buff, "modules/illume-softkey/window");
+   evas_object_move(swin->o_base, 0, 0);
+   evas_object_resize(swin->o_base, zone->w, 32);
+   evas_object_show(swin->o_base);
+
+   swin->o_box = e_widget_list_add(evas, 1, 1);
+   edje_object_part_swallow(swin->o_base, "e.swallow.buttons", swin->o_box);
+
+   swin->b_back = e_widget_button_add(evas, NULL, "go-previous", 
+                                      _il_sk_win_cb_back_click, swin, NULL);
+   e_widget_list_object_append(swin->o_box, swin->b_back, 1, 0, 0.5);
+
+   swin->b_close = e_widget_button_add(evas, NULL, "window-close", 
+                                       _il_sk_win_cb_close_click, swin, NULL);
+   e_widget_list_object_append(swin->o_box, swin->b_close, 1, 0, 0.5);
+
+   e_win_size_min_set(swin->win, zone->w, 32);
+   e_win_show(swin->win);
+   e_win_move_resize(swin->win, 0, (zone->h - 32), zone->w, 32);
+
+   return swin;
+}
+
+/* local functions */
+static void 
+_il_sk_win_cb_free(Il_Sk_Win *win) 
+{
+   if (win->b_close) evas_object_del(win->b_close);
+   if (win->b_back) evas_object_del(win->b_back);
+   if (win->o_box) evas_object_del(win->o_box);
+   if (win->o_base) evas_object_del(win->o_base);
+   e_object_del(E_OBJECT(win->win));
+   E_FREE(win);
+}
+
+static void 
+_il_sk_win_cb_resize(E_Win *win) 
+{
+   Il_Sk_Win *swin;
+
+   if (!(swin = win->data)) return;
+   evas_object_resize(swin->o_base, swin->win->w, swin->win->h);
+}
+
+static void 
+_il_sk_win_cb_back_click(void *data, void *data2) 
+{
+   Il_Sk_Win *swin;
+   E_Border *bd;
+
+   if (!(swin = data)) return;
+   if (!(bd = e_border_focused_get())) return;
+}
+
+static void 
+_il_sk_win_cb_close_click(void *data, void *data2) 
+{
+   Il_Sk_Win *swin;
+   E_Border *bd;
+
+   if (!(swin = data)) return;
+   if (!(bd = e_border_focused_get())) return;
+   e_border_act_close_begin(bd);
+}
diff --git a/src/modules/illume-softkey/e_mod_win.h b/src/modules/illume-softkey/e_mod_win.h
new file mode 100644
index 0000000..ae24e02
--- /dev/null
+++ b/src/modules/illume-softkey/e_mod_win.h
@@ -0,0 +1,8 @@
+#ifndef E_MOD_WIN_H
+#define E_MOD_WIN_H
+
+int e_mod_sk_win_init(void);
+int e_mod_sk_win_shutdown(void);
+Il_Sk_Win *e_mod_sk_win_new(void);
+
+#endif
diff --git a/src/modules/illume-softkey/module.desktop b/src/modules/illume-softkey/module.desktop
new file mode 100644
index 0000000..1ae0e2f
--- /dev/null
+++ b/src/modules/illume-softkey/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Softkey
+Icon=e-module-illume-softkey
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Softkey for Embedded</title>
diff --git a/src/modules/illume-softkey/module.desktop.in b/src/modules/illume-softkey/module.desktop.in
new file mode 100644
index 0000000..1ae0e2f
--- /dev/null
+++ b/src/modules/illume-softkey/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume-Softkey
+Icon=e-module-illume-softkey
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume Softkey for Embedded</title>
diff --git a/src/modules/illume/Makefile.in b/src/modules/illume/Makefile.in
index 1137633..0ce5ec4 100644
--- a/src/modules/illume/Makefile.in
+++ b/src/modules/illume/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -366,6 +366,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -453,8 +454,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -691,7 +692,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/illume/dicts/Makefile.in b/src/modules/illume/dicts/Makefile.in
index 33f4977..0263192 100644
--- a/src/modules/illume/dicts/Makefile.in
+++ b/src/modules/illume/dicts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -336,8 +337,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c
index 3b52918..56c3f62 100644
--- a/src/modules/illume/e_cfg.c
+++ b/src/modules/illume/e_cfg.c
@@ -1204,7 +1204,7 @@ _e_cfg_win_complete(Evas_Object *ol)
    win = evas_object_data_get(ol, "win");
    d = win->data;
 
-   e_widget_min_size_get(ol, &mw, &mh);
+   e_widget_size_min_get(ol, &mw, &mh);
    evas_object_resize(ol, mw, mh);
 
    sf = e_widget_scrollframe_simple_add(evas_object_evas_get(ol), ol);
diff --git a/src/modules/illume/e_kbd.c b/src/modules/illume/e_kbd.c
index 2855674..373eef3 100644
--- a/src/modules/illume/e_kbd.c
+++ b/src/modules/illume/e_kbd.c
@@ -764,12 +764,11 @@ _e_kbd_dbus_cb_dev_add(void *data, DBusMessage *msg)
 {
    DBusError err;
    char *udi;
-   int ret;
         
    dbus_error_init(&err);
    dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
    udi = strdup(udi);
-   ret = e_hal_device_query_capability(_e_kbd_dbus_conn, udi, "input.keyboard",
+   e_hal_device_query_capability(_e_kbd_dbus_conn, udi, "input.keyboard",
                                        _e_kbd_dbus_cb_input_keyboard_is, 
 				       strdup(udi));
 }
diff --git a/src/modules/illume/e_kbd_dict.c b/src/modules/illume/e_kbd_dict.c
index 9123db6..201a328 100644
--- a/src/modules/illume/e_kbd_dict.c
+++ b/src/modules/illume/e_kbd_dict.c
@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-
 #define MAXLATIN 0x100
+
 static unsigned char _e_kbd_normalise_base[MAXLATIN];
 static unsigned char _e_kbd_normalise_ready = 0;
 
diff --git a/src/modules/illume/e_kbd_int.c b/src/modules/illume/e_kbd_int.c
index 5fe90c4..0cefa4d 100644
--- a/src/modules/illume/e_kbd_int.c
+++ b/src/modules/illume/e_kbd_int.c
@@ -310,7 +310,7 @@ _e_kbd_int_matches_update(E_Kbd_Int *ki)
 	for (i = 0, l = matches; l; l = l->next, i++)
 	  {
 	     _e_kbd_int_matches_add(ki, l->data, i);
-	     e_box_min_size_get(ki->box_obj, &mw, &mh);
+	     e_box_size_min_get(ki->box_obj, &mw, &mh);
 	     edje_object_part_geometry_get(ki->base_obj, "e.swallow.label", 
 					   NULL, NULL, &vw, &vh);
 	     if (mw > vw) break;
@@ -330,7 +330,7 @@ _e_kbd_int_matches_update(E_Kbd_Int *ki)
 	  }
      }
    e_box_thaw(ki->box_obj);
-   e_box_min_size_get(ki->box_obj, &mw, &mh);
+   e_box_size_min_get(ki->box_obj, &mw, &mh);
    edje_extern_object_min_size_set(ki->box_obj, 0, mh);
    edje_object_part_swallow(ki->base_obj, "e.swallow.label", ki->box_obj);
    evas_event_thaw(ki->win->evas);
@@ -440,6 +440,16 @@ _e_kbd_int_key_press_handle(E_Kbd_Int *ki, Evas_Coord dx, Evas_Coord dy)
 static void
 _e_kbd_int_stroke_handle(E_Kbd_Int *ki, int dir)
 {
+   /* If the keyboard direction is RTL switch dir 3 and 1
+    * i.e, make forward backwards and the other way around */
+   if (ki->layout.direction == E_KBD_INT_DIRECTION_RTL)
+     {
+        if (dir == 3)
+		dir = 1;
+	else if (dir == 1)
+		dir = 3;
+     }
+     
    if (dir == 4) // up
      {
 	_e_kbd_int_layout_next(ki);
@@ -897,6 +907,10 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
    if (!f) return;
    ki->layout.directory = ecore_file_dir_get(layout);
    ki->layout.file = eina_stringshare_add(layout);
+
+   /* Make the default direction LTR */
+   ki->layout.direction = E_KBD_INT_DIRECTION_LTR;
+   
    while (fgets(buf, sizeof(buf), f))
      {
 	int len;
@@ -924,6 +938,17 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
 	     sscanf(buf, "%*s %i\n", &(ki->layout.fuzz));
 	     continue;
 	  }
+	if (!strcmp(str, "direction"))
+	  {
+	     char direction[4];
+	     sscanf(buf, "%*s %3s\n", direction);
+	     /* If rtl mark as rtl, otherwise make it ltr */
+	     if (!strcmp(direction, "rtl"))
+	     	ki->layout.direction = E_KBD_INT_DIRECTION_RTL;
+	     else
+	     	ki->layout.direction = E_KBD_INT_DIRECTION_LTR;
+	     continue;
+	  }
 	if (!strcmp(str, "key"))
 	  {
 	     ky = calloc(1, sizeof(E_Kbd_Int_Key));
diff --git a/src/modules/illume/e_kbd_int.h b/src/modules/illume/e_kbd_int.h
index 4c26751..f701821 100644
--- a/src/modules/illume/e_kbd_int.h
+++ b/src/modules/illume/e_kbd_int.h
@@ -15,6 +15,13 @@ typedef enum _E_Kbd_Int_Type
    E_KBD_INT_TYPE_PASSWORD = (1 << 6)
 } E_Kbd_Int_Type;
 
+/* The natural text direction of the keyboard */
+typedef enum _E_kbd_Int_Direction
+{
+	E_KBD_INT_DIRECTION_LTR = (1 << 0),
+	E_KBD_INT_DIRECTION_RTL = (1 << 1)
+} E_Kbd_Int_Direction;
+
 typedef struct _E_Kbd_Int           E_Kbd_Int;
 typedef struct _E_Kbd_Int_Key       E_Kbd_Int_Key;
 typedef struct _E_Kbd_Int_Key_State E_Kbd_Int_Key_State;
@@ -34,6 +41,7 @@ struct _E_Kbd_Int
       const char       *file;
       int               w, h;
       int               fuzz;
+      int		direction;
       E_Kbd_Int_Type    type;
       Eina_List        *keys;
       E_Kbd_Int_Key    *pressed;
diff --git a/src/modules/illume/e_mod_layout.c b/src/modules/illume/e_mod_layout.c
index ef13ca4..7a3588f 100644
--- a/src/modules/illume/e_mod_layout.c
+++ b/src/modules/illume/e_mod_layout.c
@@ -409,7 +409,6 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
 {
    int wx = 0, wy = 0, ww = 0, wh = 0;
    int wx2 = 0, wy2 = 0, ww2 = 0, wh2 = 0;
-   int center = 0;
    int isdialog = 0;
    int pbx, pby, pbw, pbh;
    
diff --git a/src/modules/illume/e_mod_win.c b/src/modules/illume/e_mod_win.c
index 40fa13d..76c6fe8 100644
--- a/src/modules/illume/e_mod_win.c
+++ b/src/modules/illume/e_mod_win.c
@@ -562,7 +562,7 @@ _cb_resize(void)
    h -= flaunch->height;
    if (bx)
      {
-	e_box_min_size_get(bx, &mw, &mh);
+	e_box_size_min_get(bx, &mw, &mh);
 	if (mw < w) mw = w;
 	evas_object_move(sf, x, y);
 	evas_object_resize(bx, mw, mh);
@@ -1011,7 +1011,7 @@ _apps_fm_config(Evas_Object *o)
 static void
 _apps_populate(void)
 {
-   Evas_Coord mw, mh, sfw, sfh;
+   Evas_Coord sfw, sfh;
    Evas_Object *o = NULL;
    char buf[PATH_MAX];
    int num = 0;
diff --git a/src/modules/illume/e_winilist.c b/src/modules/illume/e_winilist.c
index 0873a37..947b956 100644
--- a/src/modules/illume/e_winilist.c
+++ b/src/modules/illume/e_winilist.c
@@ -263,7 +263,7 @@ _cb_object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
    
    d = evas_object_data_get(obj, "..[winilist]");
    if (!d) return;
-   e_ilist_min_size_get(d->o_ilist, &lw, &lh);
+   e_ilist_size_min_get(d->o_ilist, &lw, &lh);
    if (lh < (120 * e_scale)) lh = 120 * e_scale;
    printf("%i\n", lh);
    e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
@@ -403,7 +403,7 @@ _refill(Data *d)
    e_ilist_thaw(d->o_ilist);
    
    /* FIXME: figure out optimal size */
-   e_ilist_min_size_get(d->o_ilist, &lw, &lh);
+   e_ilist_size_min_get(d->o_ilist, &lw, &lh);
    if (lh < (120 * e_scale)) lh = 120 * e_scale;
    printf("%i\n", lh);
    e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
diff --git a/src/modules/illume/keyboards/Makefile.in b/src/modules/illume/keyboards/Makefile.in
index 6d2110d..d905aac 100644
--- a/src/modules/illume/keyboards/Makefile.in
+++ b/src/modules/illume/keyboards/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -317,6 +317,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -349,8 +350,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am
new file mode 100644
index 0000000..9704abf
--- /dev/null
+++ b/src/modules/illume2/Makefile.am
@@ -0,0 +1,50 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume2
+SUBDIRS = keyboards
+
+# 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.h \
+                         e_mod_main.c \
+                         e_mod_layout.h \
+		         e_mod_layout.c \
+                         e_mod_layout_illume.h \
+                         e_mod_layout_illume.c \
+                         e_kbd.h \
+                         e_kbd.c \
+                         e_mod_config.h \
+                         e_mod_config.c \
+                         e_mod_animation.h \
+                         e_mod_animation.c \
+                         e_mod_windows.h \
+                         e_mod_windows.c \
+                         e_mod_select_window.h \
+                         e_mod_select_window.c \
+                         e_mod_policy.h \
+                         e_mod_policy.c \
+                         e_mod_policy_settings.h \
+                         e_mod_policy_settings.c \
+                         e_mod_gadcon.h \
+                         e_mod_gadcon.c
+
+module_la_LIBADD       = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume2/Makefile.in b/src/modules/illume2/Makefile.in
new file mode 100644
index 0000000..73ca55d
--- /dev/null
+++ b/src/modules/illume2/Makefile.in
@@ -0,0 +1,824 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume2
+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-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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_mod_layout.lo \
+	e_mod_layout_illume.lo e_kbd.lo e_mod_config.lo \
+	e_mod_animation.lo e_mod_windows.lo e_mod_select_window.lo \
+	e_mod_policy.lo e_mod_policy_settings.lo e_mod_gadcon.lo
+module_la_OBJECTS = $(am_module_la_OBJECTS)
+module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(module_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -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 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(module_la_SOURCES)
+DIST_SOURCES = $(module_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume2
+SUBDIRS = keyboards
+
+# 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.h \
+                         e_mod_main.c \
+                         e_mod_layout.h \
+		         e_mod_layout.c \
+                         e_mod_layout_illume.h \
+                         e_mod_layout_illume.c \
+                         e_kbd.h \
+                         e_kbd.c \
+                         e_mod_config.h \
+                         e_mod_config.c \
+                         e_mod_animation.h \
+                         e_mod_animation.c \
+                         e_mod_windows.h \
+                         e_mod_windows.c \
+                         e_mod_select_window.h \
+                         e_mod_select_window.c \
+                         e_mod_policy.h \
+                         e_mod_policy.c \
+                         e_mod_policy_settings.h \
+                         e_mod_policy_settings.c \
+                         e_mod_gadcon.h \
+                         e_mod_gadcon.c
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+all: all-recursive
+
+.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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume2/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume2/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) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkgdir)/$$f'"; \
+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkgLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkgdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-pkgLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkg_LTLIBRARIES)'; for p in $$list; do \
+	  p=$(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkgdir)/$$p'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --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) 
+	$(module_la_LINK) -rpath $(pkgdir) $(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_kbd.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_animation.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_config.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_gadcon.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_layout.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_layout_illume.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_main.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_policy.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_policy_settings.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_select_window.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/e_mod_windows.Plo at am__quote@
+
+.c.o:
+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 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@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ 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
+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
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	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; nonempty = 1; } \
+	      END { if (nonempty) { 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)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgdir)" "$(DESTDIR)$(filesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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-recursive
+
+clean-am: clean-generic clean-libtool clean-pkgLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-filesDATA install-pkgLTLIBRARIES
+
+install-dvi: install-dvi-recursive
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-info: install-info-recursive
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA uninstall-pkgLTLIBRARIES
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic clean-libtool \
+	clean-pkgLTLIBRARIES ctags ctags-recursive 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-dvi \
+	install-dvi-am install-exec install-exec-am install-filesDATA \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pkgLTLIBRARIES \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am uninstall-filesDATA \
+	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/illume2/e-module-illume2.edj b/src/modules/illume2/e-module-illume2.edj
new file mode 100644
index 0000000..0853076
Binary files /dev/null and b/src/modules/illume2/e-module-illume2.edj differ
diff --git a/src/modules/illume2/e_kbd.c b/src/modules/illume2/e_kbd.c
new file mode 100644
index 0000000..5acb534
--- /dev/null
+++ b/src/modules/illume2/e_kbd.c
@@ -0,0 +1,1106 @@
+#include "e.h"
+#include "e_kbd.h"
+#include "e_mod_layout.h"
+#include "e_mod_config.h"
+
+static Eina_List *handlers = NULL;
+static Eina_List *kbds = NULL;
+static Ecore_X_Atom atom_mb_im_invoker_command = 0;
+static Ecore_X_Atom atom_mtp_im_invoker_command = 0;
+static Eina_List *border_hooks = NULL;
+static E_Border *focused_border = NULL;
+static Ecore_X_Atom focused_vkbd_state = 0;
+static E_Module *mod = NULL;
+static Ecore_Job *_e_kbd_apply_all_job = NULL;
+
+#define ICONIFY_TO_HIDE 0
+
+static void _e_kbd_layout_send(E_Kbd *kbd);
+
+static void
+_e_kbd_cb_apply_all_job(void *data)
+{
+//   _e_mod_layout_apply_all();
+   _e_kbd_apply_all_job = NULL;
+}
+
+static void
+_e_kbd_apply_all_job_queue(void)
+{
+   if (_e_kbd_apply_all_job) ecore_job_del(_e_kbd_apply_all_job);
+   _e_kbd_apply_all_job = ecore_job_add(_e_kbd_cb_apply_all_job, NULL);
+}
+
+static void
+_e_kbd_apply_all_job_queue_end(void)
+{
+   if (_e_kbd_apply_all_job) ecore_job_del(_e_kbd_apply_all_job);
+   _e_kbd_apply_all_job = NULL;
+}
+
+static void
+_e_kbd_border_hide(E_Border *bd)
+{
+   if (!bd) return;
+#ifdef ICONIFY_TO_HIDE
+   e_border_iconify(bd);
+#else
+   e_border_hide(bd, 2);
+#endif   
+}
+
+static void
+_e_kbd_border_show(E_Kbd *kbd, E_Border *bd)
+{
+   if (!bd) return;
+   e_border_uniconify(bd);
+   if (kbd->fullscreen)
+     e_border_layer_set(kbd->border, 250);
+   else
+     e_border_layer_set(kbd->border, 100);
+   e_border_show(bd);
+   e_border_raise(bd);
+}
+
+static int
+_e_kbd_cb_animate(void *data)
+{
+   E_Kbd *kbd;
+   double t, v;
+
+   kbd = data;
+   t = ecore_loop_time_get() - kbd->start;
+   if (t > kbd->len) t = kbd->len;
+   if (kbd->len > 0.0)
+     {
+	v = t / kbd->len;
+	v = 1.0 - v;
+	v = v * v * v * v;
+	v = 1.0 - v;
+     }
+   else
+     {
+	t = kbd->len;
+	v = 1.0;
+     }
+   kbd->adjust = (kbd->adjust_end * v) + (kbd->adjust_start  * (1.0 - v));
+   if (kbd->border)
+     e_border_fx_offset(kbd->border, 0, kbd->border->h - kbd->adjust);
+   if (t == kbd->len)
+     {
+	kbd->animator = NULL;
+	if (!kbd->visible)
+	  {
+	     _e_kbd_border_hide(kbd->border);
+	     kbd->actually_visible = kbd->visible;
+	  }
+	_e_kbd_apply_all_job_queue();
+	_e_kbd_layout_send(kbd);
+	return 0;
+     }
+   return 1;
+}
+
+static void
+_e_kbd_free(E_Kbd *kbd)
+{
+   E_Border *bd;
+
+   kbds = eina_list_remove(kbds, kbd);
+   if (kbd->animator) ecore_animator_del(kbd->animator);
+   if (kbd->delay_hide) ecore_timer_del(kbd->delay_hide);
+// FIXME: thought right - on shutdown, this might point to freed data
+//   if (kbd->border) kbd->border->stolen = 0;
+   EINA_LIST_FREE(kbd->waiting_borders, bd)
+     bd->stolen = 0;
+   free(kbd);
+}
+
+static void
+_e_kbd_slide(E_Kbd *kbd, int visible, double len)
+{
+   _e_kbd_apply_all_job_queue();
+   kbd->start = ecore_loop_time_get();
+   kbd->len = len;
+   kbd->adjust_start = kbd->adjust;
+   kbd->adjust_end = 0;
+   if ((visible) && (kbd->border))
+     kbd->adjust_end = kbd->border->h;
+   if (!kbd->animator)
+     kbd->animator = ecore_animator_add(_e_kbd_cb_animate, kbd);
+}
+
+static void 
+_e_kbd_hide(E_Kbd *kbd)
+{
+   if (kbd->visible) return;
+   if (il_cfg->sliding.kbd.duration <= 0)
+     {
+	_e_kbd_border_hide(kbd->border);
+	kbd->actually_visible = kbd->visible;
+	_e_kbd_apply_all_job_queue();
+	_e_kbd_layout_send(kbd);
+     }
+   else
+     _e_kbd_slide(kbd, 0, (double)il_cfg->sliding.kbd.duration / 1000.0);
+}
+
+static int
+_e_kbd_border_is_keyboard(E_Border *bd)
+{
+   if ((bd->client.vkbd.vkbd) || /* explicit hint that its a virtual keyboard */
+       /* legacy */
+       ( /* trap the matchbox qwerty and multitap kbd's */
+	 (((bd->client.icccm.title) && (!strcmp(bd->client.icccm.title, "Keyboard"))) ||
+	  ((bd->client.icccm.name) && ((!strcmp(bd->client.icccm.name, "multitap-pad")))))
+	 && (bd->client.netwm.state.skip_taskbar)
+	 && (bd->client.netwm.state.skip_pager)))
+     return 1;
+   return 0;
+}
+
+static void
+_e_kbd_border_adopt(E_Kbd *kbd, E_Border *bd)
+{
+   kbd->border = bd;
+   bd->sticky = 1;
+   if (kbd->fullscreen)
+     e_border_layer_set(kbd->border, 250);
+   else
+     e_border_layer_set(kbd->border, 100);
+   if (!kbd->actually_visible)
+     {
+	e_border_fx_offset(kbd->border, 0, kbd->border->h);
+	_e_kbd_layout_send(kbd);
+     }
+   kbd->h = kbd->border->h;
+}
+
+static E_Kbd * 
+_e_kbd_by_border_get(E_Border *bd)
+{
+   Eina_List *l, *l2;
+   E_Border *over;
+   E_Kbd *kbd;
+
+   if (!bd->stolen) return NULL;
+   EINA_LIST_FOREACH(kbds, l, kbd)
+     {
+	if (kbd->border == bd) return kbd;
+	EINA_LIST_FOREACH(kbd->waiting_borders, l2, over)
+	  if (over == bd) return kbd;
+     }
+   return NULL;
+}
+
+static int
+_e_kbd_cb_delayed_hide(void *data)
+{
+   E_Kbd *kbd;
+
+   kbd = data;
+   _e_kbd_hide(kbd);
+   kbd->delay_hide = NULL;
+   return 0;
+}
+
+static void
+_e_kbd_all_enable(void)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd)
+     e_kbd_enable(kbd);
+}
+
+static void
+_e_kbd_all_disable(void)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd)
+     e_kbd_disable(kbd);
+}
+
+static void
+_e_kbd_all_show(void)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd) 
+     e_kbd_show(kbd);
+}
+
+static void
+_e_kbd_all_layout_set(E_Kbd_Layout layout)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd)
+     e_kbd_layout_set(kbd, layout);
+}
+
+static void
+_e_kbd_all_hide(void)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd) 
+     e_kbd_hide(kbd);
+}
+
+static void
+_e_kbd_all_toggle(void)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd) 
+     {
+        if (kbd->visible) e_kbd_hide(kbd);
+        else e_kbd_show(kbd);
+     }
+}
+
+static int
+_e_kbd_cb_client_message(void *data, int type, void *event)
+{
+   Ecore_X_Event_Client_Message *ev;
+
+   ev = event;
+   if ((ev->win == ecore_x_window_root_first_get()) &&
+       ((ev->message_type == atom_mb_im_invoker_command) ||
+	(ev->message_type == atom_mtp_im_invoker_command)))
+     {
+	if (ev->data.l[0] == 1) _e_kbd_all_show();
+	else if (ev->data.l[0] == 2) _e_kbd_all_hide();
+	else if (ev->data.l[0] == 3) _e_kbd_all_toggle();
+     }
+   return 1;
+}
+
+static int
+_e_kbd_cb_border_add(void *data, int type, void *event)
+{
+   E_Event_Border_Add *ev;
+
+   ev = event;
+   // nothing - border hooks do this
+   return 1;
+}
+
+static int
+_e_kbd_cb_border_remove(void *data, int type, void *event)
+{
+   E_Event_Border_Remove *ev;
+   E_Kbd *kbd;
+
+   ev = event;
+   if (ev->border == focused_border)
+     {
+	focused_border = NULL;
+	focused_vkbd_state = 0;
+	return 1;
+     }
+   // if border is in a created kbd - unstore
+   kbd = _e_kbd_by_border_get(ev->border);
+   if (!kbd) return 1;
+   if (kbd->border == ev->border)
+     {
+	kbd->border = NULL;
+	if (kbd->waiting_borders)
+	  {
+	     E_Border *bd;
+
+	     bd = kbd->waiting_borders->data;
+	     kbd->waiting_borders = eina_list_remove_list(kbd->waiting_borders, kbd->waiting_borders);
+	     _e_kbd_border_adopt(kbd, bd);
+	  }
+	if (kbd->visible)
+	  {
+	     kbd->visible = 0;
+	     _e_kbd_border_hide(kbd->border);
+	     kbd->actually_visible = kbd->visible;
+	     e_kbd_show(kbd);
+	  }
+	_e_kbd_apply_all_job_queue();
+     }
+   else
+     kbd->waiting_borders = eina_list_remove(kbd->waiting_borders, ev->border);
+   return 1;
+}
+
+static int
+_e_kbd_cb_border_focus_in(void *data, int type, void *event)
+{
+   E_Event_Border_Focus_In *ev;
+
+   ev = event;
+   if (_e_kbd_by_border_get(ev->border)) return 1;
+   // FIXME: if ev->border->client.vkbd.state == 0 then this app doesnt know
+   // how to request for a virtual keyboard and so we should have a manual
+   // override
+   if ((ev->border->need_fullscreen) || (ev->border->fullscreen))
+     e_kbd_fullscreen_set(ev->border->zone, 1);
+   else e_kbd_fullscreen_set(ev->border->zone, 0);
+   focused_border = ev->border;
+   focused_vkbd_state = ev->border->client.vkbd.state;
+   if (ev->border->client.vkbd.state == 0) return 1;
+   if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+     {
+	_e_kbd_all_layout_set(E_KBD_LAYOUT_NONE);
+	_e_kbd_all_hide();
+	return 1;
+     }
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_ALPHA);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_NUMERIC)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_NUMERIC);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_PIN);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_PHONE_NUMBER);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_HEX);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_TERMINAL);
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD)
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_PASSWORD);
+   else
+     _e_kbd_all_layout_set(E_KBD_LAYOUT_DEFAULT);
+   _e_kbd_all_show();
+   return 1;
+}
+
+static int
+_e_kbd_cb_border_focus_out(void *data, int type, void *event)
+{
+   E_Event_Border_Focus_Out *ev;
+
+   ev = event;
+   if (_e_kbd_by_border_get(ev->border)) return 1;
+   if ((ev->border->need_fullscreen) || (ev->border->fullscreen))
+     e_kbd_fullscreen_set(ev->border->zone, 1);
+   else e_kbd_fullscreen_set(ev->border->zone, 0);
+   _e_kbd_all_layout_set(E_KBD_LAYOUT_NONE);
+   _e_kbd_all_hide();
+   focused_border = NULL;
+   focused_vkbd_state = 0;
+   return 1;
+}
+
+static int
+_e_kbd_cb_border_property(void *data, int type, void *event)
+{
+   E_Event_Border_Property *ev;
+
+   ev = event;
+   if (_e_kbd_by_border_get(ev->border)) return 1;
+   if (!ev->border->focused) return 1;
+   /* nothing happened to vkbd prop - leave everything alone */
+   if ((ev->border == focused_border) &&
+       (ev->border->client.vkbd.state == focused_vkbd_state))
+     return 1;
+   focused_vkbd_state = ev->border->client.vkbd.state;
+   /* app doesn't know what to do - just leave everything as-is */
+   if ((ev->border->need_fullscreen) || (ev->border->fullscreen))
+     e_kbd_fullscreen_set(ev->border->zone, 1);
+   else e_kbd_fullscreen_set(ev->border->zone, 0);
+   if (ev->border->client.vkbd.state == 0)
+     return 1;
+   /* app wants kbd off - then kbd off it is */
+   else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
+     _e_kbd_all_hide();
+   /* app wants something else than off... */
+   else
+     {
+	if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_ALPHA);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_NUMERIC)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_NUMERIC);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_PIN);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_PHONE_NUMBER);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_HEX);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_TERMINAL);
+	else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD)
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_PASSWORD);
+	else
+	  _e_kbd_all_layout_set(E_KBD_LAYOUT_DEFAULT);
+	_e_kbd_all_show();
+     }
+   return 1;
+}
+
+static void
+_e_kbd_cb_border_hook_pre_post_fetch(void *data, void *data2)
+{
+   E_Border *bd;
+
+   if (!(bd = data2)) return;
+   // check if bd has special kbd properites - if so, store in created kbd
+   if (!bd->new_client) return;
+   if (_e_kbd_by_border_get(bd)) return;
+   if (_e_kbd_border_is_keyboard(bd))
+     {
+	Eina_List *l;
+        E_Kbd *kbd;
+
+	EINA_LIST_FOREACH(kbds, l, kbd)
+          {
+	     if (!kbd->border)
+	       {
+		  _e_kbd_border_adopt(kbd, bd);
+		  bd->stolen = 1;
+		  if (bd->remember)
+		    {
+		       if (bd->bordername)
+			 {
+			    eina_stringshare_del(bd->bordername);
+			    bd->bordername = NULL;
+			    bd->client.border.changed = 1;
+			 }
+		       e_remember_unuse(bd->remember);
+		       bd->remember = NULL;
+		    }
+		  eina_stringshare_replace(&bd->bordername, "borderless");
+		  bd->client.border.changed = 1;
+		  return;
+	       }
+	     else
+	       {
+		  kbd->waiting_borders = eina_list_append(kbd->waiting_borders, bd);
+		  bd->stolen = 1;
+		  if (bd->remember)
+		    {
+		       if (bd->bordername)
+			 {
+			    eina_stringshare_del(bd->bordername);
+			    bd->bordername = NULL;
+			    bd->client.border.changed = 1;
+			 }
+		       e_remember_unuse(bd->remember);
+		       bd->remember = NULL;
+		    }
+		  eina_stringshare_replace(&bd->bordername, "borderless");
+		  bd->client.border.changed = 1;
+		  return;
+	       }
+	  }
+     }
+}
+
+static void
+_e_kbd_cb_border_hook_post_fetch(void *data, void *data2)
+{
+   //E_Border *bd;
+
+   //if (!(bd = data2)) return;
+   // nothing - all done in _e_kbd_cb_border_hook_pre_post_fetch()
+   //if (!_e_kbd_by_border_get(bd)) return;
+}
+
+static void
+_e_kbd_cb_border_hook_post_border_assign(void *data, void *data2)
+{
+   E_Border *bd;
+   E_Kbd *kbd;
+   int pbx, pby, pbw, pbh;
+
+   if (!(bd = data2)) return;
+   if (!(kbd = _e_kbd_by_border_get(bd))) return;
+
+   pbx = bd->x;
+   pby = bd->y;
+   pbw = bd->w;
+   pbh = bd->h;
+
+   bd->lock_border = 1;
+
+   bd->lock_client_location = 1;
+   bd->lock_client_size = 1;
+   bd->lock_client_desk = 1;
+   bd->lock_client_sticky = 1;
+   bd->lock_client_shade = 1;
+   bd->lock_client_maximize = 1;
+
+   bd->lock_user_location = 1;
+   bd->lock_user_size = 1;
+   bd->lock_user_desk = 1;
+   bd->lock_user_sticky = 1;
+   bd->lock_user_shade = 1;
+   bd->lock_user_maximize = 1;
+
+   bd->client.icccm.accepts_focus  = 0;
+   bd->client.icccm.take_focus  = 0;
+
+   bd->w = bd->zone->w;
+   bd->h = bd->h; 
+   bd->x = bd->zone->x;
+   bd->y = bd->zone->y + bd->zone->h - bd->h;
+
+   bd->client.w = bd->w - bd->client_inset.l - bd->client_inset.r;
+   bd->client.h = bd->h - bd->client_inset.t - bd->client_inset.b;
+
+   bd->changes.size = 1;
+   bd->placed = 1;
+
+   if ((pbx != bd->x) || (pby != bd->y)  ||
+       (pbw != bd->w) || (pbh != bd->h))
+     {
+	if (bd->internal_ecore_evas)
+	  {
+	     ecore_evas_managed_move(bd->internal_ecore_evas,
+				     bd->x + bd->fx.x + bd->client_inset.l,
+				     bd->y + bd->fx.y + bd->client_inset.t);
+	  }
+	ecore_x_icccm_move_resize_send(bd->client.win,
+				       bd->x + bd->fx.x + bd->client_inset.l,
+				       bd->y + bd->fx.y + bd->client_inset.t,
+				       bd->client.w, bd->client.h);
+	bd->changed = 1;
+	bd->changes.pos = 1;
+	bd->changes.size = 1;
+     }
+   if (bd == kbd->border)
+     {
+	if (kbd->h != bd->h)
+	  {
+	     if (kbd->animator)
+	       {
+		  if (kbd->adjust_end > kbd->adjust_start)
+		    {
+		       kbd->adjust_start -= (bd->h - kbd->h);
+		       kbd->adjust_end -= (bd->h - kbd->h);
+		    }
+	       }
+	     else if (!kbd->actually_visible)
+	       e_border_fx_offset(kbd->border, 0, kbd->border->h);
+	     kbd->h = bd->h;
+	  }
+     }
+}
+
+static void
+_e_kbd_cb_border_hook_end(void *data, void *data2)
+{
+   E_Border *bd;
+   E_Kbd *kbd;
+
+   if (!(bd = data2)) return;
+   if (!(kbd = _e_kbd_by_border_get(bd))) return;
+   if (kbd->border == bd)
+     {
+	if (!kbd->actually_visible)
+	  _e_kbd_border_hide(kbd->border);
+     }
+   else
+     _e_kbd_border_hide(bd);
+}
+
+static void
+_e_kbd_layout_send(E_Kbd *kbd)
+{
+   Ecore_X_Virtual_Keyboard_State type;
+
+   if ((kbd->actually_visible) && (!kbd->disabled))
+     {
+	type = ECORE_X_VIRTUAL_KEYBOARD_STATE_ON;
+	if (kbd->layout == E_KBD_LAYOUT_DEFAULT) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_ON;
+	else if (kbd->layout == E_KBD_LAYOUT_ALPHA) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA;
+	else if (kbd->layout == E_KBD_LAYOUT_NUMERIC) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_NUMERIC;
+	else if (kbd->layout == E_KBD_LAYOUT_PIN) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_PIN;
+	else if (kbd->layout == E_KBD_LAYOUT_PHONE_NUMBER) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_PHONE_NUMBER;
+	else if (kbd->layout == E_KBD_LAYOUT_HEX) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_HEX;
+	else if (kbd->layout == E_KBD_LAYOUT_TERMINAL) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_TERMINAL;
+	else if (kbd->layout == E_KBD_LAYOUT_PASSWORD) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_PASSWORD;
+	else if (kbd->layout == E_KBD_LAYOUT_NONE) 
+          type = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF;
+     }
+   else
+     type = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF;
+   if (kbd->border)
+     ecore_x_e_virtual_keyboard_state_send(kbd->border->client.win, type);
+}
+
+// NOTES:
+// 
+// on freerunner these are always there:
+// 
+// /org/freedesktop/Hal/devices/platform_s3c2440_i2c_logicaldev_input
+// /org/freedesktop/Hal/devices/platform_neo1973_button_0_logicaldev_input
+// 
+// on desktop (built-in/ps2):
+// 
+// /org/freedesktop/Hal/devices/platform_i8042_i8042_KBD_port_logicaldev_input
+// 
+// on desktop (usb):
+// 
+// /org/freedesktop/Hal/devices/usb_device_46d_c517_noserial_if0_logicaldev_input
+// 
+// this:
+// 
+// /org/freedesktop/Hal/devices/usb_device_a12_1_noserial_if0_bluetooth_hci_bluetooth_hci_logicaldev_input
+// 
+// gets added for a bt kbd - unknown for usb.
+// 
+// chances are i either need a way for a platform config to list devices
+// known to be ebuilt-in keyboards but to be ignored when determining
+// if a vkbd should be disabled or not... or... i need some other way
+
+static E_DBus_Connection *_e_kbd_dbus_conn = NULL;
+static E_DBus_Signal_Handler *_e_kbd_dbus_handler_dev_add = NULL;
+static E_DBus_Signal_Handler *_e_kbd_dbus_handler_dev_del = NULL;
+static E_DBus_Signal_Handler *_e_kbd_dbus_handler_dev_chg = NULL;
+
+static Eina_List *_e_kbd_dbus_keyboards = NULL;
+static int _e_kbd_dbus_have_real_keyboard = 0;
+static Eina_List *_e_kbd_dbus_real_ignore = NULL;
+
+static void
+_e_kbd_dbus_keyboard_add(const char *udi)
+{
+   const char *str;
+   Eina_List *l;
+
+   EINA_LIST_FOREACH(_e_kbd_dbus_keyboards, l, str)
+     if (!strcmp(str, udi)) return;
+   _e_kbd_dbus_keyboards = eina_list_append
+     (_e_kbd_dbus_keyboards, eina_stringshare_add(udi));
+}
+
+static void
+_e_kbd_dbus_keyboard_del(const char *udi)
+{
+   Eina_List *l;
+   char *str;
+
+   EINA_LIST_FOREACH(_e_kbd_dbus_keyboards, l, str)
+     if (!strcmp(str, udi))
+       {
+	  eina_stringshare_del(str);
+          _e_kbd_dbus_keyboards = eina_list_remove_list(_e_kbd_dbus_keyboards, l);
+          return;
+       }
+}
+
+static void
+_e_kbd_dbus_keyboard_eval(void)
+{
+   int have_real = 0;
+   Eina_List *l, *ll;
+   const char *g, *gg;
+
+   have_real = eina_list_count(_e_kbd_dbus_keyboards);
+   EINA_LIST_FOREACH(_e_kbd_dbus_keyboards, l, g)
+     EINA_LIST_FOREACH(_e_kbd_dbus_real_ignore, ll, gg)
+       if (e_util_glob_match(g, gg))
+         {
+            have_real--;
+            break;
+         }
+   if (have_real != _e_kbd_dbus_have_real_keyboard)
+     {
+	_e_kbd_dbus_have_real_keyboard = have_real;
+#if 0
+	if (_e_kbd_dbus_have_real_keyboard)
+	  _e_kbd_all_disable();
+	else
+#endif
+	  _e_kbd_all_enable();
+     }
+}
+
+static void
+_e_kbd_dbus_cb_dev_input_keyboard(void *user_data, void *reply_data, DBusError *error)
+{
+   E_Hal_Manager_Find_Device_By_Capability_Return *ret = reply_data;
+   Eina_List *l;
+   char *device;
+
+   if ((!ret) || (!ret->strings)) return;
+
+   if (dbus_error_is_set(error))
+     {
+	dbus_error_free(error);
+	return;
+     }
+
+   EINA_LIST_FOREACH(ret->strings, l, device)
+     {
+	_e_kbd_dbus_keyboard_add(device);
+	_e_kbd_dbus_keyboard_eval();
+     }
+}
+
+static void
+_e_kbd_dbus_cb_input_keyboard_is(void *user_data, void *reply_data, DBusError *error)
+{
+   char *udi = user_data;
+   E_Hal_Device_Query_Capability_Return *ret = reply_data;
+
+   if (dbus_error_is_set(error))
+     {
+	dbus_error_free(error);
+        free(udi);
+        return;
+     }
+
+   if ((ret) && (ret->boolean))
+     {
+	_e_kbd_dbus_keyboard_add(udi);
+	_e_kbd_dbus_keyboard_eval();
+     }
+}
+
+static void
+_e_kbd_dbus_cb_dev_add(void *data, DBusMessage *msg)
+{
+   DBusError err;
+   char *udi;
+   int ret;
+
+   dbus_error_init(&err);
+   dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
+   udi = strdup(udi);
+   ret = e_hal_device_query_capability(_e_kbd_dbus_conn, udi, "input.keyboard",
+                                       _e_kbd_dbus_cb_input_keyboard_is, 
+				       strdup(udi));
+}
+     
+static void
+_e_kbd_dbus_cb_dev_del(void *data, DBusMessage *msg)
+{
+   DBusError err;
+   char *udi;
+
+   dbus_error_init(&err);
+   dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
+   _e_kbd_dbus_keyboard_del(udi);
+   _e_kbd_dbus_keyboard_eval();
+}
+
+static void
+_e_kbd_dbus_cb_cap_add(void *data, DBusMessage *msg)
+{
+   DBusError err;
+   char *udi, *capability;
+
+   dbus_error_init(&err);
+   dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_STRING,
+                         &capability, DBUS_TYPE_INVALID);
+   if (!strcmp(capability, "input.keyboard"))
+     {
+	_e_kbd_dbus_keyboard_add(udi);
+	_e_kbd_dbus_keyboard_eval();
+     }
+}
+
+static void
+_e_kbd_dbus_ignore_keyboards_file_load(const char *file)
+{
+   char buf[4096];
+   FILE *f;
+
+   if (!(f = fopen(file, "r"))) return;
+   while (fgets(buf, sizeof(buf), f))
+     {
+	char *p;
+	int len;
+
+	if (buf[0] == '#') continue;
+        len = strlen(buf);
+	if (len > 0)
+	  {
+	     if (buf[len - 1] == '\n') buf[len - 1] = 0;
+	  }
+	p = buf;
+	while (isspace(*p)) p++;
+	if (*p) 
+          {
+             _e_kbd_dbus_real_ignore = eina_list_append
+               (_e_kbd_dbus_real_ignore, eina_stringshare_add(p));
+          }
+     }
+   fclose(f);
+}
+
+static void
+_e_kbd_dbus_ignore_keyboards_load(void)
+{
+   char buf[PATH_MAX];
+
+   e_user_dir_concat_static(buf, "keyboards/ignore_built_in_keyboards");
+   _e_kbd_dbus_ignore_keyboards_file_load(buf);
+   snprintf(buf, sizeof(buf), "%s/keyboards/ignore_built_in_keyboards", 
+            e_module_dir_get(mod));
+   _e_kbd_dbus_ignore_keyboards_file_load(buf);
+}
+
+static void
+_e_kbd_dbus_real_kbd_init(void)
+{
+   _e_kbd_dbus_have_real_keyboard = 0;
+
+   _e_kbd_dbus_ignore_keyboards_load();
+
+   _e_kbd_dbus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
+   if (_e_kbd_dbus_conn)
+     {
+	e_hal_manager_find_device_by_capability(_e_kbd_dbus_conn, "input.keyboard",
+						_e_kbd_dbus_cb_dev_input_keyboard, NULL);
+
+	_e_kbd_dbus_handler_dev_add =
+	  e_dbus_signal_handler_add(_e_kbd_dbus_conn, "org.freedesktop.Hal",
+				    "/org/freedesktop/Hal/Manager",
+				    "org.freedesktop.Hal.Manager",
+				    "DeviceAdded", _e_kbd_dbus_cb_dev_add, NULL);
+	_e_kbd_dbus_handler_dev_del =
+	  e_dbus_signal_handler_add(_e_kbd_dbus_conn, "org.freedesktop.Hal",
+				    "/org/freedesktop/Hal/Manager",
+				    "org.freedesktop.Hal.Manager",
+				    "DeviceRemoved", _e_kbd_dbus_cb_dev_del, NULL);
+	_e_kbd_dbus_handler_dev_chg =
+	  e_dbus_signal_handler_add(_e_kbd_dbus_conn, "org.freedesktop.Hal",
+				    "/org/freedesktop/Hal/Manager",
+				    "org.freedesktop.Hal.Manager",
+				    "NewCapability", _e_kbd_dbus_cb_cap_add, NULL);
+     }
+}
+
+static void
+_e_kbd_dbus_real_kbd_shutdown(void)
+{
+   char *str;
+
+   if (_e_kbd_dbus_conn)
+     {
+	e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_add);
+	e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_del);
+	e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_chg);
+     }
+   EINA_LIST_FREE(_e_kbd_dbus_real_ignore, str)
+     eina_stringshare_del(str);
+   EINA_LIST_FREE(_e_kbd_dbus_keyboards, str)
+     eina_stringshare_del(str);
+   _e_kbd_dbus_have_real_keyboard = 0;
+}
+
+EAPI int
+e_kbd_init(E_Module *m)
+{
+   mod = m;
+   focused_border = NULL;
+   focused_vkbd_state = 0;
+   atom_mb_im_invoker_command = ecore_x_atom_get("_MB_IM_INVOKER_COMMAND");
+   atom_mtp_im_invoker_command = ecore_x_atom_get("_MTP_IM_INVOKER_COMMAND");
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (ECORE_X_EVENT_CLIENT_MESSAGE,
+				_e_kbd_cb_client_message, NULL));
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (E_EVENT_BORDER_ADD,
+				_e_kbd_cb_border_add, NULL));
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (E_EVENT_BORDER_REMOVE,
+				_e_kbd_cb_border_remove, NULL));
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (E_EVENT_BORDER_FOCUS_IN,
+				_e_kbd_cb_border_focus_in, NULL));
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (E_EVENT_BORDER_FOCUS_OUT,
+				_e_kbd_cb_border_focus_out, NULL));
+   handlers = eina_list_append(handlers, 
+			       ecore_event_handler_add
+			       (E_EVENT_BORDER_PROPERTY,
+				_e_kbd_cb_border_property, NULL));
+   border_hooks = eina_list_append(border_hooks,
+				   e_border_hook_add
+				   (E_BORDER_HOOK_EVAL_PRE_POST_FETCH,
+				    _e_kbd_cb_border_hook_pre_post_fetch,
+				    NULL));
+   border_hooks = eina_list_append(border_hooks,
+				   e_border_hook_add
+				   (E_BORDER_HOOK_EVAL_POST_FETCH,
+				    _e_kbd_cb_border_hook_post_fetch,
+				    NULL));
+   border_hooks = eina_list_append(border_hooks,
+				   e_border_hook_add
+				   (E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
+				    _e_kbd_cb_border_hook_post_border_assign,
+				    NULL));
+   border_hooks = eina_list_append(border_hooks,
+				   e_border_hook_add
+				   (E_BORDER_HOOK_EVAL_END,
+				    _e_kbd_cb_border_hook_end,
+				    NULL));
+   _e_kbd_dbus_real_kbd_init();
+   return 1;
+}
+
+EAPI int 
+e_kbd_shutdown(void)
+{
+   E_Border_Hook *bh;
+   Ecore_Event_Handler *handle;
+
+   _e_kbd_apply_all_job_queue_end();
+   _e_kbd_dbus_real_kbd_shutdown();
+   EINA_LIST_FREE(border_hooks, bh)
+     e_border_hook_del(bh);
+   EINA_LIST_FREE(handlers, handle)
+     ecore_event_handler_del(handle);
+   focused_border = NULL;
+   focused_vkbd_state = 0;
+   mod = NULL;
+   return 1;
+}
+
+EAPI E_Kbd *
+e_kbd_new(E_Zone *zone, const char *themedir, const char *syskbds, const char *sysdicts)
+{
+   E_Kbd *kbd;
+
+   kbd = E_OBJECT_ALLOC(E_Kbd, E_KBD_TYPE, _e_kbd_free);
+   if (!kbd) return NULL;
+   kbds = eina_list_append(kbds, kbd);
+   kbd->layout = ECORE_X_VIRTUAL_KEYBOARD_STATE_ON;
+   return kbd;
+}
+
+EAPI void
+e_kbd_enable(E_Kbd *kbd)
+{
+   if (!kbd->disabled) return;
+   kbd->disabled = 0;
+   if (kbd->visible)
+     {
+	kbd->visible  = 0;
+	e_kbd_show(kbd);
+     }
+}
+
+EAPI void
+e_kbd_disable(E_Kbd *kbd)
+{
+   if (kbd->disabled) return;
+   if (kbd->visible) e_kbd_hide(kbd);
+   kbd->disabled = 1;
+}
+
+EAPI void
+e_kbd_show(E_Kbd *kbd)
+{
+   if (kbd->delay_hide)
+     {
+	ecore_timer_del(kbd->delay_hide);
+	kbd->delay_hide = NULL;
+     }
+   if (kbd->visible) return;
+   kbd->visible = 1;
+   if (kbd->disabled) return;
+   kbd->actually_visible = kbd->visible;
+   _e_kbd_layout_send(kbd);
+   if (il_cfg->sliding.kbd.duration <= 0)
+     {
+	if (kbd->border)
+	  {
+	     e_border_fx_offset(kbd->border, 0, 0);
+	     _e_kbd_border_show(kbd, kbd->border);
+	  }
+	kbd->actually_visible = kbd->visible;
+	_e_kbd_apply_all_job_queue();
+     }
+   else
+     {
+        if (kbd->border)
+	  {
+	     e_border_fx_offset(kbd->border, 0, kbd->border->h - kbd->adjust);
+	     _e_kbd_border_show(kbd, kbd->border);
+	  }
+	_e_kbd_slide(kbd, 1, (double)il_cfg->sliding.kbd.duration / 1000.0);
+     }
+}
+
+EAPI void
+e_kbd_layout_set(E_Kbd *kbd, E_Kbd_Layout layout)
+{
+   kbd->layout = layout;
+   _e_kbd_layout_send(kbd);
+}
+
+EAPI void
+e_kbd_hide(E_Kbd *kbd)
+{
+   if (!kbd->visible) return;
+   kbd->visible = 0;
+   if (!kbd->delay_hide)
+     kbd->delay_hide = ecore_timer_add(0.2, _e_kbd_cb_delayed_hide, kbd);
+}
+
+EAPI void
+e_kbd_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h)
+{
+   Eina_List *l;
+
+   if (x) *x = zone->x;
+   if (y) *y = zone->y;
+   if (w) *w = zone->w;
+   if (h) *h = zone->h;
+   for (l = kbds; l; l = l->next)
+     {
+	E_Kbd *kbd;
+
+	kbd = l->data;
+	if ((kbd->border) && (kbd->border->zone == zone))
+	  {
+	     if ((kbd->visible) && (!kbd->animator) && (!kbd->disabled)) 
+	       /* out finished, not disabled */
+	       {
+		  if (h)
+		    {
+		       *h -= kbd->border->h;
+		       if (*h < 0) *h = 0;
+		    }
+	       }
+	     return;
+	  }
+     }
+}
+
+EAPI void
+e_kbd_fullscreen_set(E_Zone *zone, int fullscreen)
+{
+   Eina_List *l;
+   E_Kbd *kbd;
+
+   EINA_LIST_FOREACH(kbds, l, kbd)
+     if ((!!fullscreen) != kbd->fullscreen)
+       {
+          kbd->fullscreen = fullscreen;
+          if (kbd->fullscreen)
+            e_border_layer_set(kbd->border, 250);
+          else
+            e_border_layer_set(kbd->border, 100);
+       }
+}
diff --git a/src/modules/illume2/e_kbd.h b/src/modules/illume2/e_kbd.h
new file mode 100644
index 0000000..d964b56
--- /dev/null
+++ b/src/modules/illume2/e_kbd.h
@@ -0,0 +1,52 @@
+#ifndef E_KBD_H
+#define E_KBD_H
+
+typedef struct _E_Kbd E_Kbd;
+
+#define E_KBD_TYPE 0xE1b0988
+
+typedef enum _E_Kbd_Layout
+{
+   E_KBD_LAYOUT_NONE,
+   E_KBD_LAYOUT_DEFAULT,
+   E_KBD_LAYOUT_ALPHA,
+   E_KBD_LAYOUT_NUMERIC,
+   E_KBD_LAYOUT_PIN,
+   E_KBD_LAYOUT_PHONE_NUMBER,
+   E_KBD_LAYOUT_HEX,
+   E_KBD_LAYOUT_TERMINAL,
+   E_KBD_LAYOUT_PASSWORD
+} E_Kbd_Layout;
+
+struct _E_Kbd
+{
+   E_Object e_obj_inherit;
+   E_Win *win;
+   E_Border *border;
+   Ecore_Timer *delay_hide;
+   Ecore_Animator *animator;
+   Eina_List *waiting_borders;
+   E_Kbd_Layout layout;
+   double start, len;
+
+   int h, adjust_start, adjust, adjust_end;
+
+   unsigned char visible : 1;
+   unsigned char actually_visible : 1;
+   unsigned char disabled : 1; // if we have a real kbd plugged in
+   unsigned char fullscreen : 1;
+};
+
+EAPI int e_kbd_init(E_Module *m);
+EAPI int e_kbd_shutdown(void);
+
+EAPI E_Kbd *e_kbd_new(E_Zone *zone, const char *themedir, const char *syskbds, const char *sysdicts);
+EAPI void e_kbd_enable(E_Kbd *kbd);
+EAPI void e_kbd_disable(E_Kbd *kbd);
+EAPI void e_kbd_show(E_Kbd *kbd);
+EAPI void e_kbd_layout_set(E_Kbd *kbd, E_Kbd_Layout layout);
+EAPI void e_kbd_hide(E_Kbd *kbd);
+EAPI void e_kbd_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h);
+EAPI void e_kbd_fullscreen_set(E_Zone *zone, int fullscreen);
+
+#endif
diff --git a/src/modules/illume2/e_mod_animation.c b/src/modules/illume2/e_mod_animation.c
new file mode 100644
index 0000000..7d95e6c
--- /dev/null
+++ b/src/modules/illume2/e_mod_animation.c
@@ -0,0 +1,98 @@
+#include "e.h"
+#include "e_mod_animation.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void *_il_config_animation_create(E_Config_Dialog *cfd);
+static void _il_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_config_animation_change(void *data, Evas_Object *obj, void *event);
+static int _il_config_animation_change_timeout(void *data);
+
+/* local variables */
+Ecore_Timer *_anim_change_timer = NULL;
+
+/* public functions */
+void 
+il_config_animation_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_animation_settings")) return;
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_config_animation_create;
+   v->free_cfdata = _il_config_animation_free;
+   v->basic.create_widgets = _il_config_animation_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+   cfd = e_config_dialog_new(con, _("Animation Settings"), "E", 
+                             "_config_illume_animation_settings", 
+                             "enlightenment/animation_settings", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+}
+
+/* local function prototypes */
+static void *
+_il_config_animation_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
+}
+
+static Evas_Object *
+_il_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *of, *ow;
+   E_Radio_Group *rg;
+
+   list = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("Keyboard"), 0);
+   rg = e_widget_radio_group_new(&(il_cfg->sliding.kbd.duration));
+   ow = e_widget_radio_add(evas, _("Slow"), 2000, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_animation_change, NULL);
+   ow = e_widget_radio_add(evas, _("Medium"), 1000, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_animation_change, NULL);
+   ow = e_widget_radio_add(evas, _("Fast"), 500, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_animation_change, NULL);
+   ow = e_widget_radio_add(evas, _("Very Fast"), 250, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_animation_change, NULL);
+   ow = e_widget_radio_add(evas, _("Off"), 0, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_animation_change, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   return list;
+}
+
+static void 
+_il_config_animation_change(void *data, Evas_Object *obj, void *event) 
+{
+   if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
+   _anim_change_timer = 
+     ecore_timer_add(0.5, _il_config_animation_change_timeout, data);
+}
+
+static int 
+_il_config_animation_change_timeout(void *data) 
+{
+   e_config_save_queue();
+   _anim_change_timer = NULL;
+   return 0;
+}
diff --git a/src/modules/illume2/e_mod_animation.h b/src/modules/illume2/e_mod_animation.h
new file mode 100644
index 0000000..cf8a36e
--- /dev/null
+++ b/src/modules/illume2/e_mod_animation.h
@@ -0,0 +1,6 @@
+#ifndef E_MOD_ANIM_H
+#define E_MOD_ANIM_H
+
+void il_config_animation_show(E_Container *con, const char *params);
+
+#endif
diff --git a/src/modules/illume2/e_mod_config.c b/src/modules/illume2/e_mod_config.c
new file mode 100644
index 0000000..0e023d3
--- /dev/null
+++ b/src/modules/illume2/e_mod_config.c
@@ -0,0 +1,206 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_animation.h"
+#include "e_mod_windows.h"
+#include "e_mod_policy.h"
+#include "e_mod_policy_settings.h"
+
+/* local variables */
+EAPI Il_Config *il_cfg = NULL;
+static E_Config_DD *conf_edd = NULL;
+
+/* public functions */
+int 
+il_config_init(E_Module *m) 
+{
+   conf_edd = E_CONFIG_DD_NEW("Illume_Cfg", Il_Config);
+   #undef T
+   #undef D
+   #define T Il_Config
+   #define D conf_edd
+   E_CONFIG_VAL(D, T, version, INT);
+   E_CONFIG_VAL(D, T, sliding.kbd.duration, INT);
+   E_CONFIG_VAL(D, T, sliding.softkey.duration, INT);
+   E_CONFIG_VAL(D, T, policy.name, STR);
+   E_CONFIG_VAL(D, T, policy.mode.dual, INT);
+   E_CONFIG_VAL(D, T, policy.mode.side, INT);
+   E_CONFIG_VAL(D, T, policy.vkbd.class, STR);
+   E_CONFIG_VAL(D, T, policy.vkbd.name, STR);
+   E_CONFIG_VAL(D, T, policy.vkbd.title, STR);
+   E_CONFIG_VAL(D, T, policy.vkbd.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.vkbd.match.class, INT);
+   E_CONFIG_VAL(D, T, policy.vkbd.match.name, INT);
+   E_CONFIG_VAL(D, T, policy.vkbd.match.title, INT);
+   E_CONFIG_VAL(D, T, policy.vkbd.match.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.softkey.class, STR);
+   E_CONFIG_VAL(D, T, policy.softkey.name, STR);
+   E_CONFIG_VAL(D, T, policy.softkey.title, STR);
+   E_CONFIG_VAL(D, T, policy.softkey.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.softkey.match.class, INT);
+   E_CONFIG_VAL(D, T, policy.softkey.match.name, INT);
+   E_CONFIG_VAL(D, T, policy.softkey.match.title, INT);
+   E_CONFIG_VAL(D, T, policy.softkey.match.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.home.class, STR);
+   E_CONFIG_VAL(D, T, policy.home.name, STR);
+   E_CONFIG_VAL(D, T, policy.home.title, STR);
+   E_CONFIG_VAL(D, T, policy.home.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.home.match.class, INT);
+   E_CONFIG_VAL(D, T, policy.home.match.name, INT);
+   E_CONFIG_VAL(D, T, policy.home.match.title, INT);
+   E_CONFIG_VAL(D, T, policy.home.match.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.indicator.class, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.name, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.title, STR);
+   E_CONFIG_VAL(D, T, policy.indicator.win_type, INT);
+   E_CONFIG_VAL(D, T, policy.indicator.match.class, INT);
+   E_CONFIG_VAL(D, T, policy.indicator.match.name, INT);
+   E_CONFIG_VAL(D, T, policy.indicator.match.title, INT);
+   E_CONFIG_VAL(D, T, policy.indicator.match.win_type, INT);
+
+   il_cfg = e_config_domain_load("module.illume2", conf_edd);
+   if ((il_cfg) && 
+       ((il_cfg->version >> 16) < IL_CONFIG_MAJ)) 
+     {
+        E_FREE(il_cfg);
+        il_cfg = NULL;
+     }
+   if (!il_cfg) 
+     {
+        il_cfg = E_NEW(Il_Config, 1);
+        il_cfg->version = 0;
+        il_cfg->sliding.kbd.duration = 1000;
+        il_cfg->sliding.softkey.duration = 1000;
+     }
+   if (il_cfg) 
+     {
+        /* Add new config variables here */
+        if ((il_cfg->version & 0xffff) < 1) 
+          {
+             il_cfg->policy.name = eina_stringshare_add("Illume");
+             il_cfg->policy.vkbd.class = 
+               eina_stringshare_add("Virtual-Keyboard");
+             il_cfg->policy.vkbd.name = 
+               eina_stringshare_add("Virtual-Keyboard");
+             il_cfg->policy.vkbd.title = 
+               eina_stringshare_add("Virtual Keyboard");
+             il_cfg->policy.vkbd.win_type = ECORE_X_WINDOW_TYPE_NORMAL;
+             il_cfg->policy.vkbd.match.class = 0;
+             il_cfg->policy.vkbd.match.name = 1;
+             il_cfg->policy.vkbd.match.title = 1;
+             il_cfg->policy.vkbd.match.win_type = 0;
+             il_cfg->policy.softkey.class = 
+               eina_stringshare_add("Illume-Softkey");
+             il_cfg->policy.softkey.name = 
+               eina_stringshare_add("Illume-Softkey");
+             il_cfg->policy.softkey.title = 
+               eina_stringshare_add("Illume Softkey");
+             il_cfg->policy.softkey.win_type = ECORE_X_WINDOW_TYPE_DOCK;
+             il_cfg->policy.softkey.match.class = 0;
+             il_cfg->policy.softkey.match.name = 1;
+             il_cfg->policy.softkey.match.title = 1;
+             il_cfg->policy.softkey.match.win_type = 0;
+             il_cfg->policy.home.class = 
+               eina_stringshare_add("Illume-Home");
+             il_cfg->policy.home.name = 
+               eina_stringshare_add("Illume-Home");
+             il_cfg->policy.home.title = 
+               eina_stringshare_add("Illume Home");
+             il_cfg->policy.home.win_type = ECORE_X_WINDOW_TYPE_NORMAL;
+             il_cfg->policy.home.match.class = 0;
+             il_cfg->policy.home.match.name = 1;
+             il_cfg->policy.home.match.title = 1;
+             il_cfg->policy.home.match.win_type = 0;
+             il_cfg->policy.indicator.class = 
+               eina_stringshare_add("Illume-Indicator");
+             il_cfg->policy.indicator.name = 
+               eina_stringshare_add("Illume-Indicator");
+             il_cfg->policy.indicator.title = 
+               eina_stringshare_add("Illume Indicator");
+             il_cfg->policy.indicator.win_type = ECORE_X_WINDOW_TYPE_DOCK;
+             il_cfg->policy.indicator.match.class = 0;
+             il_cfg->policy.indicator.match.name = 1;
+             il_cfg->policy.indicator.match.title = 1;
+             il_cfg->policy.indicator.match.win_type = 0;
+          }
+        if ((il_cfg->version & 0xffff) < 2) 
+          {
+             il_cfg->policy.mode.dual = 0;
+             il_cfg->policy.mode.side = 0;
+          }
+        il_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
+     }
+   il_cfg->mod_dir = eina_stringshare_add(m->dir);
+
+   e_configure_registry_category_add("illume", 0, _("Illume"), NULL, 
+                                     "enlightenment/display");
+   e_configure_registry_generic_item_add("illume/animation", 0, _("Animation"), 
+                                         NULL, "enlightenment/animation", 
+                                         il_config_animation_show);
+   e_configure_registry_generic_item_add("illume/windows", 0, _("Windows"), 
+                                         NULL, "enlightenment/windows", 
+                                         il_config_windows_show);
+   e_configure_registry_generic_item_add("illume/policy", 0, _("Policy"), 
+                                         NULL, "enlightenment/policy", 
+                                         il_config_policy_show);
+   e_configure_registry_generic_item_add("illume/policy_settings", 0, 
+                                         _("Policy Settings"), 
+                                         NULL, "enlightenment/policy", 
+                                         il_config_policy_settings_show);
+   return 1;
+}
+
+int 
+il_config_shutdown(void) 
+{
+   e_configure_registry_item_del("illume/policy_settings");
+   e_configure_registry_item_del("illume/policy");
+   e_configure_registry_item_del("illume/windows");
+   e_configure_registry_item_del("illume/animation");
+   e_configure_registry_category_del("illume");
+
+   if (il_cfg->policy.name) eina_stringshare_del(il_cfg->policy.name);
+
+   if (il_cfg->policy.vkbd.class) 
+     eina_stringshare_del(il_cfg->policy.vkbd.class);
+   if (il_cfg->policy.vkbd.name) 
+     eina_stringshare_del(il_cfg->policy.vkbd.name);
+   if (il_cfg->policy.vkbd.title) 
+     eina_stringshare_del(il_cfg->policy.vkbd.title);
+
+   if (il_cfg->policy.softkey.class) 
+     eina_stringshare_del(il_cfg->policy.softkey.class);
+   if (il_cfg->policy.softkey.name) 
+     eina_stringshare_del(il_cfg->policy.softkey.name);
+   if (il_cfg->policy.softkey.title) 
+     eina_stringshare_del(il_cfg->policy.softkey.title);
+
+   if (il_cfg->policy.home.class) 
+     eina_stringshare_del(il_cfg->policy.home.class);
+   if (il_cfg->policy.home.name) 
+     eina_stringshare_del(il_cfg->policy.home.name);
+   if (il_cfg->policy.home.title) 
+     eina_stringshare_del(il_cfg->policy.home.title);
+
+   if (il_cfg->policy.indicator.class) 
+     eina_stringshare_del(il_cfg->policy.indicator.class);
+   if (il_cfg->policy.indicator.name) 
+     eina_stringshare_del(il_cfg->policy.indicator.name);
+   if (il_cfg->policy.indicator.title) 
+     eina_stringshare_del(il_cfg->policy.indicator.title);
+
+   if (il_cfg->mod_dir) eina_stringshare_del(il_cfg->mod_dir);
+
+   E_FREE(il_cfg);
+   il_cfg = NULL;
+
+   E_CONFIG_DD_FREE(conf_edd);
+   return 1;
+}
+
+int 
+il_config_save(void) 
+{
+   e_config_domain_save("module.illume2", conf_edd, il_cfg);
+   return 1;
+}
diff --git a/src/modules/illume2/e_mod_config.h b/src/modules/illume2/e_mod_config.h
new file mode 100644
index 0000000..1f3b648
--- /dev/null
+++ b/src/modules/illume2/e_mod_config.h
@@ -0,0 +1,52 @@
+#ifndef E_MOD_CONFIG_H
+# define E_MOD_CONFIG_H
+
+# define IL_CONFIG_MIN 2
+# define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Config Il_Config;
+
+struct _Il_Config 
+{
+   int version;
+
+   struct 
+     {
+        struct 
+          {
+             int duration;
+          } kbd, softkey;
+     } sliding;
+
+   struct 
+     {
+        const char *name;
+        struct 
+          {
+             const char *class;
+             const char *name;
+             const char *title;
+             int win_type;
+             struct 
+               {
+                  int class, name, title, win_type;
+               } match;
+          } vkbd, softkey, home, indicator;
+        struct 
+          {
+             int dual, side;
+          } mode;
+     } policy;
+
+   // Not User Configurable. Placeholders
+   const char *mod_dir;
+   E_Config_Dialog *cfd;
+};
+
+int il_config_init(E_Module *m);
+int il_config_shutdown(void);
+int il_config_save(void);
+
+extern EAPI Il_Config *il_cfg;
+
+#endif
diff --git a/src/modules/illume2/e_mod_gadcon.c b/src/modules/illume2/e_mod_gadcon.c
new file mode 100644
index 0000000..4b07c86
--- /dev/null
+++ b/src/modules/illume2/e_mod_gadcon.c
@@ -0,0 +1,126 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+
+/* local structures */
+typedef struct _Instance Instance;
+struct _Instance 
+{
+   E_Gadcon_Client *gcc;
+   Evas_Object *o_btn;
+};
+
+/* local function prototypes */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static char *_gc_label(E_Gadcon_Client_Class *cc);
+static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
+static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
+static void _btn_cb_click(void *data, void *data2);
+
+/* local variables */
+static Eina_List *instances = NULL;
+
+static const E_Gadcon_Client_Class _gc_class = 
+{
+   GADCON_CLIENT_CLASS_VERSION, "illume2", 
+     { _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL, 
+          e_gadcon_site_is_not_toolbar 
+     }, E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+/* local functions */
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) 
+{
+   Instance *inst;
+   Evas_Object *icon;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume2.edj", il_cfg->mod_dir);
+
+   inst = E_NEW(Instance, 1);
+   inst->o_btn = e_widget_button_add(gc->evas, NULL, NULL, 
+                                     _btn_cb_click, inst, NULL);
+   icon = e_icon_add(evas_object_evas_get(inst->o_btn));
+   e_icon_file_edje_set(icon, buff, "btn_icon");
+   e_widget_button_icon_set(inst->o_btn, icon);
+
+   inst->gcc = e_gadcon_client_new(gc, name, id, style, inst->o_btn);
+   inst->gcc->data = inst;
+
+   instances = eina_list_append(instances, inst);
+   return inst->gcc;
+}
+
+static void 
+_gc_shutdown(E_Gadcon_Client *gcc) 
+{
+   Instance *inst;
+
+   if (!(inst = gcc->data)) return;
+   instances = eina_list_remove(instances, inst);
+   if (inst->o_btn) evas_object_del(inst->o_btn);
+   E_FREE(inst);
+}
+
+static void 
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) 
+{
+   e_gadcon_client_aspect_set(gcc, 16, 16);
+   e_gadcon_client_min_size_set(gcc, 16, 16);
+}
+
+static char *
+_gc_label(E_Gadcon_Client_Class *cc) 
+{
+   return _("Illume2");
+}
+
+static Evas_Object *
+_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas) 
+{
+   Evas_Object *o;
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s/e-module-illume2.edj", il_cfg->mod_dir);
+   o = edje_object_add(evas);
+   edje_object_file_set(o, buff, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(E_Gadcon_Client_Class *cc) 
+{
+   char buff[PATH_MAX];
+
+   snprintf(buff, sizeof(buff), "%s.%d", _gc_class.name, 
+            eina_list_count(instances));
+   return strdup(buff);
+}
+
+static void 
+_btn_cb_click(void *data, void *data2) 
+{
+   if (il_cfg->policy.mode.dual)
+     il_cfg->policy.mode.dual = 0;
+   else 
+     il_cfg->policy.mode.dual = 1;
+   e_config_save_queue();
+}
+
+/* public functions */
+int 
+e_mod_gadcon_init(void) 
+{
+   e_gadcon_provider_register(&_gc_class);
+   return 1;
+}
+
+int 
+e_mod_gadcon_shutdown(void) 
+{
+   e_gadcon_provider_unregister(&_gc_class);
+   return 1;
+}
diff --git a/src/modules/illume2/e_mod_gadcon.h b/src/modules/illume2/e_mod_gadcon.h
new file mode 100644
index 0000000..0bcdcd5
--- /dev/null
+++ b/src/modules/illume2/e_mod_gadcon.h
@@ -0,0 +1,7 @@
+#ifndef E_MOD_GADCON_H
+#define E_MOD_GADCON_H
+
+int e_mod_gadcon_init(void);
+int e_mod_gadcon_shutdown(void);
+
+#endif
diff --git a/src/modules/illume2/e_mod_layout.c b/src/modules/illume2/e_mod_layout.c
new file mode 100644
index 0000000..5148842
--- /dev/null
+++ b/src/modules/illume2/e_mod_layout.c
@@ -0,0 +1,570 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_layout.h"
+#include "e_mod_layout_illume.h"
+#include "e_mod_config.h"
+
+// internal calls
+static void _e_mod_layout_cb_hook_container_layout(void *data, void *data2);
+static void _e_mod_layout_cb_hook_post_fetch(void *data, void *data2);
+static void _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2);
+static void _e_mod_layout_cb_hook_end(void *data, void *data2);
+static int _cb_event_border_add(void *data, int type, void *event);
+static int _cb_event_border_remove(void *data, int type, void *event);
+static int _cb_event_border_focus_in(void *data, int type, void *event);
+static int _cb_event_border_focus_out(void *data, int type, void *event);
+static int _cb_event_border_show(void *data, int type, void *event);
+static int _cb_event_border_hide(void *data, int type, void *event);
+static int _cb_event_zone_move_resize(void *data, int type, void *event);
+
+// state
+static E_Border_Hook *hook1 = NULL;
+static E_Border_Hook *hook2 = NULL;
+static E_Border_Hook *hook3 = NULL;
+static E_Border_Hook *hook4 = NULL;
+static Eina_List *handlers = NULL;
+
+void
+e_mod_layout_init(E_Module *m)
+{
+   Eina_List *l;
+
+   hook1 = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_FETCH,
+			     _e_mod_layout_cb_hook_post_fetch, NULL);
+   hook2 = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
+			     _e_mod_layout_cb_hook_post_border_assign, NULL);
+   hook3 = e_border_hook_add(E_BORDER_HOOK_EVAL_END,
+			     _e_mod_layout_cb_hook_end, NULL);
+   hook4 = e_border_hook_add(E_BORDER_HOOK_CONTAINER_LAYOUT,
+			     _e_mod_layout_cb_hook_container_layout, NULL);
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_ADD, _cb_event_border_add, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_REMOVE, _cb_event_border_remove, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_FOCUS_IN, _cb_event_border_focus_in, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_FOCUS_OUT, _cb_event_border_focus_out, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_SHOW, _cb_event_border_show, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_BORDER_HIDE, _cb_event_border_hide, NULL));
+   handlers = eina_list_append
+     (handlers, ecore_event_handler_add
+         (E_EVENT_ZONE_MOVE_RESIZE, _cb_event_zone_move_resize, NULL));
+
+   illume_layout_illume_init();
+}
+
+void
+e_mod_layout_shutdown(void)
+{
+   Ecore_Event_Handler *handle;
+
+   illume_layout_illume_shutdown();
+
+   if (hook1) e_border_hook_del(hook1);
+   if (hook2) e_border_hook_del(hook2);
+   if (hook3) e_border_hook_del(hook3);
+   if (hook4) e_border_hook_del(hook4);
+   hook1 = NULL;
+   hook2 = NULL;
+   hook3 = NULL;
+   hook4 = NULL;
+   EINA_LIST_FREE(handlers, handle) 
+     ecore_event_handler_del(handle);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// :: Convenience routines to make it easy to write layout logic code ::
+
+static Eina_List *modes = NULL;
+static const Illume_Layout_Mode *mode = NULL;
+
+void
+illume_layout_mode_register(const Illume_Layout_Mode *laymode)
+{
+   if (!modes) mode = laymode;
+   modes = eina_list_append(modes, laymode);
+}
+
+void
+illume_layout_mode_unregister(const Illume_Layout_Mode *laymode)
+{ 
+   if (mode == laymode) mode = NULL;
+   modes = eina_list_remove(modes, laymode);
+}
+
+Eina_List *
+illume_layout_modes_get(void) 
+{
+   return modes;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// :: Convenience routines to make it easy to write layout logic code ::
+
+// activate a window - meant for main app and home app windows
+void
+illume_border_activate(E_Border *bd)
+{
+   e_desk_show(bd->desk);
+   e_border_uniconify(bd);
+   e_border_raise(bd);
+   e_border_show(bd);
+   e_border_focus_set(bd, 1, 1);
+}
+
+// activate a window that isnt meant to get the focus - like panels, kbd etc.
+void
+illume_border_show(E_Border *bd)
+{
+   e_desk_show(bd->desk);
+   e_border_uniconify(bd);
+   e_border_raise(bd);
+   e_border_show(bd);
+}
+
+// get a window away from being visile (but maintain it)
+void
+illume_border_deactivate(E_Border *bd)
+{
+   e_border_iconify(bd);
+}
+
+// get window info - is this one a dialog?
+Eina_Bool
+illume_border_is_dialog(E_Border *bd)
+{
+   int isdialog = 0, i;
+
+   if (bd->client.icccm.transient_for != 0) isdialog = 1;
+   if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
+     {
+	isdialog = 1;
+	if (bd->client.netwm.extra_types)
+	  {
+	     for (i = 0; i < bd->client.netwm.extra_types_num; i++)
+	       {
+		  if (bd->client.netwm.extra_types[i] == 
+		      ECORE_X_WINDOW_TYPE_UNKNOWN) continue;
+		  if ((bd->client.netwm.extra_types[i] !=
+		       ECORE_X_WINDOW_TYPE_DIALOG) &&
+		      (bd->client.netwm.extra_types[i] !=
+		       ECORE_X_WINDOW_TYPE_SPLASH))
+		    {
+		       return 0;
+		    }
+	       }
+	  }
+     }
+   return isdialog;
+}
+
+// get window info - is this a vkbd window
+Eina_Bool
+illume_border_is_keyboard(E_Border *bd)
+{
+   if (bd->client.vkbd.vkbd) return 1;
+   if (il_cfg->policy.vkbd.match.title) 
+     {
+        if ((bd->client.icccm.title) && 
+            (!strcmp(bd->client.icccm.title, il_cfg->policy.vkbd.title)))
+          return 1;
+     }
+   if (il_cfg->policy.vkbd.match.name) 
+     {
+        if ((bd->client.icccm.name) && 
+            (!strcmp(bd->client.icccm.name, il_cfg->policy.vkbd.name)))
+          return 1;
+     }
+   if (il_cfg->policy.vkbd.match.class) 
+     {
+        if ((bd->client.icccm.class) && 
+            (!strcmp(bd->client.icccm.class, il_cfg->policy.vkbd.class)))
+          return 1;
+     }
+   if ((bd->client.icccm.name) && 
+       ((!strcmp(bd->client.icccm.name, "multitap-pad")))
+       && (bd->client.netwm.state.skip_taskbar)
+       && (bd->client.netwm.state.skip_pager)) 
+     return 1;
+   return 0;
+}
+
+// get window info - is it a bottom app panel window (eg qtopia softmenu)
+Eina_Bool
+illume_border_is_bottom_panel(E_Border *bd)
+{
+   if (il_cfg->policy.softkey.match.title) 
+     {
+        if ((bd->client.icccm.title) && 
+            (!strcmp(bd->client.icccm.title, il_cfg->policy.softkey.title)))
+          return 1;
+     }
+   if (il_cfg->policy.softkey.match.name) 
+     {
+        if ((bd->client.icccm.name) && 
+            (!strcmp(bd->client.icccm.name, il_cfg->policy.softkey.name)))
+          return 1;
+     }
+   if (il_cfg->policy.softkey.match.class) 
+     {
+        if ((bd->client.icccm.class) && 
+            (!strcmp(bd->client.icccm.class, il_cfg->policy.softkey.class)))
+          return 1;
+     }
+   if (((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK) ||
+        (bd->client.qtopia.soft_menu)))
+     return 1;
+   return 0;
+}
+
+// get window info - is it a top shelf window
+Eina_Bool
+illume_border_is_top_shelf(E_Border *bd)
+{
+   if (il_cfg->policy.indicator.match.title) 
+     {
+        if ((bd->client.icccm.title) && 
+            (!strcmp(bd->client.icccm.title, il_cfg->policy.indicator.title)))
+          return 1;
+     }
+   if (il_cfg->policy.indicator.match.name) 
+     {
+        if ((bd->client.icccm.name) && 
+            (!strcmp(bd->client.icccm.name, il_cfg->policy.indicator.name)))
+          return 1;
+     }
+   if (il_cfg->policy.indicator.match.class) 
+     {
+        if ((bd->client.icccm.class) && 
+            (!strcmp(bd->client.icccm.class, il_cfg->policy.indicator.class)))
+          return 1;
+     }
+   return 0;
+}
+
+// get window info - is it a mini app window
+Eina_Bool
+illume_border_is_mini_app(E_Border *bd)
+{
+   // FIXME: detect
+   return 0;
+}
+
+// get window info - is it a notification window
+Eina_Bool
+illume_border_is_notification(E_Border *bd)
+{
+   // FIXME: detect
+   return 0;
+}
+
+// get window info - is it a home window
+Eina_Bool
+illume_border_is_home(E_Border *bd)
+{
+   if (il_cfg->policy.home.match.title) 
+     {
+        if ((bd->client.icccm.title) && 
+            (!strcmp(bd->client.icccm.title, il_cfg->policy.home.title)))
+          return 1;
+     }
+   if (il_cfg->policy.home.match.name) 
+     {
+        if ((bd->client.icccm.name) && 
+            (!strcmp(bd->client.icccm.name, il_cfg->policy.home.name)))
+          return 1;
+     }
+   if (il_cfg->policy.home.match.class) 
+     {
+        if ((bd->client.icccm.class) && 
+            (!strcmp(bd->client.icccm.class, il_cfg->policy.home.class)))
+          return 1;
+     }
+   return 0;
+}
+
+// get window info - is it side pane (left) window
+Eina_Bool
+illume_border_is_side_pane_left(E_Border *bd)
+{
+   // FIXME: detect
+   return 0;
+}
+
+// get window info - is it side pane (right) window
+Eina_Bool
+illume_border_is_side_pane_right(E_Border *bd)
+{
+   // FIXME: detect
+   return 0;
+}
+
+// get window info - is it overlay window (eg expose display of windows etc.)
+Eina_Bool
+illume_border_is_overlay(E_Border *bd)
+{
+   // FIXME: detect
+   return 0;
+}
+
+Eina_Bool 
+illume_border_is_conformant(E_Border *bd) 
+{
+   Ecore_X_Atom *atoms;
+   Eina_Bool ret;
+   int num = 0, i;
+
+   ret = EINA_FALSE;
+   atoms = ecore_x_window_prop_list(bd->client.win, &num);
+   if (atoms) 
+     {
+        for (i = 0; i < num; i++) 
+          {
+             if (atoms[i] != ECORE_X_ATOM_E_ILLUME_CONFORMANT) continue;
+             ret = EINA_TRUE;
+             break;
+          }
+        free(atoms);
+     }
+   return ret;
+}
+
+void
+illume_border_slide_to(E_Border *bd, int x, int y, Illume_Anim_Class aclass)
+{
+   // FIXME: do
+   // 1. if an existing slide exists, use is current offset x,y as current border pos, new x,y as new pos and start slide again
+}
+
+void
+illume_border_min_get(E_Border *bd, int *mw, int *mh)
+{
+   if (mw)
+     {
+        if (bd->client.icccm.base_w > bd->client.icccm.min_w)
+          *mw = bd->client.icccm.base_w;
+        else
+          *mw = bd->client.icccm.min_w;
+     }
+   if (mh)
+     {
+        if (bd->client.icccm.base_h > bd->client.icccm.min_h)
+          *mh = bd->client.icccm.base_h;
+        else
+          *mh = bd->client.icccm.min_h;
+     }
+}
+
+static void
+_e_mod_layout_cb_hook_container_layout(void *data, void *data2)
+{
+   Eina_List *l;
+   E_Zone *zone;
+   E_Container *con;
+
+   if (!(con = data2)) return;
+   EINA_LIST_FOREACH(con->zones, l, zone)
+     {
+        if ((mode) && (mode->funcs.zone_layout))
+          mode->funcs.zone_layout(zone);
+     }
+}
+
+static void
+_e_mod_layout_cb_hook_post_fetch(void *data, void *data2)
+{
+   E_Border *bd;
+
+   if (!(bd = data2)) return;
+   if (bd->stolen) return;
+   if (bd->new_client)
+     {
+	if (bd->remember)
+	  {
+	     if (bd->bordername)
+	       {
+		  eina_stringshare_del(bd->bordername);
+		  bd->bordername = NULL;
+		  bd->client.border.changed = 1;
+	       }
+	     e_remember_unuse(bd->remember);
+	     bd->remember = NULL;
+	  }
+        eina_stringshare_replace(&bd->bordername, "borderless");
+        bd->client.border.changed = 1;
+        bd->client.e.state.centered = 0;
+     }
+}
+
+static void
+_e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
+{
+   E_Border *bd;
+   int zx, zy, zw, zh, pbx, pby, pbw, pbh;
+
+   if (!(bd = data2)) return;
+   if (bd->stolen) return;
+
+   pbx = bd->x; pby = bd->y; pbw = bd->w; pbh = bd->h;
+   zx = bd->zone->x; zy = bd->zone->y; zw = bd->zone->w; zh = bd->zone->h;
+
+   bd->placed = 1;
+   bd->client.e.state.centered = 0;
+   if (!((bd->need_fullscreen) || (bd->fullscreen)))
+     {
+/*        
+        bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
+        bd->client.w = bd->w; bd->client.h = bd->h;
+        if ((pbx != bd->x) || (pby != bd->y)  ||
+            (pbw != bd->w) || (pbh != bd->h))
+          {
+             bd->changed = 1;
+             bd->changes.pos = 1;
+             bd->changes.size = 1;
+          }
+ */
+     }
+   else
+     {
+/*        
+        bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
+        bd->client.w = bd->w; bd->client.h = bd->h;
+        if ((pbx != bd->x) || (pby != bd->y) || 
+            (pbw != bd->w) || (pbh != bd->h))
+          {
+             if (bd->internal_ecore_evas)
+               ecore_evas_managed_move(bd->internal_ecore_evas,
+                                       bd->x + bd->fx.x + bd->client_inset.l,
+                                       bd->y + bd->fx.y + bd->client_inset.t);
+             ecore_x_icccm_move_resize_send
+               (bd->client.win,
+                bd->x + bd->fx.x + bd->client_inset.l,
+                bd->y + bd->fx.y + bd->client_inset.t,
+                bd->client.w,
+                bd->client.h);
+             bd->changed = 1;
+             bd->changes.pos = 1;
+             bd->changes.size = 1;
+          }
+ */
+     }
+   if (bd->remember)
+     {
+        e_remember_unuse(bd->remember);
+        bd->remember = NULL;
+     }
+   bd->lock_border = 1;
+
+   bd->lock_client_location = 1;
+   bd->lock_client_size = 1;
+   bd->lock_client_desk = 1;
+   bd->lock_client_sticky = 1;
+   bd->lock_client_shade = 1;
+   bd->lock_client_maximize = 1;
+
+   bd->lock_user_location = 1;
+   bd->lock_user_size = 1;
+   bd->lock_user_sticky = 1;
+}
+
+static void
+_e_mod_layout_cb_hook_end(void *data, void *data2)
+{
+
+}
+
+static int
+_cb_event_border_add(void *data, int type, void *event)
+{
+   E_Event_Border_Add *ev;
+   E_Border *bd;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   bd = ev->border;
+   if ((mode) && (mode->funcs.border_add))
+     mode->funcs.border_add(bd);
+   return 1;
+}
+
+static int
+_cb_event_border_remove(void *data, int type, void *event)
+{
+   E_Event_Border_Remove *ev;
+   E_Border *bd;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   bd = ev->border;
+   if ((mode) && (mode->funcs.border_del))
+     mode->funcs.border_del(bd);
+   return 1;
+}
+
+static int
+_cb_event_border_focus_in(void *data, int type, void *event)
+{
+   E_Event_Border_Focus_In *ev;
+   E_Border *bd;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   bd = ev->border;
+   if ((mode) && (mode->funcs.border_focus_in))
+     mode->funcs.border_focus_in(bd);
+   return 1;
+}
+
+static int
+_cb_event_border_focus_out(void *data, int type, void *event)
+{
+   E_Event_Border_Focus_Out *ev;
+   E_Border *bd;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   bd = ev->border;
+   if ((mode) && (mode->funcs.border_focus_out))
+     mode->funcs.border_focus_out(bd);
+   return 1;
+}
+
+static int
+_cb_event_border_show(void *data, int type, void *event)
+{
+   E_Event_Border_Show *ev;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   return 1;
+}
+
+static int
+_cb_event_border_hide(void *data, int type, void *event)
+{
+   E_Event_Border_Hide *ev;
+
+   ev = event;
+   if (ev->border->stolen) return 1;
+   return 1;
+}
+
+static int
+_cb_event_zone_move_resize(void *data, int type, void *event)
+{
+   E_Event_Zone_Move_Resize *ev;
+
+   ev = event;
+   if ((mode) && (mode->funcs.zone_move_resize)) 
+     mode->funcs.zone_move_resize(ev->zone);
+   return 1;
+}
diff --git a/src/modules/illume2/e_mod_layout.h b/src/modules/illume2/e_mod_layout.h
new file mode 100644
index 0000000..d45bb16
--- /dev/null
+++ b/src/modules/illume2/e_mod_layout.h
@@ -0,0 +1,58 @@
+#ifndef E_MOD_LAYOUT_H
+#define E_MOD_LAYOUT_H
+
+void e_mod_layout_init(E_Module *m);
+void e_mod_layout_shutdown(void);
+
+typedef enum _Illume_Anim_Class
+{
+   ILLUME_ANIM_APP,
+     ILLUME_ANIM_KEYBOARD,
+     ILLUME_ANIM_SHELF,
+     ILLUME_ANIM_DIALOG,
+     ILLUME_ANIM_OTHER
+} Illume_Anim_Class;
+
+typedef struct _Illume_Layout_Mode Illume_Layout_Mode;
+
+struct _Illume_Layout_Mode
+{
+   const char *name;
+   const char *label;
+   // may need more things later, but name + label will do for now
+   struct 
+     {
+        void (*border_add) (E_Border *bd);
+        void (*border_del) (E_Border *bd);
+        void (*border_focus_in) (E_Border *bd);
+        void (*border_focus_out) (E_Border *bd);
+        void (*zone_layout) (E_Zone *zone);
+        void (*zone_move_resize) (E_Zone *zone);
+        // --- add more below (activate callback, and more)
+     } funcs;
+};
+
+void illume_layout_mode_register(const Illume_Layout_Mode *laymode);
+void illume_layout_mode_unregister(const Illume_Layout_Mode *laymode);
+Eina_List *illume_layout_modes_get(void);
+
+void illume_border_activate(E_Border *bd);
+void illume_border_show(E_Border *bd);
+void illume_border_deactivate(E_Border *bd);
+
+Eina_Bool illume_border_is_dialog(E_Border *bd);
+Eina_Bool illume_border_is_keyboard(E_Border *bd);
+Eina_Bool illume_border_is_bottom_panel(E_Border *bd);
+Eina_Bool illume_border_is_top_shelf(E_Border *bd);
+Eina_Bool illume_border_is_mini_app(E_Border *bd);
+Eina_Bool illume_border_is_notification(E_Border *bd);
+Eina_Bool illume_border_is_home(E_Border *bd);
+Eina_Bool illume_border_is_side_pane_left(E_Border *bd);
+Eina_Bool illume_border_is_side_pane_right(E_Border *bd);
+Eina_Bool illume_border_is_overlay(E_Border *bd);
+Eina_Bool illume_border_is_conformant(E_Border *bd);
+
+void illume_border_slide_to(E_Border *bd, int x, int y, Illume_Anim_Class aclass);
+void illume_border_min_get(E_Border *bd, int *mw, int *mh);
+
+#endif
diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c
new file mode 100644
index 0000000..9c80a51
--- /dev/null
+++ b/src/modules/illume2/e_mod_layout_illume.c
@@ -0,0 +1,182 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_layout.h"
+#include "e_mod_layout_illume.h"
+#include "e_kbd.h"
+
+/* local function prototypes */
+static void _border_calc_position(E_Zone *z, E_Border *bd, int *x, int *y, int *w, int *h);
+
+/* local variables */
+static int shelfsize = 0;
+static int kbdsize = 0;
+static int panelsize = 0;
+
+static void
+_border_add(E_Border *bd)
+{ // handle a border being added
+
+}
+
+static void
+_border_del(E_Border *bd)
+{ // handle a border being deleted
+
+}
+
+static void
+_border_focus_in(E_Border *bd)
+{ // do something if focus enters a window
+
+}
+
+static void
+_border_focus_out(E_Border *bd)
+{ // do something if the focus exits a window
+
+}
+
+static void
+_zone_layout(E_Zone *z)
+{ // borders are in re-layout stage. this is where you move/resize them
+   Eina_List *l, *borders;
+   E_Border *bd;
+
+   // phase 1. loop through borders to figure out sizes of things
+   borders = e_border_client_list();
+   EINA_LIST_FOREACH(borders, l, bd)
+     {
+        int mw, mh;
+        
+        if (bd->zone != z) continue; // skip other zones
+        if (bd->new_client) continue; // skip new clients 
+        if (!bd->visible) continue; // skip invisible
+
+        illume_border_min_get(bd, &mw, &mh);
+        if (illume_border_is_top_shelf(bd))
+          {
+             if (shelfsize < mh) shelfsize = mh;
+          }
+        else if (illume_border_is_bottom_panel(bd))
+          {
+             if (panelsize < mh) panelsize = mh;
+          }
+        else if (illume_border_is_keyboard(bd))
+          {
+             if (kbdsize < mh) kbdsize = mh;
+          }
+     }
+
+   // phase 2. actually apply the sizing, positioning and layering too
+   borders = e_border_client_list();
+   EINA_LIST_FOREACH(borders, l, bd)
+     {
+        int mw, mh;
+
+        if (bd->zone != z) continue; // skip other zones
+        if (bd->new_client) continue; // skip new clients 
+        if (!bd->visible) continue; // skip invisible
+
+        illume_border_min_get(bd, &mw, &mh);
+        if (illume_border_is_top_shelf(bd))
+          {
+             e_border_move_resize(bd, z->x, z->y, z->w, shelfsize);
+             e_border_stick(bd);
+             if (bd->layer != 200) e_border_layer_set(bd, 200);
+          }
+        else if (illume_border_is_bottom_panel(bd))
+          {
+             e_border_move_resize(bd, z->x, z->y + z->h - panelsize, z->w, panelsize);
+             e_border_stick(bd);
+             if (bd->layer != 100) e_border_layer_set(bd, 100);
+          }
+        else if (illume_border_is_keyboard(bd))
+          {
+             e_border_move_resize(bd, z->x, z->y + z->h - kbdsize, z->w, kbdsize);
+             if (bd->layer != 150) e_border_layer_set(bd, 150);
+          }
+        else if (illume_border_is_home(bd))
+          {
+             int x, y, w, h;
+
+             _border_calc_position(z, bd, &x, &y, &w, &h);
+             e_border_move_resize(bd, x, y, w, h);
+             if (bd->layer != 50) e_border_layer_set(bd, 50);
+          }
+        else if (illume_border_is_dialog(bd))
+          {
+             if (mh > z->h) mh = z->h;
+             e_border_move_resize(bd, z->x, z->y + ((z->h - mh) / 2), z->w, mh);
+             if (bd->layer != 120) e_border_layer_set(bd, 120);
+          }
+        else
+          {
+             int x, y, w, h;
+
+             _border_calc_position(z, bd, &x, &y, &w, &h);
+             e_border_move_resize(bd, x, y, w, h);
+             if (illume_border_is_conformant(bd)) 
+               {
+                  if (bd->layer != 110) e_border_layer_set(bd, 110);
+               }
+             else 
+               {
+                  if (bd->layer != 100) e_border_layer_set(bd, 100);
+               }
+          }
+     }
+}
+
+static void
+_zone_move_resize(E_Zone *z)
+{ // the zone was moved or resized - re-configure all windows in this zone
+   _zone_layout(z);
+}
+
+/* local functions */
+static void 
+_border_calc_position(E_Zone *z, E_Border *bd, int *x, int *y, int *w, int *h) 
+{
+   if ((!z) || (!bd)) return;
+   if (x) *x = z->x;
+   if (y) *y = (z->y + shelfsize);
+   if (w) *w = z->w;
+   if (illume_border_is_conformant(bd)) 
+     {
+        if (h) *h = (z->h - shelfsize);
+     }
+   else 
+     {
+        if (h) *h = (z->h - shelfsize - panelsize);
+     }
+   if (il_cfg->policy.mode.dual) 
+     {
+        /* we ignore config dialogs as we want them fullscreen in dual mode */
+        if (strstr(bd->client.icccm.class, "config")) return;
+     }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+const Illume_Layout_Mode laymode =
+{
+   "illume", "Illume", // FIXME: translatable?
+     _border_add,
+     _border_del,
+     _border_focus_in,
+     _border_focus_out,
+     _zone_layout,
+     _zone_move_resize
+};
+
+void
+illume_layout_illume_init(void)
+{
+   illume_layout_mode_register(&laymode);
+}
+
+void
+illume_layout_illume_shutdown(void)
+{
+   illume_layout_mode_unregister(&laymode);
+}
diff --git a/src/modules/illume2/e_mod_layout_illume.h b/src/modules/illume2/e_mod_layout_illume.h
new file mode 100644
index 0000000..80249a5
--- /dev/null
+++ b/src/modules/illume2/e_mod_layout_illume.h
@@ -0,0 +1,7 @@
+#ifndef E_MOD_LAYOUT_ILLUME_H
+#define E_MOD_LAYOUT_ILLUME_H
+
+void illume_layout_illume_init(void);
+void illume_layout_illume_shutdown(void);
+
+#endif
diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c
new file mode 100644
index 0000000..40f707c
--- /dev/null
+++ b/src/modules/illume2/e_mod_main.c
@@ -0,0 +1,75 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_config.h"
+#include "e_mod_layout.h"
+#include "e_kbd.h"
+#include "e_mod_gadcon.h"
+
+static E_Kbd *kbd = NULL;
+
+/* this is needed to advertise a label for the module IN the code (not just
+ * the .desktop file) but more specifically the api version it was compiled
+ * for so E can skip modules that are compiled for an incorrect API version
+ * safely */
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume2" };
+
+/* called first thing when E inits the module */
+EAPI void *
+e_modapi_init(E_Module *m) 
+{
+   /* init the config system */
+   if (!il_config_init(m)) return NULL;
+
+   /* init the gadcon subsystem for adding a "button" to any gadget container
+    * which will allow easy switching between policy app modes */
+   e_mod_gadcon_init();
+
+   /* set up the virtual keyboard */
+   e_kbd_init(m);
+
+   /* init the layout system */
+   e_mod_layout_init(m);
+
+   /* create a new keyboard */
+   kbd = e_kbd_new(e_util_container_zone_number_get(0, 0), 
+                   m->dir, m->dir, m->dir);
+
+   /* show the keyboard if needed */
+   e_kbd_show(kbd);
+
+
+   /* return NULL on failure, anything else on success. the pointer
+    * returned will be set as m->data for convenience tracking */
+   return m;
+}
+
+/* called on module shutdown - should clean up EVERYTHING or we leak */
+EAPI int
+e_modapi_shutdown(E_Module *m) 
+{
+   /* cleanup the keyboard */
+   e_object_del(E_OBJECT(kbd));
+   kbd = NULL;
+
+   /* run any layout shutdown code */
+   e_mod_layout_shutdown();
+
+   /* shutdown the kbd subsystem */
+   e_kbd_shutdown();
+
+   /* shutdown the gadget subsystem */
+   e_mod_gadcon_shutdown();
+
+   /* shutdown the config subsystem */
+   il_config_shutdown();
+
+   /* 1 for success, 0 for failure */
+   return 1;
+}
+
+/* called by E when it thinks this module should go save any config it has */
+EAPI int
+e_modapi_save(E_Module *m) 
+{
+   return il_config_save();
+}
diff --git a/src/modules/gadman/e_mod_main.h b/src/modules/illume2/e_mod_main.h
similarity index 100%
copy from src/modules/gadman/e_mod_main.h
copy to src/modules/illume2/e_mod_main.h
diff --git a/src/modules/illume2/e_mod_policy.c b/src/modules/illume2/e_mod_policy.c
new file mode 100644
index 0000000..6046383
--- /dev/null
+++ b/src/modules/illume2/e_mod_policy.c
@@ -0,0 +1,105 @@
+#include "e.h"
+#include "e_mod_layout.h"
+#include "e_mod_policy.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void *_il_config_policy_create(E_Config_Dialog *cfd);
+static void _il_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_config_policy_list_changed(void *data);
+static int _il_config_policy_change_timeout(void *data);
+static Evas_Object *_il_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+
+/* local variables */
+Ecore_Timer *_policy_change_timer = NULL;
+const char *policy_name = NULL;
+
+void 
+il_config_policy_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_policy")) return;
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_config_policy_create;
+   v->free_cfdata = _il_config_policy_free;
+   v->basic.create_widgets = _il_config_policy_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+   cfd = e_config_dialog_new(con, _("Policy"), "E", 
+                             "_config_illume_policy", 
+                             "enlightenment/policy", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+}
+
+/* local functions */
+static void *
+_il_config_policy_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
+}
+
+static Evas_Object *
+_il_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *ow;
+   Eina_List *modes, *l;
+   int i = 0, sel = 0;
+
+   list = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_ilist_add(evas, 24, 24, &(policy_name));
+   e_widget_ilist_selector_set(ow, 1);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(ow);
+   e_widget_ilist_clear(ow);
+   e_widget_ilist_go(ow);
+
+   modes = illume_layout_modes_get();
+   for (i = 0, l = modes; l; l = l->next, i++) 
+     {
+        Illume_Layout_Mode *mode;
+
+        if (!(mode = l->data)) continue;
+        if ((mode->name) && (il_cfg->policy.name) && 
+            (!strcmp(il_cfg->policy.name, mode->name))) 
+          sel = i;
+        e_widget_ilist_append(ow, NULL, mode->label, 
+                              _il_config_policy_list_changed, NULL, mode->name);
+     }
+   e_widget_size_min_set(ow, 100, 200);
+   e_widget_ilist_go(ow);
+   e_widget_ilist_selected_set(ow, sel);
+   e_widget_ilist_thaw(ow);
+   edje_thaw();
+   evas_event_thaw(evas);
+   e_widget_list_object_append(list, ow, 1, 0, 0.0);
+   return list;
+}
+
+static void 
+_il_config_policy_list_changed(void *data) 
+{
+   if (il_cfg->policy.name) eina_stringshare_del(il_cfg->policy.name);
+   if (policy_name) il_cfg->policy.name = eina_stringshare_add(policy_name);
+   if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
+   _policy_change_timer = 
+     ecore_timer_add(0.5, _il_config_policy_change_timeout, data);
+}
+
+static int 
+_il_config_policy_change_timeout(void *data) 
+{
+   e_config_save_queue();
+   _policy_change_timer = NULL;
+   return 0;
+}
diff --git a/src/modules/illume2/e_mod_policy.h b/src/modules/illume2/e_mod_policy.h
new file mode 100644
index 0000000..606f3da
--- /dev/null
+++ b/src/modules/illume2/e_mod_policy.h
@@ -0,0 +1,6 @@
+#ifndef E_MOD_POLICY_H
+#define E_MOD_POLICY_H
+
+void il_config_policy_show(E_Container *con, const char *params);
+
+#endif
diff --git a/src/modules/illume2/e_mod_policy_settings.c b/src/modules/illume2/e_mod_policy_settings.c
new file mode 100644
index 0000000..04b0170
--- /dev/null
+++ b/src/modules/illume2/e_mod_policy_settings.c
@@ -0,0 +1,102 @@
+#include "e.h"
+#include "e_mod_config.h"
+#include "e_mod_policy_settings.h"
+
+/* local function prototypes */
+static void *_il_config_policy_settings_create(E_Config_Dialog *cfd);
+static void _il_config_policy_settings_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_config_policy_settings_changed(void *data, Evas_Object *obj, void *event);
+static int _il_config_policy_settings_change_timeout(void *data);
+
+/* local variables */
+Ecore_Timer *_ps_change_timer = NULL;
+Evas_Object *o_top, *o_left;
+
+void 
+il_config_policy_settings_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_policy_settings")) return;
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_config_policy_settings_create;
+   v->free_cfdata = _il_config_policy_settings_free;
+   v->basic.create_widgets = _il_config_policy_settings_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+   cfd = e_config_dialog_new(con, _("Policy Settings"), "E", 
+                             "_config_illume_policy_settings", 
+                             "enlightenment/policy_settings", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+}
+
+/* local function prototypes */
+static void *
+_il_config_policy_settings_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_config_policy_settings_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (_ps_change_timer) ecore_timer_del(_ps_change_timer);
+}
+
+static Evas_Object *
+_il_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *of, *ow;
+   E_Radio_Group *rg;
+
+   list = e_widget_list_add(evas, 0, 0);
+   of = e_widget_framelist_add(evas, _("Mode"), 0);
+   rg = e_widget_radio_group_new(&(il_cfg->policy.mode.dual));
+   ow = e_widget_radio_add(evas, _("Single App Mode"), 0, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_policy_settings_changed, NULL);
+   ow = e_widget_radio_add(evas, _("Dual App Mode"), 1, rg);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_policy_settings_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Window Layout"), 0);
+   rg = e_widget_radio_group_new(&(il_cfg->policy.mode.side));
+   o_top = e_widget_radio_add(evas, _("Top/Bottom"), 0, rg);
+   e_widget_framelist_object_append(of, o_top);
+   evas_object_smart_callback_add(o_top, "changed", 
+                                  _il_config_policy_settings_changed, NULL);
+   o_left = e_widget_radio_add(evas, _("Left/Right"), 1, rg);
+   e_widget_framelist_object_append(of, o_left);
+   evas_object_smart_callback_add(o_left, "changed", 
+                                  _il_config_policy_settings_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   e_widget_disabled_set(o_top, !il_cfg->policy.mode.dual);
+   e_widget_disabled_set(o_left, !il_cfg->policy.mode.dual);
+
+   return list;
+}
+
+static void 
+_il_config_policy_settings_changed(void *data, Evas_Object *obj, void *event) 
+{
+   e_widget_disabled_set(o_top, !il_cfg->policy.mode.dual);
+   e_widget_disabled_set(o_left, !il_cfg->policy.mode.dual);
+   if (_ps_change_timer) ecore_timer_del(_ps_change_timer);
+   _ps_change_timer = 
+     ecore_timer_add(0.5, _il_config_policy_settings_change_timeout, data);
+}
+
+static int 
+_il_config_policy_settings_change_timeout(void *data) 
+{
+   e_config_save_queue();
+   _ps_change_timer = NULL;
+   return 0;
+}
diff --git a/src/modules/illume2/e_mod_policy_settings.h b/src/modules/illume2/e_mod_policy_settings.h
new file mode 100644
index 0000000..ab7c615
--- /dev/null
+++ b/src/modules/illume2/e_mod_policy_settings.h
@@ -0,0 +1,6 @@
+#ifndef E_MOD_POLICY_SETTINGS_H
+# define E_MOD_POLICY_SETTINGS_H
+
+void il_config_policy_settings_show(E_Container *con, const char *params);
+
+#endif
diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c
new file mode 100644
index 0000000..0808a22
--- /dev/null
+++ b/src/modules/illume2/e_mod_select_window.c
@@ -0,0 +1,271 @@
+#include "e.h"
+#include "e_mod_main.h"
+#include "e_mod_select_window.h"
+#include "e_mod_config.h"
+
+/* local function prototypes */
+static void *_il_config_select_window_create_data(E_Config_Dialog *cfd);
+static void _il_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_config_select_window_list_changed(void *data);
+static int _il_config_select_window_change_timeout(void *data);
+static int _il_config_select_window_match(E_Border *bd);
+
+/* local variables */
+Il_Select_Window_Type stype;
+Ecore_Timer *_sw_change_timer = NULL;
+
+/* public functions */
+void 
+il_config_select_window(Il_Select_Window_Type type) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_select_window")) return;
+   stype = type;
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_config_select_window_create_data;
+   v->free_cfdata = _il_config_select_window_free_data;
+   v->basic.create_widgets = _il_config_select_window_create;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+   cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), 
+                             _("Select Home Window"), "E", 
+                             "_config_illume_select_window", 
+                             "enlightenment/windows", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+}
+
+static void *
+_il_config_select_window_create_data(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+
+}
+
+static Evas_Object *
+_il_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *ow;
+   Eina_List *bds, *l;
+   int i = 0, sel = -1;
+
+   list = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_ilist_add(evas, 24, 24, NULL);
+   e_widget_ilist_selector_set(ow, 1);
+   evas_event_freeze(evas);
+   edje_freeze();
+   e_widget_ilist_freeze(ow);
+   e_widget_ilist_clear(ow);
+   e_widget_ilist_go(ow);
+
+   bds = e_border_client_list();
+   for (i = 0, l = bds; l; l = l->next, i++) 
+     {
+        E_Border *bd;
+        const char *name;
+
+        if (!(bd = l->data)) continue;
+        if (e_object_is_del(E_OBJECT(bd))) continue;
+        if (_il_config_select_window_match(bd)) sel = i;
+        name = e_border_name_get(bd);
+        e_widget_ilist_append(ow, NULL, name, 
+                              _il_config_select_window_list_changed, 
+                              bd, name);
+     }
+   e_widget_size_min_set(ow, 100, 200);
+   e_widget_ilist_go(ow);
+   if (sel >= 0) e_widget_ilist_selected_set(ow, sel);
+   e_widget_ilist_thaw(ow);
+   edje_thaw();
+   evas_event_thaw(evas);
+   e_widget_list_object_append(list, ow, 1, 0, 0.0);
+   return list;
+}
+
+static void 
+_il_config_select_window_list_changed(void *data) 
+{
+   E_Border *bd;
+   Ecore_X_Window_Type wtype;
+   char *title, *name, *class;
+
+   if (!(bd = data)) return;
+   title = ecore_x_icccm_title_get(bd->client.win);
+   ecore_x_icccm_name_class_get(bd->client.win, &name, &class);
+   ecore_x_netwm_window_type_get(bd->client.win, &wtype);
+
+   switch (stype) 
+     {
+      case IL_SELECT_WINDOW_TYPE_HOME:
+        if (il_cfg->policy.home.title)
+          eina_stringshare_del(il_cfg->policy.home.title);
+        if (title) il_cfg->policy.home.title = eina_stringshare_add(title);
+        if (il_cfg->policy.home.class)
+          eina_stringshare_del(il_cfg->policy.home.class);
+        if (class) il_cfg->policy.home.class = eina_stringshare_add(class);
+        if (il_cfg->policy.home.name)
+          eina_stringshare_del(il_cfg->policy.home.name);
+        if (name) il_cfg->policy.home.name = eina_stringshare_add(name);
+        break;
+      case IL_SELECT_WINDOW_TYPE_VKBD:
+        if (il_cfg->policy.vkbd.title)
+          eina_stringshare_del(il_cfg->policy.vkbd.title);
+        if (title) il_cfg->policy.vkbd.title = eina_stringshare_add(title);
+        if (il_cfg->policy.vkbd.class)
+          eina_stringshare_del(il_cfg->policy.vkbd.class);
+        if (class) il_cfg->policy.vkbd.class = eina_stringshare_add(class);
+        if (il_cfg->policy.vkbd.name)
+          eina_stringshare_del(il_cfg->policy.vkbd.name);
+        if (name) il_cfg->policy.vkbd.name = eina_stringshare_add(name);
+        break;
+      case IL_SELECT_WINDOW_TYPE_SOFTKEY:
+        if (il_cfg->policy.softkey.title)
+          eina_stringshare_del(il_cfg->policy.softkey.title);
+        if (title) il_cfg->policy.softkey.title = eina_stringshare_add(title);
+        if (il_cfg->policy.softkey.class)
+          eina_stringshare_del(il_cfg->policy.softkey.class);
+        if (class) il_cfg->policy.softkey.class = eina_stringshare_add(class);
+        if (il_cfg->policy.softkey.name)
+          eina_stringshare_del(il_cfg->policy.softkey.name);
+        if (name) il_cfg->policy.softkey.name = eina_stringshare_add(name);
+        break;
+      case IL_SELECT_WINDOW_TYPE_INDICATOR:
+        if (il_cfg->policy.indicator.title)
+          eina_stringshare_del(il_cfg->policy.indicator.title);
+        if (title) il_cfg->policy.indicator.title = eina_stringshare_add(title);
+        if (il_cfg->policy.indicator.class)
+          eina_stringshare_del(il_cfg->policy.indicator.class);
+        if (class) il_cfg->policy.indicator.class = eina_stringshare_add(class);
+        if (il_cfg->policy.indicator.name)
+          eina_stringshare_del(il_cfg->policy.indicator.name);
+        if (name) il_cfg->policy.indicator.name = eina_stringshare_add(name);
+        break;
+     }
+
+   if (title) free(title);
+   if (name) free(name);
+   if (class) free(class);
+
+   if (_sw_change_timer) ecore_timer_del(_sw_change_timer);
+   _sw_change_timer = 
+     ecore_timer_add(0.5, _il_config_select_window_change_timeout, data);
+}
+
+static int 
+_il_config_select_window_change_timeout(void *data) 
+{
+   e_config_save_queue();
+   _sw_change_timer = NULL;
+   return 0;
+}
+
+static int 
+_il_config_select_window_match(E_Border *bd) 
+{
+   Ecore_X_Window_Type wtype;
+   char *title, *name, *class;
+   int match = 0;
+
+   if (!bd) return 0;
+   title = ecore_x_icccm_title_get(bd->client.win);
+   ecore_x_icccm_name_class_get(bd->client.win, &name, &class);
+   ecore_x_netwm_window_type_get(bd->client.win, &wtype);
+
+   switch (stype) 
+     {
+      case IL_SELECT_WINDOW_TYPE_HOME:
+        if (il_cfg->policy.home.match.title) 
+          {
+             if ((title) && (!strcmp(title, il_cfg->policy.home.title)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.home.match.name) 
+          {
+             if ((name) && (!strcmp(name, il_cfg->policy.home.name)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.home.match.class) 
+          {
+             if ((class) && (!strcmp(class, il_cfg->policy.home.class)))
+               match = 1;
+             break;
+          }
+        break;
+      case IL_SELECT_WINDOW_TYPE_VKBD:
+        if (il_cfg->policy.vkbd.match.title) 
+          {
+             if ((title) && (!strcmp(title, il_cfg->policy.vkbd.title)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.vkbd.match.name) 
+          {
+             if ((name) && (!strcmp(name, il_cfg->policy.vkbd.name)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.vkbd.match.class) 
+          {
+             if ((class) && (!strcmp(class, il_cfg->policy.vkbd.class)))
+               match = 1;
+             break;
+          }
+        break;
+      case IL_SELECT_WINDOW_TYPE_SOFTKEY:
+        if (il_cfg->policy.softkey.match.title) 
+          {
+             if ((title) && (!strcmp(title, il_cfg->policy.softkey.title)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.softkey.match.name) 
+          {
+             if ((name) && (!strcmp(name, il_cfg->policy.softkey.name)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.softkey.match.class) 
+          {
+             if ((class) && (!strcmp(class, il_cfg->policy.softkey.class)))
+               match = 1;
+             break;
+          }
+        break;
+      case IL_SELECT_WINDOW_TYPE_INDICATOR:
+        if (il_cfg->policy.indicator.match.title) 
+          {
+             if ((title) && (!strcmp(title, il_cfg->policy.indicator.title)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.indicator.match.name) 
+          {
+             if ((name) && (!strcmp(name, il_cfg->policy.indicator.name)))
+               match = 1;
+             break;
+          }
+        if (il_cfg->policy.indicator.match.class) 
+          {
+             if ((class) && (!strcmp(class, il_cfg->policy.indicator.class)))
+               match = 1;
+             break;
+          }
+        break;
+     }
+
+   if (title) free(title);
+   if (name) free(name);
+   if (class) free(class);
+
+   return match;
+}
diff --git a/src/modules/illume2/e_mod_select_window.h b/src/modules/illume2/e_mod_select_window.h
new file mode 100644
index 0000000..25cfc96
--- /dev/null
+++ b/src/modules/illume2/e_mod_select_window.h
@@ -0,0 +1,15 @@
+#ifndef E_MOD_SELECT_WINDOW_H
+#define E_MOD_SELECT_WINDOW_H
+
+typedef enum _Il_Select_Window_Type Il_Select_Window_Type;
+enum _Il_Select_Window_Type 
+{
+   IL_SELECT_WINDOW_TYPE_HOME, 
+     IL_SELECT_WINDOW_TYPE_VKBD, 
+     IL_SELECT_WINDOW_TYPE_SOFTKEY, 
+     IL_SELECT_WINDOW_TYPE_INDICATOR
+};
+
+void il_config_select_window(Il_Select_Window_Type type);
+
+#endif
diff --git a/src/modules/illume2/e_mod_windows.c b/src/modules/illume2/e_mod_windows.c
new file mode 100644
index 0000000..621f83d
--- /dev/null
+++ b/src/modules/illume2/e_mod_windows.c
@@ -0,0 +1,218 @@
+#include "e.h"
+#include "e_mod_windows.h"
+#include "e_mod_config.h"
+#include "e_mod_select_window.h"
+
+/* local function prototypes */
+static void *_il_config_windows_create(E_Config_Dialog *cfd);
+static void _il_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_il_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static void _il_config_windows_check_changed(void *data, Evas_Object *obj, void *event);
+static void _il_config_windows_change(void *data, Evas_Object *obj, void *event);
+static int _il_config_windows_change_timeout(void *data);
+static void _il_config_windows_select_home(void *data, void *data2);
+static void _il_config_windows_select_vkbd(void *data, void *data2);
+static void _il_config_windows_select_softkey(void *data, void *data2);
+static void _il_config_windows_select_indicator(void *data, void *data2);
+
+/* local variables */
+Ecore_Timer *_windows_change_timer = NULL;
+
+/* public functions */
+void 
+il_config_windows_show(E_Container *con, const char *params) 
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "_config_illume_windows_settings")) return;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _il_config_windows_create;
+   v->free_cfdata = _il_config_windows_free;
+   v->basic.create_widgets = _il_config_windows_ui;
+   v->basic_only = 1;
+   v->normal_win = 1;
+   v->scroll = 1;
+   cfd = e_config_dialog_new(con, _("Window Settings"), "E", 
+                             "_config_illume_windows_settings", 
+                             "preferences-system-windows", 0, v, NULL);
+   e_dialog_resizable_set(cfd->dia, 1);
+}
+
+/* local function prototypes */
+static void *
+_il_config_windows_create(E_Config_Dialog *cfd) 
+{
+   return NULL;
+}
+
+static void 
+_il_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+{
+   if (_windows_change_timer) ecore_timer_del(_windows_change_timer);
+}
+
+static Evas_Object *
+_il_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+{
+   Evas_Object *list, *of, *ow;
+
+   list = e_widget_list_add(evas, 0, 0);
+
+   of = e_widget_framelist_add(evas, _("Home"), 0);
+   ow = e_widget_button_add(evas, _("Select Window"), NULL, 
+                            _il_config_windows_select_home, NULL, NULL);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Match Window Class"), 
+                           &il_cfg->policy.home.match.class);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Name"), 
+                           &il_cfg->policy.home.match.name);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Title"), 
+                           &il_cfg->policy.home.match.title);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Type"), 
+                           &il_cfg->policy.home.match.win_type);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Indicator"), 0);
+   ow = e_widget_button_add(evas, _("Select Window"), NULL, 
+                            _il_config_windows_select_indicator, NULL, NULL);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Match Window Class"), 
+                           &il_cfg->policy.indicator.match.class);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Name"), 
+                           &il_cfg->policy.indicator.match.name);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Title"), 
+                           &il_cfg->policy.indicator.match.title);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Type"), 
+                           &il_cfg->policy.indicator.match.win_type);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Keyboard"), 0);
+   ow = e_widget_button_add(evas, _("Select Window"), NULL, 
+                            _il_config_windows_select_vkbd, NULL, NULL);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Match Window Class"), 
+                           &il_cfg->policy.vkbd.match.class);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Name"), 
+                           &il_cfg->policy.vkbd.match.name);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Title"), 
+                           &il_cfg->policy.vkbd.match.title);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Type"), 
+                           &il_cfg->policy.vkbd.match.win_type);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   of = e_widget_framelist_add(evas, _("Softkey"), 0);
+   ow = e_widget_button_add(evas, _("Select Window"), NULL, 
+                            _il_config_windows_select_softkey, NULL, NULL);
+   e_widget_framelist_object_append(of, ow);
+   ow = e_widget_check_add(evas, _("Match Window Class"), 
+                           &il_cfg->policy.softkey.match.class);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Name"), 
+                           &il_cfg->policy.softkey.match.name);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Title"), 
+                           &il_cfg->policy.softkey.match.title);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   ow = e_widget_check_add(evas, _("Match Window Type"), 
+                           &il_cfg->policy.softkey.match.win_type);
+   e_widget_framelist_object_append(of, ow);
+   evas_object_smart_callback_add(ow, "changed", 
+                                  _il_config_windows_check_changed, NULL);
+   e_widget_list_object_append(list, of, 1, 0, 0.0);
+
+   return list;
+}
+
+static void 
+_il_config_windows_check_changed(void *data, Evas_Object *obj, void *event) 
+{
+   _il_config_windows_change(data, obj, event);
+}
+
+static void 
+_il_config_windows_change(void *data, Evas_Object *obj, void *event) 
+{
+   if (_windows_change_timer) ecore_timer_del(_windows_change_timer);
+   _windows_change_timer = 
+     ecore_timer_add(0.5, _il_config_windows_change_timeout, data);
+}
+
+static int 
+_il_config_windows_change_timeout(void *data) 
+{
+   e_config_save_queue();
+   _windows_change_timer = NULL;
+   return 0;
+}
+
+static void 
+_il_config_windows_select_home(void *data, void *data2) 
+{
+   if (e_config_dialog_find("E", "_config_illume_select_window")) return;
+   il_config_select_window(IL_SELECT_WINDOW_TYPE_HOME);
+}
+
+static void 
+_il_config_windows_select_vkbd(void *data, void *data2) 
+{
+   if (e_config_dialog_find("E", "_config_illume_select_window")) return;
+   il_config_select_window(IL_SELECT_WINDOW_TYPE_VKBD);
+}
+
+static void 
+_il_config_windows_select_softkey(void *data, void *data2) 
+{
+   if (e_config_dialog_find("E", "_config_illume_select_window")) return;
+   il_config_select_window(IL_SELECT_WINDOW_TYPE_SOFTKEY);
+}
+
+static void 
+_il_config_windows_select_indicator(void *data, void *data2) 
+{
+   if (e_config_dialog_find("E", "_config_illume_select_window")) return;
+   il_config_select_window(IL_SELECT_WINDOW_TYPE_INDICATOR);
+}
diff --git a/src/modules/illume2/e_mod_windows.h b/src/modules/illume2/e_mod_windows.h
new file mode 100644
index 0000000..2f4da35
--- /dev/null
+++ b/src/modules/illume2/e_mod_windows.h
@@ -0,0 +1,6 @@
+#ifndef E_MOD_WINDOWS_H
+#define E_MOD_WINDOWS_H
+
+void il_config_windows_show(E_Container *con, const char *params);
+
+#endif
diff --git a/src/modules/illume2/keyboards/Makefile.am b/src/modules/illume2/keyboards/Makefile.am
new file mode 100644
index 0000000..f706e39
--- /dev/null
+++ b/src/modules/illume2/keyboards/Makefile.am
@@ -0,0 +1,12 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume2
+
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
+files_DATA = \
+            ignore_built_in_keyboards
+
+EXTRA_DIST = $(files_DATA)
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/keyboards
+
diff --git a/src/modules/illume2/keyboards/Makefile.in b/src/modules/illume2/keyboards/Makefile.in
new file mode 100644
index 0000000..3276e29
--- /dev/null
+++ b/src/modules/illume2/keyboards/Makefile.in
@@ -0,0 +1,524 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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/illume2/keyboards
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac-plugins.m4 \
+	$(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/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+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 =
+SOURCES =
+DIST_SOURCES =
+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)$(filesdir)"
+filesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(files_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+ALSA_VERSION = @ALSA_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BATTERY_CFLAGS = @BATTERY_CFLAGS@
+BATTERY_LDFLAGS = @BATTERY_LDFLAGS@
+BATTERY_LIBS = @BATTERY_LIBS@
+BATTERY_VERSION = @BATTERY_VERSION@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ECORE_IMF_CFLAGS = @ECORE_IMF_CFLAGS@
+ECORE_IMF_LIBS = @ECORE_IMF_LIBS@
+ECORE_IMF_VERSION = @ECORE_IMF_VERSION@
+ECORE_TXT_CFLAGS = @ECORE_TXT_CFLAGS@
+ECORE_TXT_LIBS = @ECORE_TXT_LIBS@
+ECORE_TXT_VERSION = @ECORE_TXT_VERSION@
+EDJE_DEF = @EDJE_DEF@
+EET_CFLAGS = @EET_CFLAGS@
+EET_LIBS = @EET_LIBS@
+EGREP = @EGREP@
+EXCHANGE_CFLAGS = @EXCHANGE_CFLAGS@
+EXCHANGE_LIBS = @EXCHANGE_LIBS@
+EXCHANGE_VERSION = @EXCHANGE_VERSION@
+EXEEXT = @EXEEXT@
+E_CFLAGS = @E_CFLAGS@
+E_FM_CFLAGS = @E_FM_CFLAGS@
+E_FM_LIBS = @E_FM_LIBS@
+E_FM_OPEN_CFLAGS = @E_FM_OPEN_CFLAGS@
+E_FM_OPEN_LIBS = @E_FM_OPEN_LIBS@
+E_FM_OP_CFLAGS = @E_FM_OP_CFLAGS@
+E_FM_OP_LIBS = @E_FM_OP_LIBS@
+E_IMC_CFLAGS = @E_IMC_CFLAGS@
+E_IMC_LIBS = @E_IMC_LIBS@
+E_INIT_CFLAGS = @E_INIT_CFLAGS@
+E_INIT_LIBS = @E_INIT_LIBS@
+E_LIBS = @E_LIBS@
+E_REMOTE_CFLAGS = @E_REMOTE_CFLAGS@
+E_REMOTE_LIBS = @E_REMOTE_LIBS@
+E_SYS_CFLAGS = @E_SYS_CFLAGS@
+E_SYS_LIBS = @E_SYS_LIBS@
+E_THUMB_CFLAGS = @E_THUMB_CFLAGS@
+E_THUMB_LIBS = @E_THUMB_LIBS@
+FGREP = @FGREP@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_ALSA = @HAVE_ALSA@
+HAVE_BATTERY = @HAVE_BATTERY@
+HAVE_ECORE_IMF = @HAVE_ECORE_IMF@
+HAVE_ECORE_TXT = @HAVE_ECORE_TXT@
+HAVE_EXCHANGE = @HAVE_EXCHANGE@
+HAVE_TEMPERATURE = @HAVE_TEMPERATURE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOCALE_DIR = @LOCALE_DIR@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MODULE_ARCH = @MODULE_ARCH@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+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@
+SOUND_CFLAGS = @SOUND_CFLAGS@
+SOUND_LIBS = @SOUND_LIBS@
+STRIP = @STRIP@
+TEMPERATURE_CFLAGS = @TEMPERATURE_CFLAGS@
+TEMPERATURE_LIBS = @TEMPERATURE_LIBS@
+TEMPERATURE_VERSION = @TEMPERATURE_VERSION@
+USE_MODULE_BATTERY = @USE_MODULE_BATTERY@
+USE_MODULE_CLOCK = @USE_MODULE_CLOCK@
+USE_MODULE_CONF = @USE_MODULE_CONF@
+USE_MODULE_CONF_APPLICATIONS = @USE_MODULE_CONF_APPLICATIONS@
+USE_MODULE_CONF_BORDERS = @USE_MODULE_CONF_BORDERS@
+USE_MODULE_CONF_CLIENTLIST = @USE_MODULE_CONF_CLIENTLIST@
+USE_MODULE_CONF_COLORS = @USE_MODULE_CONF_COLORS@
+USE_MODULE_CONF_DESK = @USE_MODULE_CONF_DESK@
+USE_MODULE_CONF_DESKLOCK = @USE_MODULE_CONF_DESKLOCK@
+USE_MODULE_CONF_DESKS = @USE_MODULE_CONF_DESKS@
+USE_MODULE_CONF_DIALOGS = @USE_MODULE_CONF_DIALOGS@
+USE_MODULE_CONF_DISPLAY = @USE_MODULE_CONF_DISPLAY@
+USE_MODULE_CONF_DPMS = @USE_MODULE_CONF_DPMS@
+USE_MODULE_CONF_EDGEBINDINGS = @USE_MODULE_CONF_EDGEBINDINGS@
+USE_MODULE_CONF_ENGINE = @USE_MODULE_CONF_ENGINE@
+USE_MODULE_CONF_EXEBUF = @USE_MODULE_CONF_EXEBUF@
+USE_MODULE_CONF_FONTS = @USE_MODULE_CONF_FONTS@
+USE_MODULE_CONF_ICON_THEME = @USE_MODULE_CONF_ICON_THEME@
+USE_MODULE_CONF_IMC = @USE_MODULE_CONF_IMC@
+USE_MODULE_CONF_INTERACTION = @USE_MODULE_CONF_INTERACTION@
+USE_MODULE_CONF_INTL = @USE_MODULE_CONF_INTL@
+USE_MODULE_CONF_KEYBINDINGS = @USE_MODULE_CONF_KEYBINDINGS@
+USE_MODULE_CONF_MENUS = @USE_MODULE_CONF_MENUS@
+USE_MODULE_CONF_MIME = @USE_MODULE_CONF_MIME@
+USE_MODULE_CONF_MOUSE = @USE_MODULE_CONF_MOUSE@
+USE_MODULE_CONF_MOUSEBINDINGS = @USE_MODULE_CONF_MOUSEBINDINGS@
+USE_MODULE_CONF_MOUSE_CURSOR = @USE_MODULE_CONF_MOUSE_CURSOR@
+USE_MODULE_CONF_PATHS = @USE_MODULE_CONF_PATHS@
+USE_MODULE_CONF_PERFORMANCE = @USE_MODULE_CONF_PERFORMANCE@
+USE_MODULE_CONF_PROFILES = @USE_MODULE_CONF_PROFILES@
+USE_MODULE_CONF_SCALE = @USE_MODULE_CONF_SCALE@
+USE_MODULE_CONF_SCREENSAVER = @USE_MODULE_CONF_SCREENSAVER@
+USE_MODULE_CONF_SHELVES = @USE_MODULE_CONF_SHELVES@
+USE_MODULE_CONF_STARTUP = @USE_MODULE_CONF_STARTUP@
+USE_MODULE_CONF_THEME = @USE_MODULE_CONF_THEME@
+USE_MODULE_CONF_TRANSITIONS = @USE_MODULE_CONF_TRANSITIONS@
+USE_MODULE_CONF_WALLPAPER = @USE_MODULE_CONF_WALLPAPER@
+USE_MODULE_CONF_WALLPAPER2 = @USE_MODULE_CONF_WALLPAPER2@
+USE_MODULE_CONF_WINDOW_DISPLAY = @USE_MODULE_CONF_WINDOW_DISPLAY@
+USE_MODULE_CONF_WINDOW_FOCUS = @USE_MODULE_CONF_WINDOW_FOCUS@
+USE_MODULE_CONF_WINDOW_MANIPULATION = @USE_MODULE_CONF_WINDOW_MANIPULATION@
+USE_MODULE_CONF_WINDOW_REMEMBERS = @USE_MODULE_CONF_WINDOW_REMEMBERS@
+USE_MODULE_CONF_WINLIST = @USE_MODULE_CONF_WINLIST@
+USE_MODULE_CONNMAN = @USE_MODULE_CONNMAN@
+USE_MODULE_CPUFREQ = @USE_MODULE_CPUFREQ@
+USE_MODULE_DROPSHADOW = @USE_MODULE_DROPSHADOW@
+USE_MODULE_EVERYTHING = @USE_MODULE_EVERYTHING@
+USE_MODULE_EXEBUF = @USE_MODULE_EXEBUF@
+USE_MODULE_FILEMAN = @USE_MODULE_FILEMAN@
+USE_MODULE_FILEMAN_OPINFO = @USE_MODULE_FILEMAN_OPINFO@
+USE_MODULE_GADMAN = @USE_MODULE_GADMAN@
+USE_MODULE_IBAR = @USE_MODULE_IBAR@
+USE_MODULE_IBOX = @USE_MODULE_IBOX@
+USE_MODULE_ILLUME = @USE_MODULE_ILLUME@
+USE_MODULE_MIXER = @USE_MODULE_MIXER@
+USE_MODULE_MSGBUS_LANG = @USE_MODULE_MSGBUS_LANG@
+USE_MODULE_PAGER = @USE_MODULE_PAGER@
+USE_MODULE_START = @USE_MODULE_START@
+USE_MODULE_SYSCON = @USE_MODULE_SYSCON@
+USE_MODULE_SYSTRAY = @USE_MODULE_SYSTRAY@
+USE_MODULE_TEMPERATURE = @USE_MODULE_TEMPERATURE@
+USE_MODULE_WINLIST = @USE_MODULE_WINLIST@
+USE_MODULE_WIZARD = @USE_MODULE_WIZARD@
+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@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+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@
+builddir = @builddir@
+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_configflags = @e_configflags@
+e_libs = @e_libs@
+edje_cc = @edje_cc@
+eet_eet = @eet_eet@
+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@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+release = @release@
+requirements_e = @requirements_e@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+x_cflags = @x_cflags@
+x_libs = @x_libs@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = illume2
+filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
+files_DATA = \
+            ignore_built_in_keyboards
+
+EXTRA_DIST = $(files_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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 ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/modules/illume2/keyboards/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/modules/illume2/keyboards/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
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+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
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    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 $(DATA)
+installdirs:
+	for dir in "$(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 mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-filesDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-filesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-filesDATA install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	uninstall uninstall-am uninstall-filesDATA
+
+
+uninstall:
+	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/keyboards
+# 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/illume/keyboards/ignore_built_in_keyboards b/src/modules/illume2/keyboards/ignore_built_in_keyboards
similarity index 100%
copy from src/modules/illume/keyboards/ignore_built_in_keyboards
copy to src/modules/illume2/keyboards/ignore_built_in_keyboards
diff --git a/src/modules/illume2/module.desktop b/src/modules/illume2/module.desktop
new file mode 100644
index 0000000..bbacd75
--- /dev/null
+++ b/src/modules/illume2/module.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume2
+Icon=e-module-illume2
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume2 for Embedded</title>
diff --git a/src/modules/illume2/module.desktop.in b/src/modules/illume2/module.desktop.in
new file mode 100644
index 0000000..bbacd75
--- /dev/null
+++ b/src/modules/illume2/module.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Link
+Name=Illume2
+Icon=e-module-illume2
+X-Enlightenment-ModuleType=system
+Comment=<title>Illume2 for Embedded</title>
diff --git a/src/modules/mixer/Makefile.in b/src/modules/mixer/Makefile.in
index 1227162..95a9f1d 100644
--- a/src/modules/mixer/Makefile.in
+++ b/src/modules/mixer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -347,6 +347,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -384,8 +385,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -503,7 +504,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/mixer/app_mixer.c b/src/modules/mixer/app_mixer.c
index e87211b..e267412 100644
--- a/src/modules/mixer/app_mixer.c
+++ b/src/modules/mixer/app_mixer.c
@@ -346,7 +346,7 @@ _create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
 
    ui = &app->ui.cards;
    ui->list = e_widget_ilist_add(evas, 32, 32, &app->card);
-   e_widget_min_size_set(ui->list, 180, 100);
+   e_widget_size_min_set(ui->list, 180, 100);
    e_widget_ilist_go(ui->list);
    EINA_LIST_FOREACH(app->cards, l, card)
    {
@@ -372,7 +372,7 @@ _create_channels(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
 
    ui = &app->ui.channels;
    ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name);
-   e_widget_min_size_set(ui->list, 180, 100);
+   e_widget_size_min_set(ui->list, 180, 100);
    e_widget_ilist_go(ui->list);
 
    ui->frame = e_widget_framelist_add(evas, _("Channels"), 0);
@@ -455,7 +455,7 @@ _create_ui(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app)
       select_card(app);
    e_widget_ilist_selected_set(ui->channels.list, 1);
 
-   e_widget_min_size_get(ui->hlayout, &mw, &mh);
+   e_widget_size_min_get(ui->hlayout, &mw, &mh);
    if (mw < 300)
       mw = 300;
    if (mh < 200)
diff --git a/src/modules/mixer/conf_gadget.c b/src/modules/mixer/conf_gadget.c
index 9c93b00..9354d11 100644
--- a/src/modules/mixer/conf_gadget.c
+++ b/src/modules/mixer/conf_gadget.c
@@ -238,7 +238,7 @@ _fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
       ++i;
    }
 
-   e_widget_min_size_get(ui->list, &mw, &mh);
+   e_widget_size_min_get(ui->list, &mw, &mh);
    evas_object_resize(ui->list, mw, mh);
 
    selected = eina_list_nth(ui->radios, cfdata->channel);
@@ -264,9 +264,9 @@ _channel_scroll_set_min_size(struct mixer_config_ui_channels *ui)
    if (len < 1)
       return;
 
-   e_widget_min_size_get(ui->list, &w, &h);
+   e_widget_size_min_get(ui->list, &w, &h);
    h = 4 * h / len;
-   e_widget_min_size_set(ui->scroll, w, h);
+   e_widget_size_min_set(ui->scroll, w, h);
 }
 
 static void
diff --git a/src/modules/mixer/conf_module.c b/src/modules/mixer/conf_module.c
index 4df8d5b..42311d9 100644
--- a/src/modules/mixer/conf_module.c
+++ b/src/modules/mixer/conf_module.c
@@ -172,7 +172,7 @@ e_mixer_config_module_dialog_new(E_Container *con, E_Mixer_Module_Context *ctxt)
    E_Config_Dialog *dialog;
    E_Config_Dialog_View *view;
 
-   if (e_config_dialog_find(_Name, "e_mixer_config_module_dialog_new"))
+   if (e_config_dialog_find(_Name, "extensions/mixer"))
       return NULL;
 
    view = E_NEW(E_Config_Dialog_View, 1);
@@ -185,7 +185,7 @@ e_mixer_config_module_dialog_new(E_Container *con, E_Mixer_Module_Context *ctxt)
    view->basic.apply_cfdata = _basic_apply;
 
    dialog = e_config_dialog_new(con, _("Mixer Module Settings"),
-                                _Name, "e_mixer_config_module_dialog_new",
+                                _Name, "extensions/mixer",
                                 e_mixer_theme_path(), 0, view, ctxt);
 
    return dialog;
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 3183eb2..2280399 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -604,10 +604,10 @@ _mixer_popup_new(E_Mixer_Instance *inst)
    e_widget_table_object_append(inst->ui.table, inst->ui.button,
                                 0, 7, colspan, 1, 1, 1, 1, 0);
 
-   e_widget_min_size_get(inst->ui.table, &mw, &mh);
+   e_widget_size_min_get(inst->ui.table, &mw, &mh);
    if (mh < 208) mh = 208;
    if (mw < 68) mw = 68;
-   e_widget_min_size_set(inst->ui.table, mw, mh);
+   e_widget_size_min_set(inst->ui.table, mw, mh);
 
    e_gadcon_popup_content_set(inst->popup, inst->ui.table);
    e_gadcon_popup_show(inst->popup);
@@ -1071,7 +1071,7 @@ _mixer_module_config(E_Container *con, const char *params __UNUSED__)
 }
 
 static const char _reg_cat[] = "extensions";
-static const char _reg_item[] = "extensions/e";
+static const char _reg_item[] = "extensions/mixer";
 
 static void
 _mixer_configure_registry_register(void)
diff --git a/src/modules/msgbus_lang/Makefile.in b/src/modules/msgbus_lang/Makefile.in
index 17803cd..14fb9cc 100644
--- a/src/modules/msgbus_lang/Makefile.in
+++ b/src/modules/msgbus_lang/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -380,8 +381,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -494,7 +495,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/msgbus_lang/module.desktop b/src/modules/msgbus_lang/module.desktop
index 854e265..ffffb69 100644
--- a/src/modules/msgbus_lang/module.desktop
+++ b/src/modules/msgbus_lang/module.desktop
@@ -5,9 +5,9 @@ Name[cs]=DBus rozšíření - jazyk
 Name[de]=
 Name[eo]=DBus kromaĵo - Lingvo
 Name[es]=Extensión DBus - Idioma
-Name[fr]=Extension DBus - Langue
+Name[fr]=Extension DBus - Langage de contrôle
 Name[hu]=DBus kiterjesztés - Nyelv
-Name[it]=Estensione DBus - Lingua
+Name[it]=Estensione DBus - Linguaggio
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -18,9 +18,9 @@ Comment[cs]=<title>DBus rozšíření - Jazyk</title>
 Comment[de]=
 Comment[eo]=<title>DBus kromaĵo por allokigo</title>
 Comment[es]=
-Comment[fr]=<title>Extension DBus pour la localisation</title>
+Comment[fr]=<title>Module Extension DBus</title><br>Module de démonstration pour ajouter des API de contrôle.
 Comment[hu]=<title>DBus kiterjesztés - Nyelv</title>
-Comment[it]=<title>Estensione DBus per la localizzazione</title>
+Comment[it]=<title>Estensione DBus</title><br>Un modulo dimostrativo che aggiunge API di controllo del linguaggio
 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 854e265..ffffb69 100644
--- a/src/modules/msgbus_lang/module.desktop.in
+++ b/src/modules/msgbus_lang/module.desktop.in
@@ -5,9 +5,9 @@ Name[cs]=DBus rozšíření - jazyk
 Name[de]=
 Name[eo]=DBus kromaĵo - Lingvo
 Name[es]=Extensión DBus - Idioma
-Name[fr]=Extension DBus - Langue
+Name[fr]=Extension DBus - Langage de contrôle
 Name[hu]=DBus kiterjesztés - Nyelv
-Name[it]=Estensione DBus - Lingua
+Name[it]=Estensione DBus - Linguaggio
 Name[ja]=
 Name[pt]=
 Name[pt_BR]=
@@ -18,9 +18,9 @@ Comment[cs]=<title>DBus rozšíření - Jazyk</title>
 Comment[de]=
 Comment[eo]=<title>DBus kromaĵo por allokigo</title>
 Comment[es]=
-Comment[fr]=<title>Extension DBus pour la localisation</title>
+Comment[fr]=<title>Module Extension DBus</title><br>Module de démonstration pour ajouter des API de contrôle.
 Comment[hu]=<title>DBus kiterjesztés - Nyelv</title>
-Comment[it]=<title>Estensione DBus per la localizzazione</title>
+Comment[it]=<title>Estensione DBus</title><br>Un modulo dimostrativo che aggiunge API di controllo del linguaggio
 Comment[ja]=
 Comment[pt]=
 Comment[pt_BR]=
diff --git a/src/modules/pager/Makefile.in b/src/modules/pager/Makefile.in
index dbeb8d0..4245a77 100644
--- a/src/modules/pager/Makefile.in
+++ b/src/modules/pager/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -380,8 +381,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -495,7 +496,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index 29847af..7c8d287 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -163,14 +163,16 @@ _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    ow = e_widget_check_add(evas, _("Show desktop names"),
                            &(cfdata->show_desk_names));
    e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0);
-
+#if 0
+   /* FIXME: disable move in pager for now, as dropping in between
+      desks causes lost window */
    ow = e_widget_label_add(evas, _("Select and Slide button"));
    e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
    ow = e_widget_button_add(evas, _("Click to set"), NULL,
                             _grab_wnd_show, (void *)BUTTON_DRAG, cfdata);
    cfdata->gui.o_btn1 = ow;
    e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 0, 0, 1, 0);
-
+#endif
    ow = e_widget_label_add(evas, _("Drag and Drop button"));
    e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0);
    ow = e_widget_button_add(evas, _("Click to set"), NULL,
@@ -275,9 +277,9 @@ _grab_wnd_show(void *data1, void *data2)
    man = e_manager_current_get();
 
    cfdata->grab.btn = 0;
-   if ((int)data1 == BUTTON_DRAG)
+   if ((long)data1 == BUTTON_DRAG)
      cfdata->grab.btn = 1;
-   else if ((int)data1 == BUTTON_NOPLACE)
+   else if ((long)data1 == BUTTON_NOPLACE)
      cfdata->grab.btn = 2;
 
    cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager",
@@ -397,12 +399,12 @@ static void
 _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata)
 {
    char lbl[256] = "";
-
+#if 0
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.drag)
      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag);
    e_widget_button_label_set(cfdata->gui.o_btn1, lbl);
-   
+#endif   
    snprintf(lbl, sizeof(lbl), _("Click to set"));
    if (cfdata->btn.noplace)
      snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace);
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 7be7169..9f95f06 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1776,9 +1776,15 @@ _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_i
 	pw->drag.dx = ox - ev->canvas.x;
 	pw->drag.dy = oy - ev->canvas.y;
 	pw->drag.start = 1;
-	pw->drag.no_place = 0;
 	pw->drag.button = ev->button;
+#if 0
+	/* FIXME: disable move in pager for now, as dropping in between
+	   desks causes lost window */
+	pw->drag.no_place = 0;
 	if (ev->button == pager_config->btn_noplace) pw->drag.no_place = 1;
+#else
+	pw->drag.no_place = 1;
+#endif
      }
 }
 
diff --git a/src/modules/start/Makefile.in b/src/modules/start/Makefile.in
index 79bc191..b0fb0bc 100644
--- a/src/modules/start/Makefile.in
+++ b/src/modules/start/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -379,8 +380,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,7 +494,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/syscon/Makefile.in b/src/modules/syscon/Makefile.in
index a26db84..7a547d0 100644
--- a/src/modules/syscon/Makefile.in
+++ b/src/modules/syscon/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index fcc9fde..8106f55 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -243,13 +243,13 @@ e_syscon_show(E_Zone *zone, const char *defact)
    evas_object_resize(o_bg, zw, zh);
    edje_object_calc_force(o_bg);
 
-   e_flowlayout_min_size_get(o_flow_main, &mw, &mh);
+   e_flowlayout_size_min_get(o_flow_main, &mw, &mh);
    edje_extern_object_min_size_set(o_flow_main, mw, mh); 
    edje_object_part_swallow(o_bg, "e.swallow.main", o_flow_main);
-   e_flowlayout_min_size_get(o_flow_secondary, &mw, &mh);
+   e_flowlayout_size_min_get(o_flow_secondary, &mw, &mh);
    edje_extern_object_min_size_set(o_flow_secondary, mw, mh); 
    edje_object_part_swallow(o_bg, "e.swallow.secondary", o_flow_secondary);
-   e_flowlayout_min_size_get(o_flow_extra, &mw, &mh);
+   e_flowlayout_size_min_get(o_flow_extra, &mw, &mh);
    edje_extern_object_min_size_set(o_flow_extra, mw, mh); 
    edje_object_part_swallow(o_bg, "e.swallow.extra", o_flow_extra);
 
diff --git a/src/modules/systray/Makefile.in b/src/modules/systray/Makefile.in
index d02409a..a1a6af9 100644
--- a/src/modules/systray/Makefile.in
+++ b/src/modules/systray/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -379,8 +380,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -493,7 +494,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 844c449..4ac34b9 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -480,7 +480,8 @@ _systray_base_create(Instance *inst)
    evas_object_geometry_get(o, &x, &y, &w, &h);
    if (w < 1) w = 1;
    if (h < 1) h = 1;
-   inst->win.base = ecore_x_window_new(inst->win.parent, x, y, w, h);
+   inst->win.base = ecore_x_window_new(0, 0, 0, w, h);
+   ecore_x_window_reparent(inst->win.base, inst->win.parent, x, y); 
    ecore_x_window_background_color_set(inst->win.base, r, g, b);
    ecore_x_window_show(inst->win.base);
    return 1;
diff --git a/src/modules/temperature/Makefile.in b/src/modules/temperature/Makefile.in
index 0c41bb0..4631250 100644
--- a/src/modules/temperature/Makefile.in
+++ b/src/modules/temperature/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -348,6 +348,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -391,8 +392,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -538,7 +539,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index 0c157bf..133bf51 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -18,7 +18,6 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
 static char *_gc_label(E_Gadcon_Client_Class *client_class);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
-static void _gc_id_del(E_Gadcon_Client_Class *client_class, const char *id);
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
 {
diff --git a/src/modules/winlist/Makefile.in b/src/modules/winlist/Makefile.in
index ce79e92..e894942 100644
--- a/src/modules/winlist/Makefile.in
+++ b/src/modules/winlist/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -340,6 +340,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -381,8 +382,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -496,7 +497,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 254781a..4dfaf0b 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -374,7 +374,7 @@ _e_winlist_size_adjust(void)
    int x, y, w, h;   
 
    e_box_freeze(list_object);
-   e_box_min_size_get(list_object, &mw, &mh);
+   e_box_size_min_get(list_object, &mw, &mh);
    edje_extern_object_min_size_set(list_object, mw, mh);
    edje_object_part_swallow(bg_object, "e.swallow.list", list_object);
    edje_object_size_min_calc(bg_object, &mw, &mh);
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
index d89c643..50211d3 100644
--- a/src/modules/wizard/Makefile.am
+++ b/src/modules/wizard/Makefile.am
@@ -41,21 +41,25 @@ module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Splash screen
 page_000_la_SOURCES      = page_000.c
 page_000_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_000_la_LDFLAGS      = -module -avoid-version
 page_000_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Choose language
 page_010_la_SOURCES      = page_010.c
 page_010_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_010_la_LDFLAGS      = -module -avoid-version
 page_010_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Choose Profile
 page_020_la_SOURCES      = page_020.c
 page_020_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_020_la_LDFLAGS      = -module -avoid-version
 page_020_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Choose Menus
 page_030_la_SOURCES      = page_030.c
 page_030_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_030_la_LDFLAGS      = -module -avoid-version
@@ -76,11 +80,13 @@ page_030_la_DEPENDENCIES = $(top_builddir)/config.h
 #page_060_la_LDFLAGS      = -module -avoid-version
 #page_060_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Choose appliactions
 page_070_la_SOURCES      = page_070.c
 page_070_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_070_la_LDFLAGS      = -module -avoid-version
 page_070_la_DEPENDENCIES = $(top_builddir)/config.h
 
+#Choose quick launch
 page_080_la_SOURCES      = page_080.c
 page_080_la_LIBADD       = @e_libs@ @dlopen_libs@
 page_080_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/wizard/Makefile.in b/src/modules/wizard/Makefile.in
index 99936a8..862fdef 100644
--- a/src/modules/wizard/Makefile.in
+++ b/src/modules/wizard/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -381,6 +381,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -428,18 +429,26 @@ module_la_SOURCES = e_mod_main.c \
 module_la_LIBADD = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Splash screen
 page_000_la_SOURCES = page_000.c
 page_000_la_LIBADD = @e_libs@ @dlopen_libs@
 page_000_la_LDFLAGS = -module -avoid-version
 page_000_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Choose language
 page_010_la_SOURCES = page_010.c
 page_010_la_LIBADD = @e_libs@ @dlopen_libs@
 page_010_la_LDFLAGS = -module -avoid-version
 page_010_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Choose Profile
 page_020_la_SOURCES = page_020.c
 page_020_la_LIBADD = @e_libs@ @dlopen_libs@
 page_020_la_LDFLAGS = -module -avoid-version
 page_020_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Choose Menus
 page_030_la_SOURCES = page_030.c
 page_030_la_LIBADD = @e_libs@ @dlopen_libs@
 page_030_la_LDFLAGS = -module -avoid-version
@@ -459,10 +468,14 @@ page_030_la_DEPENDENCIES = $(top_builddir)/config.h
 #page_060_la_LIBADD       = @e_libs@ @dlopen_libs@
 #page_060_la_LDFLAGS      = -module -avoid-version
 #page_060_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Choose appliactions
 page_070_la_SOURCES = page_070.c
 page_070_la_LIBADD = @e_libs@ @dlopen_libs@
 page_070_la_LDFLAGS = -module -avoid-version
 page_070_la_DEPENDENCIES = $(top_builddir)/config.h
+
+#Choose quick launch
 page_080_la_SOURCES = page_080.c
 page_080_la_LIBADD = @e_libs@ @dlopen_libs@
 page_080_la_LDFLAGS = -module -avoid-version
@@ -479,8 +492,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -615,7 +628,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index a08f52d..ca2d6a9 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -157,7 +157,7 @@ e_wizard_page_show(Evas_Object *obj)
    o_content = obj;
    if (obj)
      {
-	e_widget_min_size_get(obj, &minw, &minh);
+	e_widget_size_min_get(obj, &minw, &minh);
 	edje_extern_object_min_size_set(obj, minw, minh);
 	edje_object_part_swallow(o_bg, "e.swallow.content", obj);
 	evas_object_show(obj);
diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c
index 15cdf61..3229edf 100644
--- a/src/modules/wizard/page_000.c
+++ b/src/modules/wizard/page_000.c
@@ -1,6 +1,8 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Splash Screen */
+
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -9,11 +11,13 @@ wizard_page_init(E_Wizard_Page *pg)
 {
    return 1;
 }
+
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg)
 {
    return 1;
 }
+
 static int
 _next_page(void *data)
 {
@@ -21,6 +25,7 @@ _next_page(void *data)
    e_wizard_next();
    return 0;
 }
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
@@ -29,11 +34,13 @@ wizard_page_show(E_Wizard_Page *pg)
    ecore_timer_add(2.0, _next_page, NULL);
    return 1;
 }
+
 EAPI int
 wizard_page_hide(E_Wizard_Page *pg)
 {
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg)
 {
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index 114c938..7bac884 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -1,12 +1,13 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Language chooser */
 #include "e.h"
 #include "e_mod_main.h"
 
 typedef struct _E_Intl_Pair E_Intl_Pair;
 
-static int  _basic_lang_list_sort(const void *data1, const void *data2);
+static int _basic_lang_list_sort(const void *data1, const void *data2);
 
 struct _E_Intl_Pair
 {
@@ -71,13 +72,13 @@ _basic_lang_list_sort(const void *data1, const void *data2)
 EAPI int
 wizard_page_init(E_Wizard_Page *pg)
 {
-   FILE		*output;
-   
+   FILE *output;
+
    output = popen("locale -a", "r");
    if (output) 
      {
 	char line[32];
-	
+
 	while (fscanf(output, "%[^\n]\n", line) == 1)
 	  {
 	     E_Locale_Parts *locale_parts;
@@ -92,9 +93,8 @@ wizard_page_init(E_Wizard_Page *pg)
 		    (locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION);
 		  if (basic_language)
 		    {
-		       int i;
-		       
-		       i = 0;
+		       int i = 0;
+
 		       while (basic_language_predefined_pairs[i].locale_key)
 			 {
 			    /* if basic language is supported by E and System*/
@@ -123,27 +123,29 @@ wizard_page_init(E_Wizard_Page *pg)
      }
    return 1;
 }
+
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg)
 {
    // FIXME: free blang_list
    return 1;
 }
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
    Eina_List *l;
    int i, sel = -1;
-   
+
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Language"));
    of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
    ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &lang);
-   e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
-   
+   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
+
    e_widget_ilist_freeze(ob);
-   
+
    for (i = 0, l = blang_list; l; l = l->next, i++)
      {
 	E_Intl_Pair *pair;
@@ -163,7 +165,7 @@ wizard_page_show(E_Wizard_Page *pg)
    e_widget_ilist_go(ob);
    e_widget_ilist_thaw(ob);
    if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
-   
+
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    evas_object_show(ob);
@@ -172,6 +174,7 @@ wizard_page_show(E_Wizard_Page *pg)
    pg->data = of;
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
 wizard_page_hide(E_Wizard_Page *pg)
 {
@@ -183,6 +186,7 @@ wizard_page_hide(E_Wizard_Page *pg)
    e_wizard_labels_update();
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg)
 {
diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c
index fb15902..705fddc 100644
--- a/src/modules/wizard/page_020.c
+++ b/src/modules/wizard/page_020.c
@@ -1,6 +1,7 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Profile chooser */
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -38,11 +39,13 @@ wizard_page_init(E_Wizard_Page *pg)
 {
    return 1;
 }
+
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg)
 {
    return 1;
 }
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
@@ -50,18 +53,18 @@ wizard_page_show(E_Wizard_Page *pg)
    Eina_List *l, *profiles;
    int i, sel = -1;
    Evas_Object *ilist;
-   
+
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Profile"));
    of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
    
    ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &profile);
-   e_widget_min_size_set(ob, 140 * e_scale, 70 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 70 * e_scale);
    ilist = ob;
    e_widget_on_change_hook_set(ob, _profile_change, NULL);
-   
+
    e_widget_ilist_freeze(ob);
-   
+
    profiles = e_config_profile_list();
    for (i = 0, l = profiles; l; l = l->next, i++)
      {
@@ -69,7 +72,7 @@ wizard_page_show(E_Wizard_Page *pg)
 	char buf[PATH_MAX], *prof;
 	const char *label, *dir;
 	Evas_Object *ic;
-	
+
 	prof = l->data;
 	if (e_config_profile_get())
 	  {
@@ -110,20 +113,20 @@ wizard_page_show(E_Wizard_Page *pg)
 
    e_widget_ilist_go(ob);
    e_widget_ilist_thaw(ob);
-   
+
    e_widget_framelist_object_append(of, ob);
-   
+
    ob = e_widget_textblock_add(pg->evas);
-   e_widget_min_size_set(ob, 140 * e_scale, 70 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 70 * e_scale);
    e_widget_textblock_markup_set(ob, _("Select a profile"));
    textblock = ob;
-   
+
    e_widget_framelist_object_append(of, ob);
-   
+
    e_widget_list_object_append(o, of, 1, 1, 0.5);
 
    if (sel >= 0) e_widget_ilist_selected_set(ilist, sel);
-   
+
    evas_object_show(ob);
    evas_object_show(of);
    e_wizard_page_show(o);
@@ -131,6 +134,7 @@ wizard_page_show(E_Wizard_Page *pg)
    e_wizard_button_next_enable_set(0);
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
 wizard_page_hide(E_Wizard_Page *pg)
 {
@@ -139,7 +143,8 @@ wizard_page_hide(E_Wizard_Page *pg)
    if (e_config_profile_get())
      {
 	char buf[PATH_MAX];
-	if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", e_config_profile_get()) >= sizeof(buf))
+	if (e_user_dir_snprintf(buf, sizeof(buf), "config/%s", 
+                                e_config_profile_get()) >= sizeof(buf))
 	  return 1;
 	ecore_file_recursive_rm(buf);
      }
@@ -147,6 +152,7 @@ wizard_page_hide(E_Wizard_Page *pg)
    e_config_profile_set(profile);
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg)
 {
diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c
index a08aa50..dcffef7 100644
--- a/src/modules/wizard/page_030.c
+++ b/src/modules/wizard/page_030.c
@@ -1,6 +1,7 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Menu chooser */
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -12,16 +13,16 @@ check_menu_dir(const char *dir)
 {
    char buf[PATH_MAX], *file;
    Eina_List *files;
-   
+
    snprintf(buf, sizeof(buf), "%s/menus", dir);
    files = ecore_file_ls(buf);
    EINA_LIST_FREE(files, file)
+     {
+        if (e_util_glob_match(file, "*.menu"))
           {
-             if (e_util_glob_match(file, "*.menu"))
-               {
-                  snprintf(buf, sizeof(buf), "%s/menus/%s", dir, file);
-                  menus = eina_list_append(menus, strdup(buf));
-               }
+             snprintf(buf, sizeof(buf), "%s/menus/%s", dir, file);
+             menus = eina_list_append(menus, strdup(buf));
+          }
 	free(file);
      }
 }
@@ -46,7 +47,8 @@ wizard_page_init(E_Wizard_Page *pg)
      };
    int i, newdir;
 
-   for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i]);
+   for (i = 0; dirs[i]; i++) 
+     check_menu_dir(dirs[i]);
    newdir = 1;
    snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get());
    for (i = 0; dirs[i]; i++)
@@ -60,30 +62,30 @@ wizard_page_init(E_Wizard_Page *pg)
    if (newdir) check_menu_dir(buf);
    return 1;
 }
+
 EAPI int
 wizard_page_shutdown(E_Wizard_Page *pg)
 {
    // FIXME: free menus
    return 1;
 }
+
 EAPI int
 wizard_page_show(E_Wizard_Page *pg)
 {
    Evas_Object *o, *of, *ob;
-   Eina_List *l;
    char *file;
-   int sel = -1;
-   int i = 0;
-   
+   int sel = -1, i = 0;
+
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Menus"));
-   
+
    if (!menus)
      {
 	of = e_widget_framelist_add(pg->evas, _("Error"), 0);
-	
+
 	ob = e_widget_textblock_add(pg->evas);
-        e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
+        e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
         e_widget_textblock_markup_set
 	  (ob, 
 	   _("No menu files were<br>"
@@ -94,9 +96,7 @@ wizard_page_show(E_Wizard_Page *pg)
 	     "for more details on<br>"
 	     "how to get your<br>"
 	     "application menus<br>"
-	     "working."
-	     )
-	   );
+	     "working."));
 	e_widget_framelist_object_append(of, ob);
 	e_widget_list_object_append(o, of, 1, 1, 0.5);
 	evas_object_show(ob);
@@ -105,10 +105,10 @@ wizard_page_show(E_Wizard_Page *pg)
    else
      {
 	of = e_widget_framelist_add(pg->evas, _("Select application menu"), 0);
-	
+
 	ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &xdg_sel);
-	e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
-	
+	e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
+
 	e_widget_ilist_freeze(ob);
 
 	EINA_LIST_FREE(menus, file)
@@ -175,9 +175,9 @@ wizard_page_show(E_Wizard_Page *pg)
 	  }
 	e_widget_ilist_go(ob);
 	e_widget_ilist_thaw(ob);
-   
+
 	if (sel >= 0) e_widget_ilist_selected_set(ob, sel);
-   
+
 	e_widget_framelist_object_append(of, ob);
 	e_widget_list_object_append(o, of, 1, 1, 0.5);
 	evas_object_show(ob);
@@ -188,12 +188,14 @@ wizard_page_show(E_Wizard_Page *pg)
    pg->data = of;
    return 1; /* 1 == show ui, and wait for user, 0 == just continue */
 }
+
 EAPI int
 wizard_page_hide(E_Wizard_Page *pg)
 {
    evas_object_del(pg->data);
    return 1;
 }
+
 EAPI int
 wizard_page_apply(E_Wizard_Page *pg)
 {
diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c
index e3ca46d..69bd3fc 100644
--- a/src/modules/wizard/page_040.c
+++ b/src/modules/wizard/page_040.c
@@ -27,7 +27,7 @@ wizard_page_show(E_Wizard_Page *pg)
    of = e_widget_framelist_add(pg->evas, _("Select applications"), 0);
 	
    ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, NULL);
-   e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
 	
    e_widget_ilist_freeze(ob);
    e_widget_ilist_go(ob);
diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c
index dda79b3..ee043b3 100644
--- a/src/modules/wizard/page_070.c
+++ b/src/modules/wizard/page_070.c
@@ -1,6 +1,7 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Adding application icons */
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -83,6 +84,8 @@ static App apps[] =
    // loaded and parsed to make it easier to add more in some dir somewhere
 };
 
+/* FIXME unused*/
+#if 0
 static int
 _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
 {
@@ -90,6 +93,7 @@ _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
    if (!d2->name) return -1;
    return strcmp(d1->name, d2->name);
 }
+#endif
 
 static void
 _app_write(App *a)
@@ -201,7 +205,7 @@ wizard_page_show(E_Wizard_Page *pg)
 
    li = e_widget_list_add(pg->evas, 1, 0);
    ob = e_widget_scrollframe_simple_add(pg->evas, li);
-   e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
 
    for (i = 0; i < (sizeof(apps) / sizeof(App)); i++)
      {
@@ -221,7 +225,7 @@ wizard_page_show(E_Wizard_Page *pg)
           }
      }
 
-   e_widget_min_size_get(li, &mw, &mh);
+   e_widget_size_min_get(li, &mw, &mh);
    evas_object_resize(li, mw, mh);
    
    e_widget_framelist_object_append(of, ob);
diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c
index b0ddc72..96b0a1f 100644
--- a/src/modules/wizard/page_080.c
+++ b/src/modules/wizard/page_080.c
@@ -1,6 +1,7 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+/* Quick launch chooser */
 #include "e.h"
 #include "e_mod_main.h"
 
@@ -21,7 +22,6 @@ wizard_page_init(E_Wizard_Page *pg)
 {
    Eina_List *desks = NULL;
    Efreet_Desktop *desk;
-   int i;
    
    efreet_util_init();
                   
@@ -29,8 +29,6 @@ wizard_page_init(E_Wizard_Page *pg)
    desks = eina_list_sort(desks, 0, (Eina_Compare_Cb)_cb_sort_desks);
    EINA_LIST_FREE(desks, desk)
           {
-             char dbuf[4096];
-
              if (!desk->exec) continue;
              efreet_desktop_ref(desk);
              desktops = eina_list_append(desktops, desk);
@@ -65,7 +63,7 @@ wizard_page_show(E_Wizard_Page *pg)
 
    li = e_widget_list_add(pg->evas, 1, 0);
    ob = e_widget_scrollframe_simple_add(pg->evas, li);
-   e_widget_min_size_set(ob, 140 * e_scale, 140 * e_scale);
+   e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
 
    for (i = 0, l = desktops; l ; l = l->next, i++)
      {
@@ -85,7 +83,7 @@ wizard_page_show(E_Wizard_Page *pg)
         evas_object_show(ck);
      }
 
-   e_widget_min_size_get(li, &mw, &mh);
+   e_widget_size_min_get(li, &mw, &mh);
    evas_object_resize(li, mw, mh);
    
    e_widget_framelist_object_append(of, ob);
diff --git a/src/preload/Makefile.in b/src/preload/Makefile.in
index d1dc3cf..1a77030 100644
--- a/src/preload/Makefile.in
+++ b/src/preload/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -336,6 +336,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 x_cflags = @x_cflags@
@@ -373,8 +374,8 @@ $(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; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
@@ -468,7 +469,7 @@ ID: $(HEADERS) $(SOURCES) $(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; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS

-- 
Enlightenment 17



More information about the Pkg-e-commits mailing list